Merge branch 'master' into devV2

pom.xml

@@ -7,7 +7,7 @@
     <name>Cytomine Software Router</name>
     <groupId>be.cytomine.software</groupId>
     <artifactId>cytomine-software-router</artifactId>
-    <version>2.2.3</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <licenses>
@@ -18,19 +18,6 @@
         </license>
     </licenses>
 
-    <repositories>
-        <repository>
-            <id>cytomine-uliege-Cytomine-java-client</id>
-            <url>https://packagecloud.io/cytomine-uliege/Cytomine-java-client/maven2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -40,9 +27,10 @@
         <dependency>
             <groupId>be.cytomine.client</groupId>
             <artifactId>cytomine-java-client</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
+            <version>2.0.0</version>
+            <systemPath>${basedir}/lib/Cytomine-java-client.jar</systemPath>
+            <scope>system</scope>
+        </dependency>        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>