Code Review
/
bgpcep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-47 : PCEP migration to generated DTOs."
[bgpcep.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 275708089e9a2f6dd4416c8825dfdad83a9155b8..5f5bc8d266d051d02b0de0d5ccb68e3b199f0bb4 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-15,7
+15,7
@@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commonscodec.version>1.7</commonscodec.version>
<dependency.version>2.8</dependency.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commonscodec.version>1.7</commonscodec.version>
<dependency.version>2.8</dependency.version>
- <guava.version>1
3
.0.1</guava.version>
+ <guava.version>1
4
.0.1</guava.version>
<java.version.source>1.7</java.version.source>
<java.version.target>1.7</java.version.target>
<junit.version>4.10</junit.version>
<java.version.source>1.7</java.version.source>
<java.version.target>1.7</java.version.target>
<junit.version>4.10</junit.version>
@@
-28,6
+28,10
@@
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
<slf4j.version>1.7.2</slf4j.version>
<surefire.version>2.15</surefire.version>
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
<slf4j.version>1.7.2</slf4j.version>
<surefire.version>2.15</surefire.version>
+
+ <yangtools.version>0.5.9-SNAPSHOT</yangtools.version>
+ <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>
+ <ietf.types.version>2010.09.24.1</ietf.types.version>
</properties>
<prerequisites>
<maven>3.0.4</maven>
</properties>
<prerequisites>
<maven>3.0.4</maven>
@@
-37,6
+41,7
@@
<module>bgp</module>
<module>concepts</module>
<module>framework</module>
<module>bgp</module>
<module>concepts</module>
<module>framework</module>
+ <module>integration-tests</module>
<module>mockito-configuration</module>
<module>pcep</module>
<module>util</module>
<module>mockito-configuration</module>
<module>pcep</module>
<module>util</module>
@@
-103,11
+108,11
@@
<version>${surefire.version}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<version>${surefire.version}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <parallel>classes</parallel>
+ <
!--
parallel>classes</parallel>
<forkCount>1C</forkCount>
<reuseForks>false</reuseForks>
<forkCount>1C</forkCount>
<reuseForks>false</reuseForks>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>
2
</threadCount>
+ <perCoreThreadCount>true</perCoreThreadCount
--
>
+ <threadCount>
1
</threadCount>
</configuration>
</plugin>
</configuration>
</plugin>
@@
-186,6
+191,11
@@
</build>
<repositories>
</build>
<repositories>
+ <repository>
+ <id>opendaylight-release</id>
+ <name>opendaylight-release</name>
+ <url>${nexusproxy}/repositories/opendaylight.release/</url>
+ </repository>
<repository>
<id>opendaylight-snapshot</id>
<name>opendaylight-snapshot</name>
<repository>
<id>opendaylight-snapshot</id>
<name>opendaylight-snapshot</name>
@@
-194,6
+204,11
@@
</repositories>
<pluginRepositories>
</repositories>
<pluginRepositories>
+ <pluginRepository>
+ <id>opendaylight-release</id>
+ <name>opendaylight-release</name>
+ <url>${nexusproxy}/repositories/opendaylight.release/</url>
+ </pluginRepository>
<pluginRepository>
<id>opendaylight-snapshot</id>
<name>opendaylight-snapshot</name>
<pluginRepository>
<id>opendaylight-snapshot</id>
<name>opendaylight-snapshot</name>