Bump guava to 23.0

https://github.com/google/guava/wiki/Release23

Change-Id: I1efaea3a901f93e4a95aabf13b7dacd4f544aad9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index bb710678480198250027d84846f25f66f35d3f1d..c30f586a853c1cca5eb1466ff0a30a85fa125b91 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-guava-22</artifactId>
+            <artifactId>odl-guava-23</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 f77c87b33add558e166d0f9a2ff53e57715a319d..85573ae11feda50d25c02fe8c6f3f56bf5d43f91 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-22</artifactId>
+            <artifactId>odl-guava-23</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
@@ -55,7 +55,7 @@
                 <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
                     <dependencyFeatures>
-                        <dependencyFeature>odl-guava-22</dependencyFeature>
+                        <dependencyFeature>odl-guava-23</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 b6c6bb9ece8f1c0f20227c19136a6343d4e127b3..4313e45286a85934406141ef212452cde28a3dae 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.4.0" name="odl-akka-leveldb-0.7">
     <feature version="0.0.0">
-        <feature prerequisite="false" dependency="false">odl-guava-22</feature>
+        <feature prerequisite="false" dependency="false">odl-guava-23</feature>
         <feature prerequisite="false" dependency="false">wrap</feature>
         <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
         <bundle>wrap:mvn:org.iq80.leveldb/leveldb-api/0.7</bundle>

diff --git a/features/odl-guava-22/pom.xml b/features/odl-guava-23/pom.xml
similarity index 93%
rename from features/odl-guava-22/pom.xml
rename to features/odl-guava-23/pom.xml
index a2bd5245b39d857a3e392e8346899586e8373463..e205db5f0ef30bd8e189d2036b26ab8f09a449cb 100644 (file)
--- a/features/odl-guava-22/pom.xml
+++ b/features/odl-guava-23/pom.xml
@@ -19,11 +19,11 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-guava-22</artifactId>
+    <artifactId>odl-guava-23</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Guava 22 (for Karaf 4)</name>
+    <name>OpenDaylight :: Guava 23</name>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>22.0</version>
+            <version>23.0</version>
         </dependency>
     </dependencies>
 

diff --git a/features/odl-guava-22/src/main/history/dependencies.xml b/features/odl-guava-23/src/main/history/dependencies.xml
similarity index 86%
rename from features/odl-guava-22/src/main/history/dependencies.xml
rename to features/odl-guava-23/src/main/history/dependencies.xml
index 1545b9e86b0dcd37f941e432d0be43b468708267..6a88dc4386c01359617e1ed266d47f63d98677ef 100644 (file)
--- a/features/odl-guava-22/src/main/history/dependencies.xml
+++ b/features/odl-guava-23/src/main/history/dependencies.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl4-guava-22">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-guava-23">
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">wrap</feature>
-        <bundle>mvn:com.google.guava/guava/22.0</bundle>
+        <bundle>mvn:com.google.guava/guava/23.0</bundle>
         <bundle>wrap:mvn:com.google.errorprone/error_prone_annotations/2.0.18</bundle>
         <bundle>wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
         <bundle>wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14</bundle>

diff --git a/features/pom.xml b/features/pom.xml
index 7194cb4cfd1276c944981356043b3bae6594a844..270bd947c17c85749d578ecf05ae6bfd56978bd0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -40,7 +40,7 @@
 
         <!-- General features -->
         <module>features-odlparent</module>
-        <module>odl-guava-22</module>
+        <module>odl-guava-23</module>
         <module>odl-javassist-3</module>
         <module>odl-lmax-3</module>
         <module>odl-netty-4</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 29bfeddd2acb50b439addd4e3cac67ac6dee3e59..24330206f7a81c9f33087c48dd48eb1c2ecf7cf3 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -95,7 +95,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-guava-22</artifactId>
+                <artifactId>odl-guava-23</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 52009bbc2183635b6728832bbbc90018a1b9d9d9..ab1e15643598dca0775e2bd8b07a9957f6c73e16 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -144,7 +144,7 @@
               <link>http://google.github.io/truth/api/0.28/</link>
               <link>https://www.slf4j.org/apidocs/</link>
               <link>https://xerces.apache.org/xerces2-j/javadocs/api/</link>
-              <link>https://google.github.io/guava/releases/22.0/api/docs/</link>
+              <link>https://google.github.io/guava/releases/23.0/api/docs/</link>
               <link>http://doc.akka.io/japi/akka/2.5.3/</link>
               <link>http://netty.io/4.1/api/</link>
               <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 328ad1aa075991de2a980827e6a580a86f273ea1..de160ed0b3068cf76c3cac1aefc1b07bb1b48bd7 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -309,12 +309,12 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>22.0</version>
+        <version>23.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>22.0</version>
+        <version>23.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -2117,7 +2117,7 @@
         <configuration>
           <links>
             <link>http://doc.akka.io/japi/akka/${akka.version}/</link>
-            <link>https://google.github.io/guava/releases/22.0/api/docs/</link>
+            <link>https://google.github.io/guava/releases/23.0/api/docs/</link>
             <link>http://netty.io/4.1/api/</link>
           </links>
         </configuration>