X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=commons%2Fparent%2Fpom.xml;h=ceba0549d37a695983725eab04e3674ae35b0fa7;hb=6ad46324fb0abe0faf39e53eac90af53adabdf4a;hp=e3135dc0ebda37e400089a332c187031112a6c62;hpb=3c73defbc882b42de41b43ac2a3b35592e216157;p=lispflowmapping.git

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e3135dc0e..ceba0549d 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,13 +15,13 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>5.0.0</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-commons</artifactId>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.12.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. -->
@@ -30,14 +30,12 @@
   <properties>
     <branding.version>2.0.2</branding.version>
     <build.suffix>1.0.0</build.suffix>
-    <config.version>0.11.0-SNAPSHOT</config.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <lispflowmapping.version>1.10.0-SNAPSHOT</lispflowmapping.version>
-    <mdsal.version>1.10.0-SNAPSHOT</mdsal.version>
-    <neutron.version>0.13.0-SNAPSHOT</neutron.version>
-    <nsf.version>0.13.0-SNAPSHOT</nsf.version>
-    <restconf.version>1.10.0-SNAPSHOT</restconf.version>
-    <sal.version>0.17.0-SNAPSHOT</sal.version>
+    <lispflowmapping.version>1.12.0-SNAPSHOT</lispflowmapping.version>
+    <neutron.version>0.15.0-SNAPSHOT</neutron.version>
+    <nsf.version>0.15.0-SNAPSHOT</nsf.version>
+    <restconf.version>1.12.0-SNAPSHOT</restconf.version>
+    <sal.version>0.19.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
     <yang.src.path>src/main/yang</yang.src.path>
@@ -50,7 +48,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.0</version>
+        <version>5.0.9</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
@@ -71,38 +69,17 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>netty-event-executor-config</artifactId>
-        <version>${config.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-api</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-broker-impl</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-broker-impl</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-common-util</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>threadpool-config-api</artifactId>
-        <version>${config.version}</version>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.12.0</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>threadpool-config-impl</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.11.0</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -236,31 +213,6 @@
             </filesets>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- Configures the java doc generation. Generally you should not have
-               to override this unless you need to exclude other packages etc. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <doclet>org.jboss.apiviz.APIviz</doclet>
-            <docletArtifact>
-              <groupId>org.jboss.apiviz</groupId>
-              <artifactId>apiviz</artifactId>
-              <version>1.3.2.GA</version>
-            </docletArtifact>
-            <finalName>${project.artifactId}-${project.version}</finalName>
-            <useStandardDocletOptions>true</useStandardDocletOptions>
-            <charset>UTF-8</charset>
-            <encoding>UTF-8</encoding>
-            <docencoding>UTF-8</docencoding>
-            <breakiterator>true</breakiterator>
-            <version>true</version>
-            <author>true</author>
-            <keywords>true</keywords>
-            <excludePackageNames>net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.*</excludePackageNames>
-            <failOnError>false</failOnError>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
@@ -353,66 +305,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <outputDirectory>${project.build.directory}/site</outputDirectory>
-    <excludeDefaults>true</excludeDefaults>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doclet>org.jboss.apiviz.APIviz</doclet>
-          <docletArtifact>
-            <groupId>org.jboss.apiviz</groupId>
-            <artifactId>apiviz</artifactId>
-            <version>1.3.2.GA</version>
-          </docletArtifact>
-          <finalName>${project.artifactId}-${build.suffix}</finalName>
-          <useStandardDocletOptions>true</useStandardDocletOptions>
-          <charset>UTF-8</charset>
-          <encoding>UTF-8</encoding>
-          <docencoding>UTF-8</docencoding>
-          <breakiterator>true</breakiterator>
-          <version>true</version>
-          <author>true</author>
-          <keywords>true</keywords>
-          <excludePackageNames>*.internal:edu.uci.*</excludePackageNames>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${projectinfo}</version>
-        <configuration>
-          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>project-team</report>
-              <report>license</report>
-              <report>mailing-list</report>
-              <report>plugin-management</report>
-              <report>cim</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>