X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-segmented-journal%2Fpom.xml;h=dc77829936c2ef36e64d36c75bc96014752d474c;hb=57922bfdaef867dfbc24b58c06659bb3e70b0a4b;hp=94793f6e265ab7e8a73186f29d2f0ee398a5864b;hpb=02215a58e5c9ebe4624e6ca2103b00a796fcd5f7;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 94793f6e26..dc77829936 100644
--- 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>4.0.4-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,46 +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.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.atomix</groupId>
-            <artifactId>atomix-utils</artifactId>
-            <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>
@@ -108,34 +79,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <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>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>