Merge "Add missing configuration to build-helper-maven-plugin "

[openflowjava.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index 931ecda0fbb6874420e49c788d1afff71a3f5721..498b201504e048ca048b41ea8d2d6b3f9efddfd5 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,15 +4,17 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>openflowjava</name> <!-- Used by Sonar to set project name -->
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: openflowjava :: ${project.artifactId}</name>
     <description>
         Openflow protocol library - serializes and deserializes openflow messages + handles connections with openflow devices.
     </description>
@@ -51,13 +53,13 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.8.0-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.9.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
-        <config.version>0.6.0-SNAPSHOT</config.version>
-        <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
-        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+        <config.version>0.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
         <argparse4j.version>0.7.0</argparse4j.version>
     </properties>
 
@@ -130,7 +132,7 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-checkstyle-plugin</artifactId>
+              <artifactId>maven-checkstyle-plugin</artifactId>
               <version>${checkstyle.version}</version>
               <configuration>
                 <failOnViolation>false</failOnViolation>
@@ -159,6 +161,21 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>add-yang-sources</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                      <goal>add-source</goal>
+                    </goals>
+                    <configuration>
+                      <sources>
+                        <source>${jmxGeneratorPath}</source>
+                        <source>${salGeneratorPath}</source>
+                      </sources>
+                    </configuration>
+                  </execution>
+                </executions>
             </plugin>
         </plugins>
         <pluginManagement>