Bump odlparent 2.0.2 to 2.0.4

[lispflowmapping.git] / commons / parent / pom.xml

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 8558726f9c3dfe9ef9f5820defb74572241a9292..e45421a002cf88368a53a666ad7dae6e78ac7103 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
@@ -34,7 +34,6 @@
     <dlux.loader.version>0.6.0-SNAPSHOT</dlux.loader.version>
     <dlux.core.version>0.6.0-SNAPSHOT</dlux.core.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <lispflowmapping.version>1.6.0-SNAPSHOT</lispflowmapping.version>
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
     <neutron.version>0.9.0-SNAPSHOT</neutron.version>
@@ -87,21 +86,6 @@
         <artifactId>jmock-legacy</artifactId>
         <version>2.6.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-api</artifactId>
-        <version>0.7.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.7.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>netty-event-executor-config</artifactId>
@@ -117,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>
@@ -271,12 +250,6 @@
           <artifactId>maven-clean-plugin</artifactId>
           <configuration>
             <filesets>
-              <fileset>
-                <directory>${jmxGeneratorPath}</directory>
-                <includes>
-                  <include>**</include>
-                </includes>
-              </fileset>
               <fileset>
                 <directory>${salGeneratorPath}</directory>
                 <includes>
@@ -335,7 +308,6 @@
               <configuration>
                 <sources>
                   <source>${yang.src.path}</source>
-                  <source>${jmxGeneratorPath}</source>
                   <source>${salGeneratorPath}</source>
                 </sources>
               </configuration>
@@ -466,34 +438,4 @@
       </plugin>
     </plugins>
   </reporting>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <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 -->
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
 </project>