X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=5123b1e80117b0da3d675770d10e7600271d37d1;hb=58ff9cb81d6f465d13b72a2652359258438f2f1b;hp=804a65372c567dc6bf43d0d2b58acaf1341a2ef2;hpb=b7fc0b9c1b66a1976db3b5f748c7d378d7c7c2d8;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 804a65372c..5123b1e801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,15 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
-        <relativePath></relativePath>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <prerequisites>
         <maven>3.0</maven>
     </prerequisites>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -26,12 +26,12 @@
       <!-- OpenDayLight Released artifact -->
       <repository>
         <id>opendaylight-release</id>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
+        <url>${nexusproxy}/repositories/opendaylight.release</url>
       </repository>
       <!-- OpenDayLight Snapshot artifact -->
       <snapshotRepository>
         <id>opendaylight-snapshot</id>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
       </snapshotRepository>
       <!-- Site deployment -->
       <!-- site>
@@ -42,24 +42,46 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
+      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-      <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
-      <controller.model.version>1.1-SNAPSHOT</controller.model.version>
-      <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
-      <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
-      <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
-      <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
+      <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
+      <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
+      <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
+      <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
+      <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
+      <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
+      <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
       <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
       <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
-        <controller.distribution.version>0.1.2-SNAPSHOT</controller.distribution.version>
+      <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
+
+      <!-- Sonar config -->
+      <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
+      <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+      <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+      <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+      <sonar.profile>Sonar way with Findbugs</sonar.profile>
+
+      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+      <yang.binding.version>0.7.0-SNAPSHOT</yang.binding.version>
+      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
+         <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${yang.binding.version}</version>
+        </dependency>
+          <dependency>
+              <groupId>org.opendaylight.openflowplugin</groupId>
+              <artifactId>openflowplugin-api</artifactId>
+              <version>${project.version}</version>
+          </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
           <artifactId>openflow-protocol-impl</artifactId>
@@ -90,11 +112,6 @@
           <artifactId>model-flow-base</artifactId>
           <version>${controller.model.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-flow-management</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller.model</groupId>
           <artifactId>model-flow-service</artifactId>
@@ -117,21 +134,20 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
+            <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
-            <version>${sal.connection.api.version}</version>
+            <artifactId>sal-common-util</artifactId>
+            <version>${controller.model.version}</version>
         </dependency>
+        <!-- IT -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${controller.model.version}</version>
+            <version>${sal.common.util.version}</version>
         </dependency>
-
-        <!-- IT -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-netconf-connector</artifactId>
@@ -212,7 +228,7 @@
         <dependency>
           <groupId>org.opendaylight.controller.thirdparty</groupId>
           <artifactId>ganymed</artifactId>
-          <version>1.1-SNAPSHOT</version>
+          <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
@@ -228,12 +244,50 @@
       </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>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>build-helper-maven-plugin</artifactId>
-          </plugin>
+            <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>build-helper-maven-plugin</artifactId>
+            </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>
+                            <propertyName>jacoco.agent.ut.arg</propertyName>
+                        </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>
+                            <propertyName>jacoco.agent.it.arg</propertyName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
           <plugins>
@@ -314,7 +368,7 @@
             <plugin>
               <groupId>org.opendaylight.yangtools</groupId>
               <artifactId>yang-maven-plugin</artifactId>
-              <version>0.6.2-SNAPSHOT</version>
+              <version>${yang.binding.version}</version>
             </plugin>
             <plugin>
               <groupId>org.apache.felix</groupId>
@@ -346,7 +400,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -359,7 +413,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -374,7 +428,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -402,7 +456,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -415,7 +469,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <execute></execute>
+                        <execute/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -428,7 +482,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -441,13 +495,43 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
                 </lifecycleMappingMetadata>
               </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-failsafe-plugin</artifactId>
+              <configuration>
+                <!-- Specific to generate mapping between tests and covered code -->
+                <argLine>${jacoco.agent.it.arg}</argLine>
+                <properties>
+                  <property>
+                    <name>listener</name>
+                    <value>org.sonar.java.jacoco.JUnitListener</value>
+                  </property>
+                </properties>
+                <!-- Let's put failsafe reports with surefire to have access to tests failures/success reports in sonar -->
+                <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <!-- Specific to generate mapping between tests and covered code -->
+                <argLine>${jacoco.agent.ut.arg}</argLine>
+                <properties>
+                  <property>
+                    <name>listener</name>
+                    <value>org.sonar.java.jacoco.JUnitListener</value>
+                  </property>
+                </properties>
+              </configuration>
+            </plugin>
           </plugins>
         </pluginManagement>
     </build>
@@ -543,14 +627,19 @@
     <modules>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
+      <module>extension</module>
       <module>distribution/base</module>
-      <module>distribution/cbench</module>            
+      <module>distribution/cbench</module>
+      <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>
       <module>openflowplugin-it</module>
       <module>test-provider</module>
       <module>drop-test</module>
+      <module>drop-test-karaf</module>
+      <module>test-common</module>
       <module>features</module>
       <module>samples/sample-consumer</module>
       <module>samples/learning-switch</module>
-    </modules>
+    <module>applications</module>
+  </modules>
 </project>