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 Lithium-SR4
[openflowjava.git]
/
openflow-protocol-impl
/
pom.xml
diff --git
a/openflow-protocol-impl/pom.xml
b/openflow-protocol-impl/pom.xml
index a33a649a327864eaf2a746a1a82fdb90a9e13938..0edddc8a06efe0287a1f6161f1988118bd19dc6c 100644
(file)
--- a/
openflow-protocol-impl/pom.xml
+++ b/
openflow-protocol-impl/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.opendaylight.openflowjava</groupId>
<artifactId>openflow-protocol-parent</artifactId>
<parent>
<groupId>org.opendaylight.openflowjava</groupId>
<artifactId>openflow-protocol-parent</artifactId>
- <version>0.
5-SNAPSHOT
</version>
+ <version>0.
6.4-Lithium-SR4
</version>
</parent>
<artifactId>openflow-protocol-impl</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>openflow-protocol-impl</artifactId>
<packaging>bundle</packaging>
@@
-13,12
+13,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>
@@
-48,7
+42,7
@@
<codeGeneratorClass>
org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
</codeGeneratorClass>
<codeGeneratorClass>
org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
</codeGeneratorClass>
- <outputBaseDir>${
project.build.directory}/generated-sources/config
</outputBaseDir>
+ <outputBaseDir>${
jmxGeneratorPath}
</outputBaseDir>
<additionalConfiguration>
<namespaceToPackage1>
urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
<additionalConfiguration>
<namespaceToPackage1>
urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
@@
-59,7
+53,7
@@
<codeGeneratorClass>
org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
</codeGeneratorClass>
<codeGeneratorClass>
org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
</codeGeneratorClass>
- <outputBaseDir>${
project.build.directory}/generated-sources/sal
</outputBaseDir>
+ <outputBaseDir>${
salGeneratorPath}
</outputBaseDir>
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
@@
-79,29
+73,41
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${yangtools.
generator.
version}</version>
+ <version>${yangtools.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>
+ <artifactId>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>
@@
-124,7
+130,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>