Use forked atomix-{storage,utils}

Now that we have sufficiently trimmed down imported code, switch to
using it rather than depending on external source.

JIRA: CONTROLLER-2071
Change-Id: Ic73f6cddac8c16bb5bff16626bde5021f5b7b8de
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index 4a9900d7c4b3009b40fa23b4c9b0365bfd3e8e6b..f5fe46edb5a7177902381b1a344841de9b4d25f0 100644 (file)
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -63,15 +63,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
         <!-- Atomix -->
         <dependency>
 
         <!-- Atomix -->
         <dependency>

-            <groupId>io.atomix</groupId>
+            <groupId>org.opendaylight.controller</groupId>

             <artifactId>atomix-storage</artifactId>
             <artifactId>atomix-storage</artifactId>

-            <version>3.1.12</version>

             <scope>provided</scope>
         </dependency>
         <dependency>
             <scope>provided</scope>
         </dependency>
         <dependency>

-            <groupId>io.atomix</groupId>
+            <groupId>org.opendaylight.controller</groupId>

             <artifactId>atomix-utils</artifactId>
             <artifactId>atomix-utils</artifactId>

-            <version>3.1.12</version>

             <scope>provided</scope>
         </dependency>
         <dependency>
             <scope>provided</scope>
         </dependency>
         <dependency>


@@ -134,7 +132,8 @@ 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 -->
                         <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;artifactId=atomix-utils,

                             *;inline=true;groupId=com.esotericsoftware,
                             *;inline=true;groupId=org.objenesis,
                             *;inline=true;groupId=org.ow2.asm,
                             *;inline=true;groupId=com.esotericsoftware,
                             *;inline=true;groupId=org.objenesis,
                             *;inline=true;groupId=org.ow2.asm,