Merge "Bug 7182 related: Remove M2E lifecycle mapping"

diff --combined parent/pom.xml
index 802ded076562246b2770086976f8d161e6165b36,931ecda0fbb6874420e49c788d1afff71a3f5721..20a352de4efbc02935fd0da0058bdb87d125cd9b
--- 1/parent/pom.xml
--- 2/parent/pom.xml
+++ b/parent/pom.xml
@@@ -4,13 -4,13 +4,13 @@@
      <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 -->
      <description>
@@@ -51,13 -51,13 +51,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>
  
@@@ -251,19 -251,6 +251,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>