Merge "Remove M2E lifecycle-mapping <execute/> for yang-maven-plugin"

diff --combined parent/pom.xml
index 47564afa5c2f0be87f572fec8301fa5580419075,33d16f4aa6c36287036be3275ac2629498b78a7b..52abd0da085ef574423c37220d85046f4e0a9b76
--- 1/parent/pom.xml
--- 2/parent/pom.xml
+++ b/parent/pom.xml
@@@ -34,8 -34,8 +34,8 @@@
          <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
          <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
          <sal.api.version>0.11.0-SNAPSHOT</sal.api.version>
 -        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
 -        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 +        <jmxGeneratorPath>target/generated-sources/config</jmxGeneratorPath>
 +        <salGeneratorPath>target/generated-sources/sal</salGeneratorPath>
          <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
          <controller.distribution.version>0.4.0-SNAPSHOT</controller.distribution.version>
  
@@@ -246,19 -246,6 +246,6 @@@
                                      <action>
                                          <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>