Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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 4a9900d7c4b3009b40fa23b4c9b0365bfd3e8e6b..93fef5cda79ab9c1f5d45dddf3c77e79b31fdb08 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,8
@@
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>
- <groupId>io.atomix</groupId>
- <artifactId>atomix-utils</artifactId>
- <version>3.1.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<scope>provided</scope>
</dependency>
<dependency>
@@
-134,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 -->
<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,
*;inline=true;groupId=com.esotericsoftware,
*;inline=true;groupId=org.objenesis,
*;inline=true;groupId=org.ow2.asm,