Merge "BUG 1129:Removed hard coded version from netconf project as part of the automa...

diff --combined opendaylight/commons/opendaylight/pom.xml
index d6ec2e3272f53c9354e82e4e653eb458d1817fbe,466982e2b4ecbcf3f31a04cbc68e7789d9534ae2..cc256379fa8cd5bc866f29f9a0c0344ce61a7442
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -20,8 -20,8 +20,8 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
      <aries.util.version>1.1.0</aries.util.version>
 -    <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
 +    <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
@@@ -36,29 -36,19 +36,29 @@@
      <clustering.stub.version>0.4.2-SNAPSHOT</clustering.stub.version>
      <clustering.test.version>0.4.2-SNAPSHOT</clustering.test.version>
      <commmons.northbound.version>0.4.2-SNAPSHOT</commmons.northbound.version>
 -    <commons.checkstyle.version>0.0.3-SNAPSHOT</commons.checkstyle.version>
      <!-- Third Party Versions -->
 +    <commons.catalina>7.0.32.v201211201336</commons.catalina>
 +    <commons.catalina.ha>7.0.32.v201211201952</commons.catalina.ha>
 +    <commons.catalina.tribes>7.0.32.v201211201952</commons.catalina.tribes>
 +    <commons.checkstyle.version>0.0.3-SNAPSHOT</commons.checkstyle.version>
      <commons.codec.version>1.7</commons.codec.version>
 +    <commons.coyote>7.0.32.v201211201952</commons.coyote>
 +    <commons.el>7.0.32.v201211081135</commons.el>
      <commons.fileupload.version>1.2.2</commons.fileupload.version>
      <commons.httpclient.version>0.1.2-SNAPSHOT</commons.httpclient.version>
      <commons.io.version>2.4</commons.io.version>
 +    <commons.jasper>7.0.32.v201211201952</commons.jasper>
 +    <commons.juli.version>7.0.32.v201211081135</commons.juli.version>
      <commons.lang.version>3.1</commons.lang.version>
 +    <commons.lang3.version>3.1</commons.lang3.version>
      <commons.logback_settings.version>0.0.2-SNAPSHOT</commons.logback_settings.version>
      <commons.net.version>3.0.1</commons.net.version>
      <commons.opendaylight.commons.httpclient>0.1.2-SNAPSHOT</commons.opendaylight.commons.httpclient>
      <commons.opendaylight.concepts.version>0.5.2-SNAPSHOT</commons.opendaylight.concepts.version>
      <commons.opendaylight.version>1.4.2-SNAPSHOT</commons.opendaylight.version>
      <commons.parent.version>1.0.2-SNAPSHOT</commons.parent.version>
 +    <commons.tomcat.api>7.0.32.v201211081135</commons.tomcat.api>
 +    <commons.tomcat.util>7.0.32.v201211201952</commons.tomcat.util>
      <compiler.version>2.3.2</compiler.version>
      <concepts.version>0.5.2-SNAPSHOT</concepts.version>
      <config.version>0.2.5-SNAPSHOT</config.version>
@@@ -341,11 -331,6 +341,11 @@@
          <artifactId>akka-remote_${scala.version}</artifactId>
          <version>${akka.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-testkit_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
        <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>
@@@ -566,47 -551,47 +566,47 @@@
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina</artifactId>
 -        <version>7.0.32.v201211201336</version>
 +        <version>${commons.catalina}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina.ha</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.catalina.ha}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina.tribes</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.catalina.tribes}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.coyote</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.coyote}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.el</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.el}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.jasper</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.jasper}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.juli.extras</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.juli.version}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.tomcat.api</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.tomcat.api}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.tomcat.util</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.tomcat.util}</version>
        </dependency>
        <dependency>
          <groupId>org.aopalliance</groupId>
@@@ -616,7 -601,7 +616,7 @@@
        <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-lang3</artifactId>
 -        <version>${commons.lang.version}</version>
 +        <version>${commons.lang3.version}</version>
        </dependency>
        <dependency>
          <groupId>org.apache.felix</groupId>
@@@ -985,6 -970,12 +985,12 @@@
          <artifactId>netconf-client</artifactId>
          <version>${netconf.version}</version>
        </dependency>
+         <dependency>
+             <groupId>org.opendaylight.controller</groupId>
+             <artifactId>netconf-client</artifactId>
+             <version>${netconf.version}</version>
+             <type>test-jar</type>
+         </dependency>
  
        <!--Netconf config-->
        <dependency>
@@@ -2124,7 -2115,7 +2130,7 @@@
            <includeTestSourceDirectory>true</includeTestSourceDirectory>
            <sourceDirectory>${project.basedir}</sourceDirectory>
            <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
 -          <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/</excludes>
 +          <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/xtend-gen\/</excludes>
          </configuration>
          <dependencies>
            <dependency>

diff --combined opendaylight/netconf/netconf-api/pom.xml
index 815acec5e789cd7d491e5783886492713141405b,0076e1ebbbcae1ed330191b56da5d1021621d8ba..a15047224bfbd91d46bb91f731ef3eea34d61c47
--- 1/opendaylight/netconf/netconf-api/pom.xml
--- 2/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@@ -19,7 -19,6 +19,6 @@@
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>ietf-netconf-monitoring-extension</artifactId>
-       <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -48,7 -47,6 +47,7 @@@
            <instructions>
              <Private-Package></Private-Package>
              <Import-Package>javax.management,
 +                            javax.xml.parsers,
                              org.opendaylight.controller.config.api,
                              org.opendaylight.controller.config.api.jmx,
                              org.opendaylight.protocol.framework,
@@@ -63,7 -61,6 +62,7 @@@
                              com.google.common.base,</Import-Package>
              <Export-Package>org.opendaylight.controller.netconf.api,
                              org.opendaylight.controller.netconf.api.jmx,
 +                            org.opendaylight.controller.netconf.api.xml,
                              org.opendaylight.controller.netconf.api.monitoring,</Export-Package>
            </instructions>
          </configuration>

diff --combined opendaylight/netconf/netconf-util/pom.xml
index f3b35ce3ceaee5b6b26aee7ebac6892e16ef47b6,96bcd66509c5106652fe2b0d31b9af52221e3bdb..df4d389705b29eda03cb3e88a553ba14902720f3
--- 1/opendaylight/netconf/netconf-util/pom.xml
--- 2/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/pom.xml
@@@ -53,14 -53,12 +53,13 @@@
        <plugin>
          <groupId>org.apache.felix</groupId>
          <artifactId>maven-bundle-plugin</artifactId>
-         <version>2.3.7</version>
          <configuration>
            <instructions>
              <Import-Package>com.google.common.base, com.google.common.collect, io.netty.channel,
                io.netty.util.concurrent, javax.annotation, javax.xml.namespace, javax.xml.parsers, javax.xml.transform,
                javax.xml.transform.dom, javax.xml.transform.stream, javax.xml.validation, javax.xml.xpath,
 -              org.opendaylight.controller.netconf.api, org.opendaylight.controller.netconf.mapping.api,
 +              org.opendaylight.controller.netconf.api, org.opendaylight.controller.netconf.api.xml,
 +              org.opendaylight.controller.netconf.mapping.api,
                org.osgi.framework, org.slf4j, org.w3c.dom, org.xml.sax,io.netty.channel.local</Import-Package>
              <Export-Package>org.opendaylight.controller.netconf.util.*</Export-Package>
            </instructions>
@@@ -69,7 -67,6 +68,6 @@@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jar-plugin</artifactId>
-         <version>2.4</version>
          <executions>
            <execution>
              <goals>