X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parent%2Fpom.xml;h=a8806b7e3ef6a01dadd9970c3fbb1a60b7be6188;hb=95fc4fb0fdb012b6e7d0fd007f94daa84ef9130d;hp=8cff79012c79e6b5efef617732fd2f9f4b0f5c3a;hpb=a4d0afddaa49582b6ed5f88651dc8c8d4018f749;p=openflowjava.git

diff --git a/parent/pom.xml b/parent/pom.xml
index 8cff7901..a8806b7e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,14 +4,19 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-Beryllium-SR1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.7.1-Beryllium-SR1</version>
     <packaging>pom</packaging>
+    <name>openflowjava</name> <!-- Used by Sonar to set project name -->
+    <description>
+        Openflow protocol library - serializes and deserializes openflow messages + handles connections with openflow devices.
+    </description>
+    <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
 
     <licenses>
         <license>
@@ -28,22 +33,31 @@
         <tag>HEAD</tag>
     </scm>
 
+    <developers>
+        <developer>
+            <name>Michal Polkorab</name>
+            <email>michal.polkorab@pantheon.sk</email>
+            <organization>Pantheon Technologies</organization>
+            <organizationUrl>https://www.pantheon.sk/en/</organizationUrl>
+        </developer>
+        <developer>
+            <name>Michal Rehak</name>
+            <email>mirehak@cisco.com</email>
+            <organization>Cisco Systems</organization>
+            <organizationUrl>www.cisco.com</organizationUrl>
+        </developer>
+    </developers>
+
     <properties>
         <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.6.0-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.6.1-Beryllium-SR1</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
-        <config.version>0.4.0-SNAPSHOT</config.version>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.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>
+        <config.version>0.4.1-Beryllium-SR1</config.version>
+        <mdsal.version>1.3.1-Beryllium-SR1</mdsal.version>
+        <yangtools.version>0.8.1-Beryllium-SR1</yangtools.version>
     </properties>
 
     <dependencyManagement>
@@ -79,16 +93,6 @@
         </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>
@@ -155,34 +159,6 @@
                 <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>
@@ -210,36 +186,6 @@
                         </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>