X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-akka-segmented-journal%2Fpom.xml;h=93fef5cda79ab9c1f5d45dddf3c77e79b31fdb08;hb=88b2fe8c90d9c5b2bd6b811d88396cafc5427011;hp=ba6b7edb6a5daa418aec6c9863ae007c76b75f2f;hpb=52fb7d830e43a9849c728c7b0d36470afe686fb5;p=controller.git

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index ba6b7edb6a..93fef5cda7 100644
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -12,37 +12,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
-        <version>1.10.0-SNAPSHOT</version>
+        <version>7.0.5-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>sal-akka-segmented-journal</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
-
-        <!-- Akka -->
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.12</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
+
+        <!-- Akka -->
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-persistence_2.12</artifactId>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_2.12</artifactId>
-            <scope>test</scope>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>repackaged-akka</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_2.12</artifactId>
+            <artifactId>akka-testkit_2.13</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-persistence-tck_2.12</artifactId>
+            <artifactId>akka-persistence-tck_2.13</artifactId>
         </dependency>
 
         <!-- Codahale -->
@@ -57,17 +55,46 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>scala-library</artifactId>
         </dependency>
 
+        <!-- Clustering commons for metrics -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-clustering-commons</artifactId>
+        </dependency>
+
         <!-- Atomix -->
         <dependency>
-            <groupId>io.atomix</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>atomix-storage</artifactId>
-            <version>3.1.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>io.atomix</groupId>
-            <artifactId>atomix-utils</artifactId>
-            <version>3.1.5</version>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>4.0.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>minlog</artifactId>
+            <version>1.3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>reflectasm</artifactId>
+            <version>1.11.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>5.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>2.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -76,6 +103,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.scalatestplus</groupId>
+            <artifactId>junit-4-13_2.13</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -87,8 +119,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <!-- atomix.io is using an older Guava, so let's embed it to prevent duplicates -->
-                        <Embed-Dependency>*;inline=true;groupId=io.atomix</Embed-Dependency>
+                        <Import-Package>
+                            !COM.newmonics.*,
+                            !android.os,
+                            *
+                        </Import-Package>
+                        <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;artifactId=atomix-storage,
+                            *;inline=true;groupId=com.esotericsoftware,
+                            *;inline=true;groupId=org.objenesis,
+                            *;inline=true;groupId=org.ow2.asm,
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
@@ -101,5 +144,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <tag>HEAD</tag>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
     </scm>
-
 </project>