re-added dependencies to satisfy osgi

Signed-off-by: krj1imb <johannes.schneider@bosch-si.com>
eclipse-ditto · Sep 18, 2019 · 5864e42 · 5864e42
1 parent 31a2a56
commit 5864e42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -689,20 +689,30 @@
             <artifactId>nv-websocket-client</artifactId>
             <version>${nv-websocket-client.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
 
+        <!-- ### Compile - OSGi ### -->
+        <dependency>
+            <groupId>com.eclipsesource.minimal-json</groupId>
+            <artifactId>minimal-json</artifactId>
+            <version>${minimal-json.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.atteo.classindex</groupId>
+            <artifactId>classindex</artifactId>
+            <version>${classindex.version}</version>
+        </dependency>
+
         <!-- ### Compile - Ditto artifacts ### -->
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-json</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-model-base</artifactId>
@@ -718,7 +728,6 @@
             <artifactId>ditto-model-messages</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-base</artifactId>
@@ -744,7 +753,6 @@
             <artifactId>ditto-signals-commands-messages</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-events-base</artifactId>
@@ -855,12 +863,6 @@
             <version>${pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.atteo.classindex</groupId>
-            <artifactId>classindex</artifactId>
-            <version>${classindex.version}</version>
-            <scope>test</scope>
-        </dependency>
 
         <!-- OSGI framework to test with -->
         <dependency>

diff --git a/java/src/main/assembly/assembly.xml b/java/src/main/assembly/assembly.xml
@@ -29,8 +29,8 @@
             <outputDirectory>${artifactId}-${version}-bundles</outputDirectory>
             <includes>
                 <include>org.slf4j:slf4j-api</include>
-                <include>com.eclipsesource.minimal-json:minimal-json</include>
                 <include>com.neovisionaries:nv-websocket-client</include>
+                <include>com.eclipsesource.minimal-json:minimal-json</include>
                 <include>org.atteo.classindex:classindex</include>
                 <include>org.eclipse.ditto:ditto-json</include>
                 <include>org.eclipse.ditto:ditto-model-base</include>