Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update MRI projects for Aluminium
[integration/distribution.git]
/
onap-karaf
/
pom.xml
diff --git
a/onap-karaf/pom.xml
b/onap-karaf/pom.xml
index 7c06af7bbdce77d04d0e3e98f9adb2c9638e2acb..06c7a2014eb91cc46d17c108eb40c75f1fab800e 100644
(file)
--- a/
onap-karaf/pom.xml
+++ b/
onap-karaf/pom.xml
@@
-4,13
+4,13
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>
6.0.4
</version>
+ <version>
7.0.1
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>onap-karaf</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>onap-karaf</artifactId>
- <version>0.1
2
.0-SNAPSHOT</version>
+ <version>0.1
3
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ODL :: integration :: ${project.artifactId}</name>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<name>ODL :: integration :: ${project.artifactId}</name>
<modelVersion>4.0.0</modelVersion>
@@
-55,37
+55,42
@@
<!-- Controller -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<!-- Controller -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-
extras
</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-
mds
al</artifactId>
+ <artifactId>features-
controller-experiment
al</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+
+ <!-- Daexim -->
<dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
features-mdsal-benchmark
</artifactId>
+ <groupId>org.opendaylight.
daexim
</groupId>
+ <artifactId>
daexim-features
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+
+ <!-- MD-SAL -->
<dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>features-mdsal
-trace
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>features-mdsal</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <!-- Daexim -->
+ <!-- MD-SAL Trace -->
+ <!-- FIXME: remove this with mdsal-6.0.1+ -->
<dependency>
<dependency>
- <groupId>org.opendaylight.
daexim
</groupId>
- <artifactId>
daexim-features
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
odl-mdsal-trace
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>