Bump Guava 23.6 → 25.1 and add default feature

This replaces the odl-guava-23 feature with odl-guava-25 and adds a
default odl-guava feature which downstreams should depend on.

Release notes:
* https://github.com/google/guava/releases/tag/v24.0
* https://github.com/google/guava/releases/tag/v24.1
* https://github.com/google/guava/releases/tag/v25.0
* https://github.com/google/guava/releases/tag/v25.1

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 54ada116979e80c9d0549d0b195d0f2ffac55b66..e7907a7ddfd183bb8e5cf728b7c1bcc6b4168f9b 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -33,7 +33,14 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-guava-23</artifactId>
+            <artifactId>odl-guava</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-guava-25</artifactId>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>

diff --git a/features/odl-akka-leveldb-0.7/pom.xml b/features/odl-akka-leveldb-0.7/pom.xml
index 79c200f7a5bed62fa8792e0cfc45b2a0244052a4..d4876fc916d02cfaeb72a13c98624c77f91d9b29 100644 (file)
--- a/features/odl-akka-leveldb-0.7/pom.xml
+++ b/features/odl-akka-leveldb-0.7/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava-23</artifactId>
+            <artifactId>odl-guava-25</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
@@ -62,7 +62,7 @@
                 <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
                     <dependencyFeatures>
-                        <dependencyFeature>odl-guava-23</dependencyFeature>
+                        <dependencyFeature>odl-guava-25</dependencyFeature>
                     </dependencyFeatures>
                 </configuration>
             </plugin>

diff --git a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
index 405cc78cf2b55c1fd37d0d4443ae8a5449695596..b5f3df7b1dc4374c955ce6a4c912032ca0516225 100644 (file)
--- a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
+++ b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-leveldb-0.7">
     <feature version="0.0.0">
-        <feature>odl-guava-23</feature>
+        <feature>odl-guava-25</feature>
         <feature>wrap</feature>
         <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
         <bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.7</bundle>

diff --git a/features/odl-guava-23/pom.xml b/features/odl-guava-25/pom.xml
similarity index 89%
rename from features/odl-guava-23/pom.xml
rename to features/odl-guava-25/pom.xml
index 907a501a975f5d6e358750a0bede21b4d36ed447..dcf36a217010a4f1a7da03b4962ab988553ed25f 100644 (file)
--- a/features/odl-guava-23/pom.xml
+++ b/features/odl-guava-25/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright © 2016 Red Hat, Inc. and others.  All rights reserved.
+ Copyright © 2018 Red Hat, Inc. and others.  All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -19,11 +19,11 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-guava-23</artifactId>
+    <artifactId>odl-guava-25</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Guava 23</name>
+    <name>OpenDaylight :: Guava 25</name>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>

diff --git a/features/odl-guava-23/src/main/history/dependencies.xml b/features/odl-guava-25/src/main/history/dependencies.xml
similarity index 73%
rename from features/odl-guava-23/src/main/history/dependencies.xml
rename to features/odl-guava-25/src/main/history/dependencies.xml
index 0d94e4ff656bbb5633a6f15358a2cab628239357..4ddc208ac1f9804ba73d42174987f2da3a60621e 100644 (file)
--- a/features/odl-guava-23/src/main/history/dependencies.xml
+++ b/features/odl-guava-25/src/main/history/dependencies.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-guava-23">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-guava-25">
     <feature version="0.0.0">
         <feature>wrap</feature>
-        <bundle>mvn:com.google.guava/guava/23.6.1-jre</bundle>
+        <bundle>mvn:com.google.guava/guava/25.1-jre</bundle>
         <bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.3</bundle>
         <bundle>wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
-        <bundle>wrap:mvn:org.checkerframework/checker-compat-qual/2.0.0</bundle>
+        <bundle>wrap:mvn:org.checkerframework/checker-qual/2.0.0</bundle>
         <bundle>wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14</bundle>
     </feature>
 </features>

diff --git a/features/odl-guava/pom.xml b/features/odl-guava/pom.xml
new file mode 100644 (file)
index 0000000..f580767
--- /dev/null
+++ b/features/odl-guava/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 Red Hat, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<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>single-feature-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odl-guava</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: default Guava feature</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-guava-25</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+    <!--
+        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>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+
+</project>

diff --git a/features/odl-guava/src/main/history/dependencies.xml b/features/odl-guava/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..923c9c1
--- /dev/null
+++ b/features/odl-guava/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-guava">
+    <feature version="0.0.0">
+        <feature>odl-guava-25</feature>
+    </feature>
+</features>

diff --git a/features/odl-jung-2.1/pom.xml b/features/odl-jung-2.1/pom.xml
index 805c322f672bef9c48a839920bd63378739a48ca..c4c9d46e476459a60fbd491d05766b2c1c0ab643 100644 (file)
--- a/features/odl-jung-2.1/pom.xml
+++ b/features/odl-jung-2.1/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava-23</artifactId>
+            <artifactId>odl-guava-25</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-jung-2.1/src/main/history/dependencies.xml b/features/odl-jung-2.1/src/main/history/dependencies.xml
index f9f1c3a8bc357f7eac4880879997466f8389d092..ac731e00b74642961ac8944f3a3c3abfac4d393c 100644 (file)
--- a/features/odl-jung-2.1/src/main/history/dependencies.xml
+++ b/features/odl-jung-2.1/src/main/history/dependencies.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jung-2.1">
     <feature version="0.0.0">
-        <feature>odl-guava-23</feature>
+        <feature>odl-guava-25</feature>
         <feature>wrap</feature>
         <bundle>wrap:mvn:net.sf.jung/jung-algorithms/2.1.1</bundle>
         <bundle>wrap:mvn:net.sf.jung/jung-api/2.1.1</bundle>

diff --git a/features/pom.xml b/features/pom.xml
index 90b3ad11de7100165c81a26855f663e6eb7979a5..e0cd1199cedbed34f4d8cff45804bc95153ad664 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -49,7 +49,8 @@
         <module>odl-apache-commons-lang3</module>
         <module>odl-apache-commons-net</module>
         <module>odl-apache-commons-text</module>
-        <module>odl-guava-23</module>
+        <module>odl-guava</module>
+        <module>odl-guava-25</module>
         <module>odl-jackson-2.9</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-1</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 4b100a6abb955195b6a475a990a754937386ce0b..372b04d97618d905e3c97aba97cb2eb4bff64307 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -123,7 +123,14 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-guava-23</artifactId>
+                <artifactId>odl-guava</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-guava-25</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 2e108faeefc1c184db59091bffb4f3692524e1aa..8d9319e6f7231017eb063b06d71563415c5fdb45 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -274,7 +274,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>23.6.1-jre</version>
+        <version>25.1-jre</version>
         <exclusions>
           <exclusion>
             <groupId>com.google.code.findbugs</groupId>