Incrementing versions by 0.1.0 for post-lithium master branch

[groupbasedpolicy.git] / commons / parent / pom.xml

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index d859cae995a45b8b7a993fe6001ffa7f4eb34cbc..a6314a9420f91c559f7feec1883287cd1c898a50 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -10,13 +10,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../odlparent/odlparent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>commons.groupbasedpolicy</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <prerequisites>
@@ -28,13 +28,16 @@
     <generated.sources.sal>${project.build.directory}/generated-sources/sal</generated.sources.sal>
     <generated.sources.config>${project.build.directory}/generated-sources/config</generated.sources.config>
     <generated.yang.docs>${project.build.directory}/site/models</generated.yang.docs>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.2.0-SNAPSHOT</restconf.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
-    <neutron.version>0.5.0-SNAPSHOT</neutron.version>
-    <ovsdb.southbound.version>1.1.0-SNAPSHOT</ovsdb.southbound.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <sfc.version>0.2.0-SNAPSHOT</sfc.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
+    <ovsdb.southbound.version>1.2.0-SNAPSHOT</ovsdb.southbound.version>
+    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
   </properties>
 
   <dependencyManagement>
@@ -60,6 +63,11 @@
         <artifactId>neutron-mapper</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.groupbasedpolicy</groupId>
+        <artifactId>neutron-ovsdb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.groupbasedpolicy</groupId>
         <artifactId>ui-backend</artifactId>
@@ -95,9 +103,32 @@
         <artifactId>openflowplugin-extension-nicira</artifactId>
         <version>${openflowplugin.version}</version>
       </dependency>
+      
+      <!-- OVSDB -->
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>southbound-api</artifactId>
+        <version>${ovsdb.southbound.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>southbound-impl</artifactId>
+        <version>${ovsdb.southbound.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
+    <dependencies>
+        <!-- Sonar -->
+        <dependency>
+            <groupId>org.codehaus.sonar-plugins.java</groupId>
+            <artifactId>sonar-jacoco-listeners</artifactId>
+            <version>${sonar-jacoco-listeners.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -134,22 +165,23 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>pre-unit-test</id>
+            <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>post-unit-test</id>
-            <phase>test</phase>
+            <id>prepare-it-agent</id>
+            <phase>pre-integration-test</phase>
             <goals>
-              <goal>report</goal>
+              <goal>prepare-agent</goal>
             </goals>
             <configuration>
-              <dataFile>${sonar.jacoco.reportPath}</dataFile>
-              <includes>
-                <include>org/opendaylight/groupbasedpolicy/**/*.class</include>
-              </includes>
+              <destFile>${sonar.jacoco.itReportPath}</destFile>
             </configuration>
           </execution>
         </executions>