Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Made config/mdsal/netconf features non-cyclic
[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 6a6a12d1de2499cb1956f02f456b158fd79f470e..efb7a374f3281056403001ca2466d4e90b1c8842 100644
(file)
--- a/
opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/
opendaylight/distribution/opendaylight-karaf/pom.xml
@@
-22,6
+22,12
@@
<version>${karaf.version}</version>
<type>kar</type>
</dependency>
<version>${karaf.version}</version>
<type>kar</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>base-features</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>karaf.branding</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>karaf.branding</artifactId>
@@
-38,40
+44,39
@@
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>base-features</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
<!-- scope is compile so all features (there is only one) are installed
into startup.properties and the feature repo itself is not installed -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<!-- scope is compile so all features (there is only one) are installed
into startup.properties and the feature repo itself is not installed -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
base
-features</artifactId>
+ <artifactId>
extras
-features</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
- <type>
pom
</type>
+ <type>
kar
</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>config-features</artifactId>
+ <artifactId>config-
netty-
features</artifactId>
<version>${config.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<version>${config.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <!--<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>base-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>-->
- <!-- <dependency>
+ <dependency>
<groupId>org.opendaylight.controller</groupId>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
controller-features
</artifactId>
- <version>${
project
.version}</version>
+ <artifactId>
features-adsal
</artifactId>
+ <version>${
sal
.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-features</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-features</artifactId>
@@
-80,14
+85,6
@@
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>features-file</artifactId>
- <version>${yangtools.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
</dependencies>
<build>