Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "OPNFLWPLUG-1039: adding switch idle event registration at the end of channel...
[openflowplugin.git]
/
distribution
/
karaf
/
pom.xml
diff --git
a/distribution/karaf/pom.xml
b/distribution/karaf/pom.xml
index 1b1b97afcd06f3247db5e1185ebea8c1baea0f2a..c8f477fa8bca74d27cfee0a85cbb296d6bee7323 100644
(file)
--- a/
distribution/karaf/pom.xml
+++ b/
distribution/karaf/pom.xml
@@
-3,17
+3,16
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>karaf-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- <relativePath></relativePath>
+ <artifactId>karaf4-parent</artifactId>
+ <version>4.0.5</version>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
- <version>0.
5
.0-SNAPSHOT</version>
+ <version>0.
8
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<packaging>pom</packaging>
<properties>
- <openflowplugin.version>0.
5
.0-SNAPSHOT</openflowplugin.version>
+ <openflowplugin.version>0.
8
.0-SNAPSHOT</openflowplugin.version>
</properties>
<dependencyManagement>
</properties>
<dependencyManagement>
@@
-37,13
+36,6
@@
<type>kar</type>
</dependency>
<!-- openflowplugin feature -->
<type>kar</type>
</dependency>
<!-- openflowplugin feature -->
- <dependency>
- <artifactId>features-openflowplugin-he</artifactId>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
<dependency>
<artifactId>features-openflowplugin</artifactId>
<groupId>org.opendaylight.openflowplugin</groupId>
<dependency>
<artifactId>features-openflowplugin</artifactId>
<groupId>org.opendaylight.openflowplugin</groupId>
@@
-52,13
+44,6
@@
<scope>runtime</scope>
</dependency>
<!-- openflowplugin extension feature -->
<scope>runtime</scope>
</dependency>
<!-- openflowplugin extension feature -->
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>features-openflowplugin-extension-he</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>features-openflowplugin-extension</artifactId>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>features-openflowplugin-extension</artifactId>