Merge "Add snapshots/releases setting to all maven repos."
authorGiovanni Meo <gmeo@cisco.com>
Mon, 9 Sep 2013 20:11:46 +0000 (20:11 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 9 Sep 2013 20:11:46 +0000 (20:11 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml
opendaylight/northbound/integrationtest/pom.xml

index 4ad7c9403285bba8171fa4e03cc9cd214e7f8c8b,75b78cf015d08759e247a15da5691f39020e331b..f6282d86a2e1e11967521e76aa277fabcd8a406d
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>${guava.version}</version>
-           <type>jar</type>
          </dependency>
          <dependency>
            <groupId>org.javassist</groupId>
        <id>central2</id>
        <name>central2</name>
        <url>http://repo2.maven.org/maven2</url>
+       <snapshots>
+         <enabled>false</enabled>
+       </snapshots>
+       <releases>
+           <enabled>true</enabled>
+       </releases>
      </repository>
      <repository>
        <id>central</id>
        <name>central</name>
        <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 -->
          </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>
index eeaa18bbe895822696ea009fed7333e008d4d27d,4d0f663dea73f8f90d659371a9bbb1e17fb648b4..88cff5ed835e1475e7c0f7acaf80e40b06ca348b
@@@ -5,9 -5,9 +5,9 @@@
    <modelVersion>4.0.0</modelVersion>
    <parent>
      <groupId>org.opendaylight.controller</groupId>
 -    <artifactId>commons.opendaylight</artifactId>
 -    <version>1.4.0-SNAPSHOT</version>
 -    <relativePath>../../commons/opendaylight</relativePath>
 +    <artifactId>commons.integrationtest</artifactId>
 +    <version>0.5.0-SNAPSHOT</version>
 +    <relativePath>../../commons/integrationtest</relativePath>
    </parent>
    <scm>
      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
        <id>central2</id>
        <name>central2</name>
        <url>http://repo2.maven.org/maven2</url>
+       <snapshots>
+         <enabled>false</enabled>
+       </snapshots>
+       <releases>
+         <enabled>true</enabled>
+       </releases>
      </pluginRepository>
    </pluginRepositories>
    <dependencies>
        <artifactId>usermanager</artifactId>
        <version>0.4.0-SNAPSHOT</version>
      </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.controller</groupId>
 +      <artifactId>usermanager.implementation</artifactId>
 +      <version>0.4.0-SNAPSHOT</version>
 +    </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>security</artifactId>
        <artifactId>commons-fileupload</artifactId>
        <version>1.2.2</version>
      </dependency>
 +    <dependency>
 +      <groupId>commons-codec</groupId>
 +      <artifactId>commons-codec</artifactId>
 +      <version>1.8</version>
 +    </dependency>
      <dependency>
        <groupId>equinoxSDK381</groupId>
        <artifactId>javax.servlet</artifactId>