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]
/
features-aggregator
/
odl-openflowplugin-nsf-model
/
pom.xml
diff --git
a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index ea9a13bcccff91f3d8ef26ddb1dafce9a8c031c6..21e001ba951431ac5df20abeb6237e3a6e86d0af 100644
(file)
--- a/
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@
-1,34
+1,36
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
2.0.0
</version>
+ <version>
6.0.1
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>odl-openflowplugin-nsf-model</artifactId>
<packaging>feature</packaging>
<relativePath/>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>odl-openflowplugin-nsf-model</artifactId>
<packaging>feature</packaging>
- <version>0.
5
.0-SNAPSHOT</version>
+ <version>0.
10
.0-SNAPSHOT</version>
<name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
<name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
- <properties>
- <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
- <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
- <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
+ <!-- MD-SAL models -->
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>5.0.4</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
<!-- Controller infrastructure -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
<!-- Controller infrastructure -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>
${mdsal.version}
</version>
+ <version>
1.11.0-SNAPSHOT
</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<scope>import</scope>
<type>pom</type>
</dependency>
@@
-39,28
+41,29
@@
<!-- feature dependencies -->
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<!-- feature dependencies -->
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>odl-mdsal-models</artifactId>
- <version>${mdsal.model.version}</version>
+ <artifactId>odl-mdsal-model-odl-l2-types</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-inventory</artifactId>
- <version>${mdsal.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>odl-mdsal-model-inventory</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-topology</artifactId>
- <version>${mdsal.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>odl-controller-model-topology</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
org.opendaylight
.openflowjava</groupId>
+ <groupId>
${project.groupId}
.openflowjava</groupId>
<artifactId>odl-openflowjava-protocol</artifactId>
<artifactId>odl-openflowjava-protocol</artifactId>
- <version>${
openflowjava
.version}</version>
+ <version>${
project
.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>