Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add an automatic module name for repackaged akka
[controller.git]
/
karaf
/
pom.xml
diff --git
a/karaf/pom.xml
b/karaf/pom.xml
index ab8abcf466372be6b1f84261cceec8665bb02a61..9330ce0388a5a85d8eeeeb485306e83cff871ca3 100644
(file)
--- a/
karaf/pom.xml
+++ b/
karaf/pom.xml
@@
-11,20
+11,20
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>
7.0.1
</version>
+ <version>
11.0.0
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
distribution.opendayligh
t-karaf</artifactId>
- <version>
2
.0.0-SNAPSHOT</version>
+ <artifactId>
controller-tes
t-karaf</artifactId>
+ <version>
6
.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
mdsal-parent
</artifactId>
+ <artifactId>
controller-artifacts
</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
@@
-48,21
+48,21
@@
-->
<dependency>
<groupId>org.opendaylight.controller</groupId>
-->
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-controller
-experimental
</artifactId>
+ <artifactId>features-controller</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-controller</artifactId>
+ <artifactId>features-controller
-experimental
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.
mdsal
</groupId>
- <artifactId>features-
mdsal
</artifactId>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>features-
controller-testing
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>