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

diff --git a/parent/pom.xml b/parent/pom.xml
index 8cff7901..4238e080 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,14 +4,21 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: openflowjava :: ${project.artifactId}</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 +35,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>
         <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.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+        <argparse4j.version>0.7.0</argparse4j.version>
     </properties>
 
     <dependencyManagement>
@@ -72,33 +88,23 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>mdsal-artifacts</artifactId>
-              <version>${mdsal.version}</version>
+              <version>${controller.mdsal.version}</version>
               <scope>import</scope>
               <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>net.sourceforge.argparse4j</groupId>
+                <artifactId>argparse4j</artifactId>
+                <version>${argparse4j.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>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
@@ -125,7 +131,7 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-	          <artifactId>maven-checkstyle-plugin</artifactId>
+              <artifactId>maven-checkstyle-plugin</artifactId>
               <version>${checkstyle.version}</version>
               <configuration>
                 <failOnViolation>false</failOnViolation>
@@ -154,33 +160,20 @@
             <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>
+                  <execution>
+                    <id>add-yang-sources</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                      <goal>add-source</goal>
+                    </goals>
+                    <configuration>
+                      <sources>
+                        <source>${jmxGeneratorPath}</source>
+                        <source>${salGeneratorPath}</source>
+                      </sources>
+                    </configuration>
+                  </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -210,36 +203,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>
@@ -304,19 +267,6 @@
                             <ignore/>
                           </action>
                         </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.opendaylight.yangtools</groupId>
-                            <artifactId>yang-maven-plugin</artifactId>
-                            <versionRange>[0.5,)</versionRange>
-                            <goals>
-                              <goal>generate-sources</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <execute/>
-                          </action>
-                        </pluginExecution>
                         <pluginExecution>
                           <pluginExecutionFilter>
                             <groupId>org.codehaus.groovy.maven</groupId>