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=1aac0dbf84a0762feb1697226805b87dbbfbf731;hb=b8241d771e09e854bfcdd4ae9bd756bfd9329fa4;hp=9bf362ab33b4971cd075051085f44db1eefc3506;hpb=096e92fc0595f6f87db4b681b0fe9cdeeb365164;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 9bf362ab33..1aac0dbf84 100644
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -12,37 +12,31 @@ 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>4.0.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>sal-akka-segmented-journal</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <dependencies>
+    <properties>
+        <!-- FIXME: Remove this -->
+        <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
+    </properties>
 
+    <dependencies>
         <!-- Akka -->
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-persistence_2.12</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 -->
@@ -76,12 +70,47 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>3.1.5</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <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>
 
         <dependency>
             <groupId>commons-io</groupId>
             <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>
@@ -93,8 +122,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;groupId=io.atomix,
+                            *;inline=true;groupId=com.esotericsoftware,
+                            *;inline=true;groupId=org.objenesis,
+                            *;inline=true;groupId=org.ow2.asm,
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
@@ -107,5 +147,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>