BUG-4219: eliminate odlparent-version

Since karaf4-parent is derived from odlparent,
we can just add branding and conf to our artifacts
and not specify the version. Hence we can eliminate
odlparent.version.

Change-Id: Ic62f80cca737cfc386a428d33ccac2b4ab43c395
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index aa436e0804d4f8eb65ce8431fcb592865d96b705..851272f75076932c1bd75007366cc0254256f03a 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -23,10 +23,6 @@
     <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <properties>
-        <odlparent.version>1.8.0-SNAPSHOT</odlparent.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -86,21 +82,16 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
-        <!-- Don't use ${project.version} here, properties are evaluated in the context
-             of child projects -->
+
         <!-- ODL Branding -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>karaf.branding</artifactId>
-            <version>${odlparent.version}</version>
-            <scope>compile</scope>
         </dependency>
         <!-- ODL configuration -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>opendaylight-karaf4-resources</artifactId>
-            <version>${odlparent.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -140,9 +131,9 @@
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
                                     <artifactId>karaf.branding</artifactId>
-                                    <version>${odlparent.version}</version>
+                                    <version>1.8.0-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-${odlparent.version}.jar</destFileName>
+                                    <destFileName>karaf.branding-1.8.0-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -291,4 +282,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 0070248bf33e6671864fa3c123052ef7875a7baf..167deb8dcc25296adbb2b0c2a80be63d792eaf3a 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -17,6 +17,20 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- ODL Branding -->
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>karaf.branding</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+            <!-- ODL configuration -->
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>opendaylight-karaf4-resources</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <scope>provided</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>features-odlparent</artifactId>