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 "Get some basic unit testing in place for the RaftActor class"
[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 473dd8ee398b70856669193e3baaa5601ce8e0a2..cdc592428f9d685ab0e715a6e9f762e5a743cc83 100644
(file)
--- a/
opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/
opendaylight/distribution/opendaylight-karaf/pom.xml
@@
-52,7
+52,7
@@
down with testing... ie, no broken feature repos
-->
down with testing... ie, no broken feature repos
-->
- <!--
M
D-SAL Related Features -->
+ <!--
A
D-SAL Related Features -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-base</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-base</artifactId>
@@
-65,6
+65,13
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>features-nsf</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <!-- MD-SAL Related Features -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-mdsal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-mdsal</artifactId>
@@
-254,6
+261,11
@@
<fileset dir="${project.build.directory}/assembly/bin">
<include name="karaf"/>
<include name="instance"/>
<fileset dir="${project.build.directory}/assembly/bin">
<include name="karaf"/>
<include name="instance"/>
+ <include name="start"/>
+ <include name="stop"/>
+ <include name="status"/>
+ <include name="client"/>
+ <include name="shell"/>
</fileset>
</chmod>
</tasks>
</fileset>
</chmod>
</tasks>