Code Review
/
openflowjava.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release Carbon
[openflowjava.git]
/
openflow-protocol-impl
/
pom.xml
diff --git
a/openflow-protocol-impl/pom.xml
b/openflow-protocol-impl/pom.xml
index ca5eb1e9d45bd4d2ad9fa1d546ef6bde3c7e79ad..dde59dd4aabc22e4b547ec1174b47e2a0f7c3f74 100644
(file)
--- a/
openflow-protocol-impl/pom.xml
+++ b/
openflow-protocol-impl/pom.xml
@@
-2,8
+2,9
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowjava</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowjava</groupId>
- <artifactId>openflow-protocol-parent</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <artifactId>openflowjava-parent</artifactId>
+ <version>0.9.3-Carbon</version>
+ <relativePath>../parent</relativePath>
</parent>
<artifactId>openflow-protocol-impl</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>openflow-protocol-impl</artifactId>
<packaging>bundle</packaging>
@@
-13,12
+14,6
@@
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
- <properties>
- <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
- <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
- <yangtools.binding.version>0.6.2-SNAPSHOT</yangtools.binding.version>
- </properties>
-
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-57,12
+52,12
@@
</generator>
<generator>
<codeGeneratorClass>
</generator>
<generator>
<codeGeneratorClass>
- org.opendaylight.
yangtools.maven.sal
.api.gen.plugin.CodeGeneratorImpl
+ org.opendaylight.
mdsal.binding.maven
.api.gen.plugin.CodeGeneratorImpl
</codeGeneratorClass>
<outputBaseDir>${salGeneratorPath}</outputBaseDir>
</generator>
<generator>
</codeGeneratorClass>
<outputBaseDir>${salGeneratorPath}</outputBaseDir>
</generator>
<generator>
- <codeGeneratorClass>org.opendaylight.
yangtools
.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
+ <codeGeneratorClass>org.opendaylight.
mdsal.binding
.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
<outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
</generator>
</codeGenerators>
<outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
</generator>
</codeGenerators>
@@
-77,36
+72,43
@@
<version>${config.version}</version>
</dependency>
<dependency>
<version>${config.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.
yangtools
</groupId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${
yangtools.generator
.version}</version>
+ <version>${
mdsal.model
.version}</version>
<type>jar</type>
</dependency>
</dependencies>
</plugin>
<type>jar</type>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-api</artifactId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-spi</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowjava</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowjava</groupId>
- <artifactId>util</artifactId>
- <version>${project.version}</version>
+ <artifactId>openflowjava-util</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
- <version>${yang.prototype.version}</version>
<exclusions>
<exclusion>
<groupId>org.opendaylight.controller</groupId>
<exclusions>
<exclusion>
<groupId>org.opendaylight.controller</groupId>
@@
-129,7
+131,6
@@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-143,11
+144,17
@@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <!-- Explicitly bring in the linux classifier, test may fail on 32-bit linux -->
+ <classifier>linux-x86_64</classifier>
+ </dependency>
</dependencies>
</project>
</dependencies>
</project>