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 Beryllium-SR1
[openflowjava.git]
/
openflow-protocol-spi
/
pom.xml
diff --git
a/openflow-protocol-spi/pom.xml
b/openflow-protocol-spi/pom.xml
index 3ead6626236bfc353c404af04539668bb9b45a81..c0ef2453dbd80683e7a8f0b2997a129470665c9c 100644
(file)
--- a/
openflow-protocol-spi/pom.xml
+++ b/
openflow-protocol-spi/pom.xml
@@
-2,18
+2,19
@@
<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.7.1-Beryllium-SR1</version>
+ <relativePath>../parent</relativePath>
</parent>
<artifactId>openflow-protocol-spi</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>openflow-protocol-spi</artifactId>
<packaging>bundle</packaging>
-
+
<name>Openflow Protocol Library - SPI</name>
<scm>
<url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
<tag>HEAD</tag>
</scm>
<name>Openflow Protocol Library - SPI</name>
<scm>
<url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
<tag>HEAD</tag>
</scm>
-
+
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-23,7
+24,7
@@
<configuration>
<instructions>
<Export-Package>
<configuration>
<instructions>
<Export-Package>
- org.opendaylight.openflowjava.protocol.spi
.connection
*,
+ org.opendaylight.openflowjava.protocol.spi*,
org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.*
</Export-Package>
</instructions>
org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.*
</Export-Package>
</instructions>
@@
-43,7
+44,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
@@
-54,7
+55,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>
@@
-72,21
+73,20
@@
<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>${yangtools.version}</version>
<type>jar</type>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<type>jar</type>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
+
<dependency>
+
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-api</artifactId>
<artifactId>openflow-protocol-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>