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

diff --combined parent/pom.xml
index 34aeb642e26cefec3136f0822722aaf459ce078a,577acb33351faf93294fffb2afdc35f0a81f0dc5..498b201504e048ca048b41ea8d2d6b3f9efddfd5
--- 1/parent/pom.xml
--- 2/parent/pom.xml
+++ b/parent/pom.xml
@@@ -12,9 -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>
@@@ -132,7 -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>
@@@ -161,6 -159,21 +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>
@@@ -253,6 -266,19 +268,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>