X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=d2d90009ee90880e45fc5c306cdb1e9cbd97e4af;hb=ba9b36dae13ea6deb1b34c2d40281c1dd68a2eff;hp=c8808c2b39cef4f39783511a8693fb1a5ab98e59;hpb=d89c89e361d256cdcb1ac48359913e56577ac906;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index c8808c2b..d2d90009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>openflow-protocol-api</module>
@@ -11,10 +11,8 @@
         <module>util</module>
         <module>openflow-protocol-impl</module>
         <module>openflow-protocol-it</module>
-        <module>feature</module>
+        <module>features</module>
         <module>simple-client</module>
-        <module>openflow-nx-resubmit-action</module>
-        <module>openflow-extension-nicira</module>
     </modules>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
@@ -36,25 +34,29 @@
         <url.version>1.5.0</url.version>
         <enunciate.version>1.26.2</enunciate.version>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
+        <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
         <sonar.branch>${user.name}-private-view</sonar.branch>
         <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
         <logback.version>1.0.9</logback.version>
         <slf4j.version>1.7.2</slf4j.version>
-        <yang.prototype.version>1.1-SNAPSHOT</yang.prototype.version>
-        <ietf.model.version>2010.09.24.4-SNAPSHOT</ietf.model.version>
-        <yang.ext.version>2013.09.07.4-SNAPSHOT</yang.ext.version>
+        <yang.prototype.version>1.2.0-SNAPSHOT</yang.prototype.version>
+        <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
+        <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
         <guava.version>14.0.1</guava.version> 
-        <netty.version>4.0.19.Final</netty.version>
+        <netty.version>4.0.23.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
-	<config.version>0.2.5-SNAPSHOT</config.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
+	<config.version>0.3.0-SNAPSHOT</config.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>
     </properties>
 
     <pluginRepositories>
@@ -66,11 +68,17 @@
             <snapshots>
               <enabled>false</enabled>
             </snapshots>
+            <releases>
+              <enabled>true</enabled>
+            </releases>
         </pluginRepository>
         <!-- OpenDayLight Snapshot artifact -->
         <pluginRepository>
             <id>opendaylight-snapshot</id>
             <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+            <snapshots>
+              <enabled>true</enabled>
+            </snapshots>
             <releases>
               <enabled>false</enabled>
             </releases>
@@ -87,12 +95,18 @@
             <snapshots>
               <enabled>false</enabled>
             </snapshots>
+            <releases>
+              <enabled>true</enabled>
+            </releases>
         </repository>
         <!-- OpenDayLight Snapshot artifact -->
         <repository>
             <id>opendaylight-snapshot</id>
             <name>opendaylight-snapshot</name>
             <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+            <snapshots>
+              <enabled>true</enabled>
+            </snapshots>
             <releases>
               <enabled>false</enabled>
             </releases>
@@ -119,6 +133,21 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- feature dependencies -->
+            <dependency>
+              <groupId>org.opendaylight.yangtools</groupId>
+              <artifactId>features-yangtools</artifactId>
+              <version>${yangtools.version}</version>
+              <classifier>features</classifier>
+              <type>xml</type>
+            </dependency>
+            <dependency>
+              <groupId>org.opendaylight.controller</groupId>
+              <artifactId>features-config</artifactId>
+              <version>${config.version}</version>
+              <classifier>features</classifier>
+              <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -134,6 +163,21 @@
                 <artifactId>netty-handler</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>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -162,7 +206,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
-                <version>0.2.5-SNAPSHOT</version>
+                <version>0.3.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -177,8 +221,24 @@
                 <version>1.9.5</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+              <groupId>org.opendaylight.yangtools</groupId>
+              <artifactId>features-test</artifactId>
+              <version>${yangtools.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>
@@ -203,20 +263,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
               <groupId>org.apache.felix</groupId>
               <artifactId>maven-bundle-plugin</artifactId>
@@ -260,6 +306,34 @@
                 <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>
@@ -312,6 +386,36 @@
                         </execution>
                     </executions>
                 </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>
                 <!-- Ignore/Execute plugin execution -->
                 <plugin>
                   <groupId>org.eclipse.m2e</groupId>