Bug 1229: POM Restructuring for reliable weekly automated releases

Change-Id: I8561e847251a2ea99b2c7fac63591091de8a63cb
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>

diff --git a/distribution/base/pom.xml b/distribution/base/pom.xml
index 70432ddce299a97b4702771e214aa44827d5a554..b997e159777f5aab5e6c63096c00502853c96994 100644 (file)
--- a/distribution/base/pom.xml
+++ b/distribution/base/pom.xml
@@ -22,7 +22,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>distribution.opendaylight</artifactId>
-      <version>0.1.2-SNAPSHOT</version>
+      <version>${controller.distribution.version}</version>
       <type>zip</type>
       <classifier>osgipackage</classifier>
       <!-- Make sure this isn't included on any classpath-->

diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index 03daaf21ef2750ac615e2c57ce6772baaf7eb9eb..6fa6fb4bd3e6521bd5e9591c1b4e493a48d68027 100644 (file)
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -12,9 +12,6 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
     </scm>
-    <properties>
-        <bundle.plugin.version>2.4.0</bundle.plugin.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -60,7 +57,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
+                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 106eedf19883ca72c88ed8efc80ac4b4b8edd505..d6e6e3d56f28c989355b1fc822834e750a9e69c8 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -65,7 +65,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.5-SNAPSHOT</version>
+                        <version>${config.parent.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -127,7 +127,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
-            <version>0.2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -137,7 +136,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>equinoxSDK381</groupId>

diff --git a/pom.xml b/pom.xml
index d708998de2698da7bce6e5b4660d9e9c46538df2..ac73d932ca1b0ed584ec76704008c154fe215c97 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.4.2-SNAPSHOT</version>
+        <relativePath></relativePath>
+    </parent>
     <prerequisites>
         <maven>3.0</maven>
     </prerequisites>
@@ -20,12 +26,12 @@
       <!-- OpenDayLight Released artifact -->
       <repository>
         <id>opendaylight-release</id>
-        <url>${nexusproxy}/repositories/opendaylight.release</url>
+        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
       </repository>
       <!-- OpenDayLight Snapshot artifact -->
       <snapshotRepository>
         <id>opendaylight-snapshot</id>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
+        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
       </snapshotRepository>
       <!-- Site deployment -->
       <!-- site>
@@ -36,66 +42,24 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <slf4j.version>1.7.2</slf4j.version>
-      <logback.version>1.0.9</logback.version>
-      <karaf.version>3.0.1</karaf.version>
       <mdsal.version>1.1-SNAPSHOT</mdsal.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
       <controller.model.version>1.1-SNAPSHOT</controller.model.version>
-      <osgi.core.version>5.0.0</osgi.core.version>
       <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
       <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
       <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
       <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
-      <xtend.version>2.4.3</xtend.version>
       <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-      <maven.bundle.version>2.4.0</maven.bundle.version>
       <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
+        <controller.distribution.version>0.1.2-SNAPSHOT</controller.distribution.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
-        <dependency>
-          <groupId>org.javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>3.17.1-GA</version>
-        </dependency>
-
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <version>14.0.1</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.eclipse.osgi</artifactId>
-          <version>3.8.1.v20120830-144521</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.eclipse.equinox.console</artifactId>
-          <version>1.0.0.v20120522-1841</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.command</artifactId>
-          <version>0.8.0.v201108120515</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.runtime</artifactId>
-          <version>0.8.0.v201108120515</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.shell</artifactId>
-          <version>0.8.0.v201110170705</version>
-        </dependency>
-
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
           <artifactId>openflow-protocol-impl</artifactId>
@@ -183,6 +147,11 @@
             <artifactId>config-manager</artifactId>
             <version>${config.parent.version}</version>
         </dependency>
+          <dependency>
+              <groupId>org.opendaylight.controller</groupId>
+              <artifactId>config-api</artifactId>
+              <version>${config.parent.version}</version>
+          </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>antlr4-runtime-osgi-nohead</artifactId>
@@ -240,73 +209,17 @@
           <artifactId>ganymed</artifactId>
           <version>1.1-SNAPSHOT</version>
         </dependency>
-        
-        
-
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
             <version>1.4.01</version>
         </dependency>
-
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>log4j-over-slf4j</artifactId>
-          <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-          <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <version>${logback.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>xtend-lib-osgi</artifactId>
             <version>2.4.3</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <version>${osgi.core.version}</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.7</version>
-        </dependency>
-
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.11</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
       </dependencies>
     </dependencyManagement>
 
@@ -467,7 +380,7 @@
       <repository>
         <id>opendaylight-snapshot</id>
         <name>opendaylight-snapshot</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
+        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
         <releases>
           <enabled>false</enabled>
         </releases>
@@ -475,7 +388,7 @@
       <repository>
         <id>public</id>
         <name>public</name>
-        <url>${nexusproxy}/groups/public</url>
+        <url>http://nexus.opendaylight.org/content/groups/public</url>
         <snapshots>
           <enabled>false</enabled>
         </snapshots>
@@ -487,7 +400,7 @@
       <pluginRepository>
         <id>opendaylight-central</id>
         <name>opendaylight-central</name>
-        <url>${nexusproxy}/repositories/public</url>
+        <url>http://nexus.opendaylight.org/content/repositories/public</url>
         <snapshots>
           <enabled>false</enabled>
         </snapshots>
@@ -495,7 +408,7 @@
       <pluginRepository>
         <id>opendaylight-snapshot</id>
         <name>central2</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
+        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
         <releases>
           <enabled>false</enabled>
         </releases>

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index 7ace9785575f2ba09847bbc225e4598b8070e9a2..2df62717b5e616a45de103265830ec5347d67564 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -12,11 +12,6 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
     </scm>
-    <properties>
-        <xtend.version>2.4.3</xtend.version>
-        <bundle.plugin.version>2.4.0</bundle.plugin.version>
-        <maven.clean.plugin.version>2.5</maven.clean.plugin.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -66,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
+                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>