Merge "Declare a property for commons-lang version in poms and use it."

[controller.git] / opendaylight / commons / opendaylight / pom.xml

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 56df36a934acef5ac3fb6618862fbd6d77ebff8b..075ccb1bfa58bff729814c4ccd65eaa2dbb17458 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -54,13 +54,14 @@
     <javassist.version>3.17.1-GA</javassist.version>
     <sample-toaster.version>1.0-SNAPSHOT</sample-toaster.version>
     <releaseplugin.version>2.3.2</releaseplugin.version>
+    <commons.lang.version>3.1</commons.lang.version>
   </properties>
 
   <pluginRepositories>
     <pluginRepository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -125,7 +126,6 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
           <version>${guava.version}</version>
-          <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.javassist</groupId>
@@ -206,19 +206,27 @@
       <name>ebr-bundles-external</name>
       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
     </repository>
-    <!-- Maven repo2 mirror -->
-    <!-- http://repo2.maven.org/maven2 -->
     <repository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
     </repository>
-    <!-- Maven repo1 mirror -->
-    <!-- http://repo1.maven.org/maven2 -->
     <repository>
       <id>central</id>
       <name>central</name>
-      <url>${nexusproxy}/repositories/central/</url>
+      <url>http://repo1.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
     </repository>
     <!-- Pax mirror -->
     <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
@@ -411,10 +419,19 @@
         </configuration>
         <executions>
           <execution>
+            <id>failsafe-integration-tests</id>
+            <phase>integration-test</phase>
             <goals>
               <goal>integration-test</goal>
             </goals>
           </execution>
+          <execution>
+            <id>failsafe-verify</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -614,6 +631,11 @@
       <artifactId>jackson-jaxrs</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-xc</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
@@ -769,7 +791,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>${commons.lang.version}</version>
     </dependency>
     <dependency>
       <groupId>virgomirror</groupId>