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 "Use String(byte[], Charset)"
[openflowplugin.git]
/
openflowjava
/
features-openflowjava-aggregator
/
odl-openflowjava-protocol
/
pom.xml
diff --git
a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index c4bf13780f9da897a39efbaddf0f978397a41caf..f8266ca5a03814901f8c5da1a9d48624fdc6810a 100644
(file)
--- a/
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@
-5,13
+5,13
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
3.1.3
</version>
+ <version>
6.0.1
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
<artifactId>odl-openflowjava-protocol</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
<artifactId>odl-openflowjava-protocol</artifactId>
- <version>0.
8
.0-SNAPSHOT</version>
+ <version>0.
10
.0-SNAPSHOT</version>
<packaging>feature</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
<packaging>feature</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
@@
-29,20
+29,11
@@
<type>pom</type>
</dependency>
<type>pom</type>
</dependency>
- <!-- Netty -->
- <dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odlparent-artifacts</artifactId>
- <version>3.1.3</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<!-- MD-SAL -->
<dependency>
<!-- MD-SAL -->
<dependency>
- <groupId>org.opendaylight.mdsal
.model
</groupId>
- <artifactId>mdsal-
model-
artifacts</artifactId>
- <version>
0.14.0-SNAPSHOT
</version>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>
5.0.4
</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<scope>import</scope>
<type>pom</type>
</dependency>
@@
-63,6
+54,13
@@
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.infrautils</groupId>
+ <artifactId>odl-infrautils-diagstatus</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
<!-- bundle dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<!-- bundle dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>