Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Added NOTICE file"
[controller.git]
/
opendaylight
/
commons
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/commons/opendaylight/pom.xml
b/opendaylight/commons/opendaylight/pom.xml
index 56df36a934acef5ac3fb6618862fbd6d77ebff8b..f6282d86a2e1e11967521e76aa277fabcd8a406d 100644
(file)
--- a/
opendaylight/commons/opendaylight/pom.xml
+++ b/
opendaylight/commons/opendaylight/pom.xml
@@
-60,7
+60,7
@@
<pluginRepository>
<id>central2</id>
<name>central2</name>
<pluginRepository>
<id>central2</id>
<name>central2</name>
- <url>
${nexusproxy}/repositories/central2/
</url>
+ <url>
http://repo2.maven.org/maven2
</url>
</pluginRepository>
</pluginRepositories>
</pluginRepository>
</pluginRepositories>
@@
-125,7
+125,6
@@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@@
-206,19
+205,27
@@
<name>ebr-bundles-external</name>
<url>${nexusproxy}/repositories/ebr-bundles-external/</url>
</repository>
<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>
<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>
</repository>
- <!-- Maven repo1 mirror -->
- <!-- http://repo1.maven.org/maven2 -->
<repository>
<id>central</id>
<name>central</name>
<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 -->
</repository>
<!-- Pax mirror -->
<!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
@@
-411,10
+418,19
@@
</configuration>
<executions>
<execution>
</configuration>
<executions>
<execution>
+ <id>failsafe-integration-tests</id>
+ <phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
+ <execution>
+ <id>failsafe-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
</executions>
</plugin>
<plugin>