X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=commons%2Fparent%2Fpom.xml;h=208cf2c0464119587a8e6213799a42c663ac3b27;hb=refs%2Fchanges%2F90%2F62490%2F2;hp=735281cd93f6fc54800708225d8921cbd2723fd9;hpb=841c4bbd35a72062459d5124492bc9ba1021250b;p=lispflowmapping.git

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 735281cd9..208cf2c04 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,37 +15,35 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-commons</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>Parent POM</name>
+  <!-- <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 :: lispflowmapping :: ${project.artifactId}</name>
 
   <properties>
-    <branding.version>1.3.0-SNAPSHOT</branding.version>
+    <branding.version>2.0.2</branding.version>
     <build.suffix>1.0.0</build.suffix>
-    <config.version>0.5.0-SNAPSHOT</config.version>
-    <dlux.loader.version>0.4.0-SNAPSHOT</dlux.loader.version>
-    <dlux.core.version>0.4.0-SNAPSHOT</dlux.core.version>
+    <config.version>0.8.0-SNAPSHOT</config.version>
+    <dlux.loader.version>0.7.0-SNAPSHOT</dlux.loader.version>
+    <dlux.core.version>0.7.0-SNAPSHOT</dlux.core.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <karaf.empty.version>1.7.0-SNAPSHOT</karaf.empty.version>
-    <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
-    <lispflowmapping.version>1.4.0-SNAPSHOT</lispflowmapping.version>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
-    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <nsf.version>0.7.0-SNAPSHOT</nsf.version>
-    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
-    <sal.version>0.11.0-SNAPSHOT</sal.version>
+    <lispflowmapping.version>1.7.0-SNAPSHOT</lispflowmapping.version>
+    <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
+    <neutron.version>0.10.0-SNAPSHOT</neutron.version>
+    <nsf.version>0.10.0-SNAPSHOT</nsf.version>
+    <restconf.version>1.7.0-SNAPSHOT</restconf.version>
+    <sal.version>0.14.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>
-    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>2.0.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencyManagement>
@@ -55,21 +53,21 @@
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yangtools-artifacts</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>2.0.0-SNAPSHOT</version>
        <type>pom</type>
       <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -88,45 +86,11 @@
         <artifactId>jmock-legacy</artifactId>
         <version>2.6.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-api</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-manager</artifactId>
-        <version>${config.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-util</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>karaf.branding</artifactId>
-        <version>${branding.version}</version>
-        <scope>compile</scope>
-      </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>opendaylight-karaf-empty</artifactId>
-        <version>${karaf.empty.version}</version>
-        <type>zip</type>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>opendaylight-karaf-resources</artifactId>
-        <version>${karaf.resources.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-binding-api</artifactId>
@@ -137,11 +101,6 @@
         <artifactId>sal-binding-broker-impl</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-config</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-broker-impl</artifactId>
@@ -160,7 +119,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>threadpool-config-impl</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -192,11 +151,13 @@
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      <!--
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.neutron</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      -->
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.northbound</artifactId>
@@ -217,6 +178,11 @@
         <artifactId>mappingservice.lisp-proto</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.lispflowmapping</groupId>
+        <artifactId>mappingservice.config</artifactId>
+        <version>${lispflowmapping.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>common.unittest.tools</artifactId>
@@ -284,12 +250,6 @@
           <artifactId>maven-clean-plugin</artifactId>
           <configuration>
             <filesets>
-              <fileset>
-                <directory>${jmxGeneratorPath}</directory>
-                <includes>
-                  <include>**</include>
-                </includes>
-              </fileset>
               <fileset>
                 <directory>${salGeneratorPath}</directory>
                 <includes>
@@ -348,7 +308,6 @@
               <configuration>
                 <sources>
                   <source>${yang.src.path}</source>
-                  <source>${jmxGeneratorPath}</source>
                   <source>${salGeneratorPath}</source>
                 </sources>
               </configuration>
@@ -404,68 +363,10 @@
                     <ignore></ignore>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></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>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- here we are defining the default generators for yang You may need
-               to override this in child poms if you want to define additional generators,
-               such as the JMX generator etc. -->
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-maven-plugin</artifactId>
-          <version>${yangtools.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.mdsal</groupId>
-              <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-sources</goal>
-              </goals>
-              <configuration>
-                <yangFilesRootDir>${yang.src.path}</yangFilesRootDir>
-                <codeGenerators>
-                  <generator>
-                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                  </generator>
-                </codeGenerators>
-                <inspectDependencies>true</inspectDependencies>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -483,7 +384,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
         <configuration>
           <doclet>org.jboss.apiviz.APIviz</doclet>
           <docletArtifact>
@@ -538,21 +438,4 @@
       </plugin>
     </plugins>
   </reporting>
-
-  <distributionManagement>
-    <!-- Note: We want the nexus proxy property here because want to enable
-         devs to upload this artifact using mvn deploy to other maven repositories. -->
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-    <!-- Site deployment -->
-  </distributionManagement>
-
 </project>