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 "Added karaf branding."
[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 377785ac41a21b4013587303cd64c68211baf1ea..ade907044527acc18f9561b12da0c796339c4811 100644
(file)
--- a/
opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/
opendaylight/distribution/opendaylight-karaf/pom.xml
@@
-24,11
+24,8
@@
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>config-features</artifactId>
- <version>${config.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
+ <artifactId>karaf.branding</artifactId>
+ <scope>compile</scope>
</dependency>
<!-- scope is runtime so the feature repo is listed in the features
service config file, and features may be installed using the
</dependency>
<!-- scope is runtime so the feature repo is listed in the features
service config file, and features may be installed using the
@@
-42,14
+39,20
@@
<scope>runtime</scope>
</dependency>
<dependency>
<scope>runtime</scope>
</dependency>
<dependency>
- <!-- scope is compile so all features (there is only one) are installed
- into startup.properties and the feature repo itself is not installed -->
<groupId>org.opendaylight.controller</groupId>
<artifactId>base-features</artifactId>
<version>${project.version}</version>
<type>kar</type>
<scope>runtime</scope>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>base-features</artifactId>
<version>${project.version}</version>
<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>