Merge "Bug 1129: Removing hard coded versions from config subsystem"
authorEd Warnicke <eaw@cisco.com>
Mon, 23 Jun 2014 20:18:52 +0000 (20:18 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 23 Jun 2014 20:18:52 +0000 (20:18 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml

index cc256379fa8cd5bc866f29f9a0c0344ce61a7442,d478e0507f5774bb5ac510981c2ff384cf0f4538..afd518b79ac34bdd54c7cfbabd2f5509c2c023a2
@@@ -22,7 -22,6 +22,6 @@@
      <aries.util.version>1.1.0</aries.util.version>
      <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 -->
      <bouncycastle.version>1.50</bouncycastle.version>
@@@ -30,7 -29,7 +29,7 @@@
      <bundlescanner.api.version>0.4.2-SNAPSHOT</bundlescanner.api.version>
      <bundlescanner.implementation.version>0.4.2-SNAPSHOT</bundlescanner.implementation.version>
      <bundlescanner.version>0.4.2-SNAPSHOT</bundlescanner.version>
-     <checkstyle.version>2.10</checkstyle.version>
+     <checkstyle.version>2.12</checkstyle.version>
      <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
      <clustering.services_implementation.version>0.4.3-SNAPSHOT</clustering.services_implementation.version>
      <clustering.stub.version>0.4.2-SNAPSHOT</clustering.stub.version>
@@@ -50,7 -49,6 +49,7 @@@
      <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>
      <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>
      <karaf.shell.version>3.0.0</karaf.shell.version>
      <karaf.version>3.0.1</karaf.version>
+     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
      <logback.version>1.0.9</logback.version>
      <logging.bridge.version>0.4.2-SNAPSHOT</logging.bridge.version>
      <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
      <!-- Java Versions -->
      <maven.compiler.source>1.7</maven.compiler.source>
      <maven.compiler.target>1.7</maven.compiler.target>
+     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
      <mockito.version>1.9.5</mockito.version>
      <netconf.version>0.2.5-SNAPSHOT</netconf.version>
          <artifactId>guava</artifactId>
          <version>${guava.version}</version>
        </dependency>
+       <!-- 3rd party dependencies needed by config-->
+       <dependency>
+         <groupId>com.jcabi</groupId>
+         <artifactId>jcabi-maven-slf4j</artifactId>
+         <version>0.8</version>
+       </dependency>
  
        <dependency>
          <groupId>com.sun.jersey</groupId>
          <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>
          <artifactId>jsr311-api</artifactId>
          <version>${jsr311.api.version}</version>
        </dependency>
+       <dependency>
+         <groupId>net.sourceforge.pmd</groupId>
+         <artifactId>pmd</artifactId>
+         <version>5.1.0</version>
+       </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>javax.activation</artifactId>
        <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>
          <artifactId>enunciate-core-annotations</artifactId>
          <version>${enunciate.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.codehaus.gmaven.runtime</groupId>
+         <artifactId>gmaven-runtime-2.0</artifactId>
+         <version>1.5</version>
+       </dependency>
        <dependency>
          <groupId>org.codehaus.jettison</groupId>
          <artifactId>jettison</artifactId>
          <version>${jettison.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.eclipse</groupId>
+         <artifactId>jdt</artifactId>
+         <version>3.3.0-v20070607-1300</version>
+       </dependency>
+       <dependency>
+         <groupId>org.eclipse.equinox</groupId>
+         <artifactId>app</artifactId>
+         <version>1.0.0-v20070606</version>
+       </dependency>
  
        <!-- equinox http service bridge -->
        <dependency>
          <artifactId>servlet</artifactId>
          <version>1.0.0-v20070606</version>
        </dependency>
+       <dependency>
+         <groupId>org.eclipse.jdt</groupId>
+         <artifactId>core</artifactId>
+         <version>3.3.0-v_771</version>
+       </dependency>
        <dependency>
          <groupId>org.eclipse.persistence</groupId>
          <artifactId>org.eclipse.persistence.antlr</artifactId>
          <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>
          <plugin>
            <groupId>org.eclipse.m2e</groupId>
            <artifactId>lifecycle-mapping</artifactId>
-           <version>1.0.0</version>
+           <version>${lifecycle.mapping.version}</version>
            <configuration>
              <lifecycleMappingMetadata>
                <pluginExecutions>