Fold atomix-utils into atomix-storage

[controller.git] / opendaylight / md-sal / sal-akka-segmented-journal / pom.xml

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index ef9cf253f79e7cca57ec969cd16cbaa37a995283..93fef5cda79ab9c1f5d45dddf3c77e79b31fdb08 100644 (file)
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
-        <version>7.0.3-SNAPSHOT</version>
+        <version>7.0.5-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
@@ -20,7 +20,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <!-- Akka -->
+        <dependency>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>repackaged-akka</artifactId>
@@ -54,15 +63,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
         <!-- Atomix -->
         <dependency>
-            <groupId>io.atomix</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>atomix-storage</artifactId>
-            <version>3.1.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.atomix</groupId>
-            <artifactId>atomix-utils</artifactId>
-            <version>3.1.12</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -125,7 +127,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                         <Embed-Dependency>
                             <!-- atomix.io is using an older Guava, and Kryo is using ancient objenesis,
                                  so let's embed it to prevent duplicates -->
-                            *;inline=true;groupId=io.atomix,
+                            *;inline=true;artifactId=atomix-storage,
                             *;inline=true;groupId=com.esotericsoftware,
                             *;inline=true;groupId=org.objenesis,
                             *;inline=true;groupId=org.ow2.asm,