Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump to odlparent-6.0.1/yangtools-4.0.2/mdsal-5.0.4
[openflowplugin.git]
/
distribution
/
karaf
/
pom.xml
diff --git
a/distribution/karaf/pom.xml
b/distribution/karaf/pom.xml
index 20be68307be103bd8a2ec4c990b365cd4d34da77..839f5ee66f6a9b982743c544736d1e809737c30a 100644
(file)
--- a/
distribution/karaf/pom.xml
+++ b/
distribution/karaf/pom.xml
@@
-3,20
+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.8.0-SNAPSHOT</version>
- <relativePath></relativePath>
+ <artifactId>karaf4-parent</artifactId>
+ <version>6.0.1</version>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
10
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
<properties>
<properties>
- <openflowplugin.version>0.
4
.0-SNAPSHOT</openflowplugin.version>
+ <openflowplugin.version>0.
10
.0-SNAPSHOT</openflowplugin.version>
</properties>
<dependencyManagement>
</properties>
<dependencyManagement>
@@
-40,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>
@@
-55,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>