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 "API Usability: Introduced type capture for Transaction Factory"
[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 7970b3aa00f6fc38bf334ce93b8b52a8597581b2..4ef0b8e86bf926062ff0e7071775efd79d0f531a 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,52
+44,59
@@
<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>
- <version>${
config
.version}</version>
+ <artifactId>
features-odl-protocol-framework
</artifactId>
+ <version>${
protocol-framework
.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <
!--<
dependency>
+ <dependency>
<groupId>org.opendaylight.controller</groupId>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
base
-features</artifactId>
- <version>${
project
.version}</version>
+ <artifactId>
netconf
-features</artifactId>
+ <version>${
netconf
.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
- </dependency>
-->
- <
!-- <
dependency>
+ </dependency>
+ <dependency>
<groupId>org.opendaylight.controller</groupId>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>con
troller
-features</artifactId>
- <version>${
project
.version}</version>
+ <artifactId>con
fig
-features</artifactId>
+ <version>${
config
.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>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
mdsal-features
</artifactId>
- <version>${
md
sal.version}</version>
+ <artifactId>
features-adsal
</artifactId>
+ <version>${sal.version}</version>
<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.
yangtools
</groupId>
- <artifactId>
features-yangtool
s</artifactId>
- <version>${
yangtools
.version}</version>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
mdsal-feature
s</artifactId>
+ <version>${
mdsal
.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>