Merge changes

[bgpcep.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 880e68d531d0e5b4f0f97d6064af5f6afc43376a..02d7546df7947d7ec08159f9b8e7d3f9c880f7ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,41 +15,157 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <commonscodec.version>1.7</commonscodec.version>
                <dependency.version>2.8</dependency.version>
-               <guava.version>13.0.1</guava.version>
+               <guava.version>14.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>
                <logback.version>1.0.7</logback.version>
                <maven.bundle.version>2.4.0</maven.bundle.version>
                <maven.compiler.version>3.1</maven.compiler.version>
+               <maven.jar.version>2.4</maven.jar.version>
                <maven.shade.version>2.1</maven.shade.version>
                <mockito.version>1.9.5</mockito.version>
-               <netty.version>4.0.9.Final</netty.version>
+               <netty.version>4.0.10.Final</netty.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.8-SNAPSHOT</yangtools.version>
+               <osgi.version>5.0.0</osgi.version>
+
+               <yangtools.version>0.5.9-SNAPSHOT</yangtools.version>
+        <controller.config.version>0.2.3-SNAPSHOT</controller.config.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>
        </prerequisites>
 
        <modules>
-               <module>bgp</module>
+               <!-- Common infra -->
                <module>concepts</module>
                <module>framework</module>
                <module>mockito-configuration</module>
-               <module>pcep</module>
                <module>util</module>
+
+               <!-- Subsystems -->
+               <module>bgp</module>
+               <module>pcep</module>
+               <module>programming</module>
+               <module>rsvp</module>
+               <module>topology</module>
+
+               <!-- Integration tests -->
+               <module>integration-tests</module>
        </modules>
 
+    <dependencyManagement>
+               <dependencies>
+                       <!-- This project -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>concepts</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>framework</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+                       <!-- Testing Dependencies -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.mockito</groupId>
+                               <artifactId>mockito-core</artifactId>
+                               <version>${mockito.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>${project.groupId}</groupId>
+                               <artifactId>mockito-configuration</artifactId>
+                               <version>${project.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+
+                       <!-- Supporting Libraries -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+                       <dependency>
+                               <groupId>com.google.code.findbugs</groupId>
+                               <artifactId>jsr305</artifactId>
+                               <version>2.0.1</version>
+                       </dependency>
+
+                       <!-- Netty -->
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-buffer</artifactId>
+                               <version>${netty.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-codec</artifactId>
+                               <version>${netty.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-common</artifactId>
+                               <version>${netty.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-transport</artifactId>
+                               <version>${netty.version}</version>
+                       </dependency>
+
+                       <!-- YANG tools -->
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-binding</artifactId>
+                               <version>${yang.binding.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-common</artifactId>
+                               <version>${yangtools.version}</version>
+                       </dependency>
+
+                       <!-- Controller infrastructure -->
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>config-api</artifactId>
+                               <version>${controller.config.version}</version>
+                       </dependency>
+
+                       <!-- OSGi -->
+                       <dependency>
+                               <groupId>org.osgi</groupId>
+                               <artifactId>org.osgi.core</artifactId>
+                               <version>${osgi.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+        </dependencies>
+    </dependencyManagement>
+
        <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
@@ -104,11 +220,11 @@
                                <version>${surefire.version}</version>
                                <configuration>
                                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                                       <parallel>classes</parallel>
+                                       <!--parallel>classes</parallel>
                                        <forkCount>1C</forkCount>
                                        <reuseForks>false</reuseForks>
-                                       <perCoreThreadCount>true</perCoreThreadCount>
-                                       <threadCount>2</threadCount>
+                                       <perCoreThreadCount>true</perCoreThreadCount-->
+                                       <threadCount>1</threadCount>
                                </configuration>
                        </plugin>
 
@@ -135,6 +251,7 @@
                         <configuration>
                             <sources>
                                 <source>target/generated-sources/sal</source>
+                                <source>target/generated-sources/config</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -187,6 +304,11 @@
        </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>
@@ -195,6 +317,11 @@
        </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>