Upgraded guava to 22.0 from 19.0
Change-Id: I304ad82ab59c12aba3055c6fa32e8e793a89f025
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index d59b859..7d1a9d1 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -249,7 +249,8 @@
.register(new ImmutableListSerializer(),
ImmutableList.class,
ImmutableList.of(1).getClass(),
- ImmutableList.of(1, 2).getClass())
+ ImmutableList.of(1, 2).getClass(),
+ ImmutableList.of(1, 2, 3).subList(1, 3).getClass())
.register(new ImmutableSetSerializer(),
ImmutableSet.class,
ImmutableSet.of().getClass(),
diff --git a/drivers/flowspec/pom.xml b/drivers/flowspec/pom.xml
index 96036d9..beedb58 100644
--- a/drivers/flowspec/pom.xml
+++ b/drivers/flowspec/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/features/features.xml b/features/features.xml
index 2dfb2f2..dce209f 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -23,7 +23,7 @@
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.5</bundle>
<bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
- <bundle>mvn:com.google.guava/guava/19.0</bundle>
+ <bundle>mvn:com.google.guava/guava/22.0</bundle>
<bundle>mvn:io.netty/netty/3.10.5.Final</bundle>
<bundle>mvn:io.netty/netty-common/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-buffer/4.1.5.Final</bundle>
diff --git a/lib/BUCK b/lib/BUCK
index 244292f..61b4348 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -311,19 +311,19 @@
remote_jar (
name = 'guava',
- out = 'guava-19.0.jar',
- url = 'mvn:com.google.guava:guava:jar:19.0',
- sha1 = '6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9',
- maven_coords = 'com.google.guava:guava:19.0',
+ out = 'guava-22.0.jar',
+ url = 'mvn:com.google.guava:guava:jar:22.0',
+ sha1 = '3564ef3803de51fb0530a8377ec6100b33b0d073',
+ maven_coords = 'com.google.guava:guava:22.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'guava-testlib',
- out = 'guava-testlib-19.0.jar',
- url = 'mvn:com.google.guava:guava-testlib:jar:19.0',
- sha1 = 'ce5b880b206de3f76d364988a6308c68c726f74a',
- maven_coords = 'com.google.guava:guava-testlib:jar:NON-OSGI:19.0',
+ out = 'guava-testlib-22.0.jar',
+ url = 'mvn:com.google.guava:guava-testlib:jar:22.0',
+ sha1 = '3be1b88f1cfc6592acbcbfe1f3a420f79eb2b146',
+ maven_coords = 'com.google.guava:guava-testlib:jar:NON-OSGI:22.0',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 6721924..4634c70 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -111,8 +111,8 @@
"ganymed-ssh2": "mvn:ch.ethz.ganymed:ganymed-ssh2:262",
"gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
"gson": "mvn:com.google.code.gson:gson:jar:2.6.2",
- "guava": "mvn:com.google.guava:guava:19.0",
- "guava-testlib": "mvn:com.google.guava:guava-testlib:19.0",
+ "guava": "mvn:com.google.guava:guava:22.0",
+ "guava-testlib": "mvn:com.google.guava:guava-testlib:22.0",
"hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3",
"hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.5.0-b32",
"hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b32",
diff --git a/lib/pom.xml b/lib/pom.xml
index 2b24941..4c1140a 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -46,7 +46,7 @@
<jetty.version>9.2.21.v20170120</jetty.version>
<jackson.version>2.8.6</jackson.version>
<slf4j.version>1.7.21</slf4j.version>
- <guava.version>19.0</guava.version>
+ <guava.version>22.0</guava.version>
<commons.io.version>2.4</commons.io.version>
<!-- TODO argLine was originally added maven-surfire-plugin configuration
to fix locale errors for non-US developers. However, it breaks
diff --git a/tools/package/maven-plugin/pom.xml b/tools/package/maven-plugin/pom.xml
index 2d36c86..ce2f317 100644
--- a/tools/package/maven-plugin/pom.xml
+++ b/tools/package/maven-plugin/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>22.0</version>
</dependency>
<dependency>