Clean up more properties

Now that centinel is updated, and since persistence won't release with
Boron (and is still on odlparent 1.6.0-SNAPSHOT), remove the remaining
obsolete dependency properties:
* guava.version
* org.json.version
* jettison.version
* jsr305.api.version
* junit.version
* slf4j.version

To handle the removal of ${guava.version}, hard-code the provided
feature version; this allows us to cleanly provide both versions 18
and 19, in preparation for migration to the latter. Add both versions
to the linked Javadocs.

Change-Id: I767f35ece600b005677299b7bf07af12b4351a4f
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features-odlparent/pom.xml b/features-odlparent/pom.xml
index f27a8cbfe96ac070ffae81e2a153d2b81f4965ac..1240762bbc2c54cdc4921b21b8542c7f76b52205 100644 (file)
--- a/features-odlparent/pom.xml
+++ b/features-odlparent/pom.xml
@@ -48,12 +48,6 @@
             <classifier>linux-x86_64</classifier>
         </dependency>
 
-        <!-- odl-guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <!-- odl-lmax -->
         <dependency>
             <groupId>com.lmax</groupId>

diff --git a/features-odlparent/src/main/features/features.xml b/features-odlparent/src/main/features/features.xml
index 605ce2faa20c14ed074f91cebc7a7323bf22b1a8..39c276766cf3bee2940b59d7011bdd33899257a5 100644 (file)
--- a/features-odlparent/src/main/features/features.xml
+++ b/features-odlparent/src/main/features/features.xml
@@ -2,6 +2,7 @@
 <features name="odlparent-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <!-- See also the links defined for our Maven site in the root POM (maven-javadoc-plugin) -->
     <feature name="odl-netty" description="OpenDaylight :: Netty" version="4.0.36.Final">
         <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
         <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
@@ -13,8 +14,11 @@
         platform and we can't require the build platform to have an implementation (e.g. OS X) -->
         <bundle>wrap:mvn:io.netty/netty-transport-native-epoll/{{VERSION}}/jar/linux-x86_64</bundle>
     </feature>
-    <feature name="odl-guava" description="OpenDaylight :: Guava" version="${guava.version}">
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
+    <feature name="odl-guava" description="OpenDaylight :: Guava" version="18.0">
+        <bundle>mvn:com.google.guava/guava/18.0</bundle>
+    </feature>
+    <feature name="odl-guava" description="OpenDaylight :: Guava" version="19.0">
+        <bundle>mvn:com.google.guava/guava/19.0</bundle>
     </feature>
     <feature name="odl-lmax" description="OpenDaylight :: LMAX Disruptor" version="3.3.4">
         <bundle>mvn:com.lmax/disruptor/{{VERSION}}</bundle>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ce8039f2f99298508b1695d74c87287135755121..cdc5a0b7b90b647172b3ae6f3b444f05b1b03d35 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -87,31 +87,9 @@
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
     <bouncycastle.version>1.54</bouncycastle.version>
-    <!-- Used by persistence -->
-    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
-    <guava.version>18.0</guava.version>
 
-    <!-- Used by centinel -->
-    <!-- Removed in centinel: https://git.opendaylight.org/gerrit/38139 -->
-    <org.json.version>20131018</org.json.version>
-
-    <!-- Used by centinel -->
-    <!-- Removed in centinel: https://git.opendaylight.org/gerrit/38139 -->
-    <jettison.version>1.3.7</jettison.version>
-    <!-- Used by persistence -->
-    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
-    <jsr305.api.version>3.0.0</jsr305.api.version>
-    <!-- Need to stick to JUnit 4.11 until
-         https://github.com/jayway/powermock/issues/560 is fixed (either in
-         PowerMock or with a new JUnit release) -->
-    <!-- Used by persistence; see also nemo -->
-    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
-    <junit.version>4.11</junit.version>
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
-    <!-- Used by persistence; see also affinity, toolkit -->
-    <!-- Removed in persistence: https://git.opendaylight.org/gerrit/31285 -->
-    <slf4j.version>1.7.12</slf4j.version>
 
     <akka.version>2.4.4</akka.version>
     <scala.version>2.11</scala.version>
@@ -140,16 +118,19 @@
 
       <!-- Testing Dependencies -->
       <!-- JUnit, Hamcrest, Mockito and PowerMock need to be kept in sync -->
+      <!-- Need to stick to JUnit 4.11 until
+           https://github.com/jayway/powermock/issues/560 is fixed (either in
+           PowerMock or with a new JUnit release) -->
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
+        <version>4.11</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit-dep</artifactId>
-        <version>${junit.version}</version>
+        <version>4.11</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -179,7 +160,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>${slf4j.version}</version>
+        <version>1.7.12</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -216,22 +197,22 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4j.version}</version>
+        <version>1.7.12</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
+        <version>1.7.12</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
+        <version>1.7.12</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>log4j-over-slf4j</artifactId>
-        <version>${slf4j.version}</version>
+        <version>1.7.12</version>
       </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
@@ -251,7 +232,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
+        <version>18.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -426,7 +407,7 @@
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>${jsr305.api.version}</version>
+        <version>3.0.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
@@ -773,7 +754,7 @@
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
-        <version>${jettison.version}</version>
+        <version>1.3.7</version>
       </dependency>
       <!-- equinox http service bridge -->
       <dependency>
@@ -822,7 +803,7 @@
       <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
-        <version>${org.json.version}</version>
+        <version>20131018</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -1525,7 +1506,8 @@
         <configuration>
           <links>
             <link>http://doc.akka.io/japi/akka/${akka.version}/</link>
-            <link>https://google.github.io/guava/releases/${guava.version}/api/docs/</link>
+            <link>https://google.github.io/guava/releases/18.0/api/docs/</link>
+            <link>https://google.github.io/guava/releases/19.0/api/docs/</link>
             <link>http://netty.io/4.0/api/</link>
           </links>
         </configuration>