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 "Event Source: switch from wildcards to regexs"
[controller.git]
/
karaf
/
opendaylight-karaf
/
pom.xml
diff --git
a/karaf/opendaylight-karaf/pom.xml
b/karaf/opendaylight-karaf/pom.xml
index 9c02a9d1b1170f0dc71a08af854a575ed89a6956..57d46572713eaa088d6de24e33da7bcf3f6ec7ac 100644
(file)
--- a/
karaf/opendaylight-karaf/pom.xml
+++ b/
karaf/opendaylight-karaf/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<relativePath>../../opendaylight/commons/opendaylight</relativePath>
</parent>
<artifactId>distribution.opendaylight-karaf</artifactId>
<relativePath>../../opendaylight/commons/opendaylight</relativePath>
</parent>
<artifactId>distribution.opendaylight-karaf</artifactId>
@@
-87,17
+87,10
@@
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-flow</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-restconf</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-restconf</artifactId>
- <version>1.
2
.0-SNAPSHOT</version>
+ <version>1.
3
.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>