Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Cosmetics: check in pom.xml files as _sort_pom_ wants them to be"
[controller.git]
/
opendaylight
/
distribution
/
opendaylight-karaf
/
pom.xml
diff --git
a/opendaylight/distribution/opendaylight-karaf/pom.xml
b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 33796390e0b4f86923fcd38ad2a4b1d9efcdd81a..31cdedd5724f89a0da51f2880219b765562b1605 100644
(file)
--- a/
opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/
opendaylight/distribution/opendaylight-karaf/pom.xml
@@
-42,6
+42,14
@@
<type>kar</type>
<scope>runtime</scope>
</dependency>
<type>kar</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>config-features</artifactId>
+ <version>${config.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
<!--<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>base-features</artifactId>
<!--<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>base-features</artifactId>
@@
-58,6
+66,15
@@
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>mdsal-features</artifactId>
+ <version>${mdsal.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-file</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-file</artifactId>
@@
-66,7
+83,6
@@
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- -->
</dependencies>
<build>
</dependencies>
<build>