X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=10034e01283c869880a927a2d104b8f27d8327ca;hb=refs%2Fchanges%2F17%2F16417%2F1;hp=9af788e9f72371cedc79ef74287f22d2ea7f5995;hpb=d519baf78f6149b4f7b3107b4788328e966af889;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 9af788e9f7..10034e0128 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,17 @@
     <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>
+    <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <scm>
@@ -26,12 +28,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 +44,80 @@
 
     <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>
+      <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
+      <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
+      <sal.binding.api.version>1.2.0-SNAPSHOT</sal.binding.api.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>
+      <features.test.version>1.5.0-SNAPSHOT</features.test.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>
+      <config.version>0.3.0-SNAPSHOT</config.version>
+      <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+      <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
+      <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
+      <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
+      <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
+         <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>${yang.binding.version}</version>
+    	</dependency>
+    	<dependency>
+	    <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+	    <version>${ietf-inet-types.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+	    <version>${ietf-yang-types.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>yang-ext</artifactId>
+            <version>${yang-ext.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>opendaylight-l2-types</artifactId>
+            <version>${opendaylight-l2-types.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>
@@ -85,47 +143,60 @@
           <artifactId>simple-client</artifactId>
           <version>${openflowjava.version}</version>
         </dependency>
+
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-base</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-service</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-statistics</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
+
         <dependency>
           <groupId>org.opendaylight.controller.model</groupId>
           <artifactId>model-inventory</artifactId>
           <version>${controller.model.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-topology</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-api</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>${sal.api.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-config</artifactId>
+          <version>${sal.binding.api.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-util</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
-            <version>${sal.connection.api.version}</version>
+            <artifactId>liblldp</artifactId>
+            <version>${sal.api.version}</version>
         </dependency>
         <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>
@@ -135,27 +206,44 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-it</artifactId>
-            <version>${controller.model.version}</version>
+            <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${controller.model.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-broker-impl</artifactId>
+          <version>${sal.binding.api.version}</version>
+
+          <!-- excluding old models pulled as transient dependencies 
+               TODO: remove -->
+          <exclusions>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-base</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-service</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-statistics</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <version>${config.parent.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-manager</artifactId>
+          <version>${config.parent.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-api</artifactId>
+          <version>${config.parent.version}</version>
         </dependency>
-          <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>config-api</artifactId>
-              <version>${config.parent.version}</version>
-          </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-            <version>4.0</version>
+          <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+          <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+          <version>4.0</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -193,6 +281,12 @@
           <version>${netconf.parent.version}</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>features-test</artifactId>
+          <version>${features.test.version}</version>
+        </dependency>
+
         <!-- thirdparty -->
         <dependency>
           <groupId>org.openexi</groupId>
@@ -204,32 +298,67 @@
           <artifactId>nagasena-rta</artifactId>
           <version>${exi.nagasena.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.thirdparty</groupId>
-          <artifactId>ganymed</artifactId>
-          <version>1.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
             <version>1.4.01</version>
         </dependency>
+      </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- Sonar -->
         <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>xtend-lib-osgi</artifactId>
-            <version>2.4.3</version>
+            <groupId>org.codehaus.sonar-plugins.java</groupId>
+            <artifactId>sonar-jacoco-listeners</artifactId>
+            <version>${sonar-jacoco-listeners.version}</version>
             <scope>test</scope>
         </dependency>
-      </dependencies>
-    </dependencyManagement>
+    </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>
+
+                <configuration>
+                  <includes>
+                    <include>org.opendaylight.openflowplugin.*</include>
+                  </includes>
+                </configuration>
+
+            </plugin>
         </plugins>
+
         <pluginManagement>
           <plugins>
             <plugin>
@@ -245,31 +374,10 @@
               <artifactId>maven-paxexam-plugin</artifactId>
               <version>1.2.4</version>
             </plugin>
-            <plugin>
-              <groupId>org.eclipse.xtend</groupId>
-              <artifactId>xtend-maven-plugin</artifactId>
-              <version>${xtend.version}</version>
-              <executions>
-                  <execution>
-                      <goals>
-                          <goal>compile</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${xtend.dstdir}</outputDirectory>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
           <plugin>
               <artifactId>maven-clean-plugin</artifactId>
               <configuration>
                   <filesets>
-                      <fileset>
-                          <directory>${xtend.dstdir}</directory>
-                          <includes>
-                              <include>**</include>
-                          </includes>
-                      </fileset>
                       <fileset>
                           <directory>${jmxGeneratorPath}</directory>
                           <includes>
@@ -300,7 +408,6 @@
                       <sources>
                          <source>${jmxGeneratorPath}</source>
                          <source>${salGeneratorPath}</source>
-                         <source>${xtend.dstdir}</source>
                       </sources>
                    </configuration>
                 </execution>
@@ -309,7 +416,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>
@@ -341,7 +448,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -354,7 +461,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -369,7 +476,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -397,7 +504,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -410,7 +517,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <execute></execute>
+                        <execute/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -423,7 +530,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -436,13 +543,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>
@@ -496,56 +633,22 @@
       </profile>
     </profiles>
 
-    <repositories>
-      <repository>
-        <id>opendaylight-snapshot</id>
-        <name>opendaylight-snapshot</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </repository>
-      <repository>
-        <id>public</id>
-        <name>public</name>
-        <url>http://nexus.opendaylight.org/content/groups/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </repository>
-
-    </repositories>
-
-    <pluginRepositories>
-      <pluginRepository>
-        <id>opendaylight-central</id>
-        <name>opendaylight-central</name>
-        <url>http://nexus.opendaylight.org/content/repositories/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </pluginRepository>
-      <pluginRepository>
-        <id>opendaylight-snapshot</id>
-        <name>central2</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </pluginRepository>
-    </pluginRepositories>
-
     <modules>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
-      <module>distribution/base</module>
-      <module>distribution/cbench</module>            
+      <module>extension</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>
+      <module>model</module>
+      <module>legacy</module>
+  </modules>
 </project>