Migrate to odlparent 1.8.0-Carbon

[openflowjava.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index 802ded076562246b2770086976f8d161e6165b36..7c9e4409c1f33355016104f14b31e79d5057e072 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
 
@@ -12,7 +12,9 @@
     <artifactId>openflowjava-parent</artifactId>
     <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,7 +53,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.9.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
         <config.version>0.7.0-SNAPSHOT</config.version>
@@ -130,7 +131,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 +160,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>
@@ -251,19 +267,6 @@
                             <ignore/>
                           </action>
                         </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.opendaylight.yangtools</groupId>
-                            <artifactId>yang-maven-plugin</artifactId>
-                            <versionRange>[0.5,)</versionRange>
-                            <goals>
-                              <goal>generate-sources</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <execute/>
-                          </action>
-                        </pluginExecution>
                         <pluginExecution>
                           <pluginExecutionFilter>
                             <groupId>org.codehaus.groovy.maven</groupId>