Index: /applications/editors/josm/plugins/MicrosoftStreetside/.classpath
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/.classpath	(revision 35600)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/.classpath	(revision 35601)
@@ -8,6 +8,7 @@
 	</classpathentry>
 	<classpathentry kind="src" path="config"/>
-	<classpathentry kind="src" output="bin/test" path="test/unit">
+	<classpathentry kind="src" output="bintest" path="test/unit">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
@@ -20,6 +21,7 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="test/data">
+	<classpathentry kind="src" output="bintest" path="test/data">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
@@ -28,4 +30,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-MicrosoftStreetside&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-javafx"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-http"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
Index: /applications/editors/josm/plugins/MicrosoftStreetside/.project
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/.project	(revision 35600)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/.project	(revision 35601)
@@ -32,4 +32,5 @@
 		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>
Index: /applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties	(revision 35600)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties	(revision 35601)
@@ -8,10 +8,10 @@
 # Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
 # You can check if the plugin compiles against this version by executing `./gradlew minJosmVersionClasses`.
-plugin.main.version=14460
+plugin.main.version=16548
 #plugin.version=
 # Version of JOSM against which the plugin is compiled
 # Please check, if the specified version is available for download from https://josm.openstreetmap.de/download/ .
 # If not, choose the next higher number that is available, or the gradle build will break.
-plugin.compile.version=14460
+plugin.compile.version=17084
 plugin.requires=apache-commons;apache-http;utilsplugin2;javafx
 
Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java	(revision 35600)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java	(revision 35601)
@@ -4,4 +4,5 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -13,4 +14,6 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Data;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -31,5 +34,5 @@
  * @see StreetsideSequence
  */
-public class StreetsideData {
+public class StreetsideData implements Data {
   private final Set<StreetsideAbstractImage> images = ConcurrentHashMap.newKeySet();
   /**
@@ -412,3 +415,8 @@
     }
   }
+
+  @Override
+  public Collection<DataSource> getDataSources() {
+	return Collections.emptyList();
+  }
 }
Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java	(revision 35600)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java	(revision 35601)
@@ -184,4 +184,5 @@
 	 * @return The {@link StreetsideData} object that stores the database.
 	 */
+	@Override
 	public StreetsideData getData() {
 		return data;