Fixed bug 4271 - dependency removed in Beryllium

[alto.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3476d54e6dc750a13434ff7844055709d8ec6420..fa3576d7495217dbe4b79a2db70617a9771509bc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,59 +8,74 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>alto-parent</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <name>alto</name> <!-- Used by Sonar to set project name -->
   <packaging>pom</packaging>
 
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/alto.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/alto.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/ALTO:Main</url>
+    <tag>HEAD</tag>
+  </scm>
+
   <modules>
     <module>alto-model</module>
     <module>alto-config</module> <!-- required by alto-manager -->
     <module>alto-provider</module>
+    <module>alto-hosttracker</module>
     <module>features</module>
     <module>alto-commons</module>
     <module>alto-manager</module>
     <module>alto-services/api</module>
+    <module>alto-services/provider</module>
     <module>alto-extensions</module>
-    <!-- <module>alto-karaf</module> -->
     <module>alto-northbound</module>
-    <module>alto-karaf</module>
+    <!-- <module>alto-karaf</module> -->
   </modules>
 
   <properties>
-    <odl.version>1.5.0-SNAPSHOT</odl.version>
+    <odl.version>1.6.0-SNAPSHOT</odl.version>
     <karaf.shell.version>2.2.11</karaf.shell.version>
-    <checkstyle.skip>true</checkstyle.skip>
 
     <!-- required by alto command line -->
     <httpclient.version>4.4.1</httpclient.version>
 
-    <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
-    <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
+    <ietf.model.version>2010.09.24.8-SNAPSHOT</ietf.model.version>
+    <ietf.yang.types.version>2013.07.15.8-SNAPSHOT</ietf.yang.types.version>
 
     <!-- used by yangtools, but the name is strange.
          TODO: need more investigation -->
-    <config.version>0.3.0-SNAPSHOT</config.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
 
-    <sal.version>0.7.1-SNAPSHOT</sal.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
     <war.version>${karaf.version}</war.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
 
     <controller.checkstyle.version> <!-- checkstyle artifact of controller -->
-      0.1.0-SNAPSHOT
+      0.2.0-SNAPSHOT
     </controller.checkstyle.version>
     <controller.commons.northbound.version> <!-- required by alto-northbound -->
-      0.5.0-SNAPSHOT
+      0.6.0-SNAPSHOT
     </controller.commons.northbound.version>
+    <l2switch.version>0.3.0-SNAPSHOT</l2switch.version>
+    <ietf.topology.version>2013.10.21.8-SNAPSHOT</ietf.topology.version>
+    <commons.catalina.version>7.0.53.v201406061610</commons.catalina.version>
+    <commons.coyote.version>7.0.53.v201406070630</commons.coyote.version>
+    <commons.juli.version>7.0.53.v201406060720</commons.juli.version>
+    <commons.tomcat.api.version>7.0.53.v201406060720</commons.tomcat.api.version>
+    <commons.tomcat.util.version>7.0.53.v201406070630</commons.tomcat.util.version>
+    <servlet.version>3.0.1</servlet.version>
   </properties>
 
   <dependencyManagement>
@@ -100,6 +115,11 @@
         <artifactId>sal-common-util</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.googlecode.concurrent-trees</groupId>
+        <artifactId>concurrent-trees</artifactId>
+        <version>2.4.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -144,7 +164,41 @@
             </dependency>
           </dependencies>
         </plugin>
+
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>prepare-ut-agent</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <destFile>${sonar.jacoco.reportPath}</destFile>
+              </configuration>
+            </execution>
+            <execution>
+              <id>prepare-it-agent</id>
+              <phase>pre-integration-test</phase>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <destFile>${sonar.jacoco.itReportPath}</destFile>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
 </project>