Bump up jackson dependency to 2.10.0
Change-Id: I31de5e2b1d5738d9cf5eb84896642da7858204f9
diff --git a/lib/BUCK b/lib/BUCK
index ebd35a4..a095d1a 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 30 Jan 2020 12:43:04 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 5 Feb 2020 07:23:37 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -531,28 +531,28 @@
remote_jar (
name = 'jackson-annotations',
- out = 'jackson-annotations-2.9.5.jar',
- url = 'mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.9.5',
- sha1 = '9056ec9db21c57d43219a84bb18c129ae51c6a5d',
- maven_coords = 'com.fasterxml.jackson.core:jackson-annotations:2.9.5',
+ out = 'jackson-annotations-2.10.0.jar',
+ url = 'mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.10.0',
+ sha1 = 'e01cfd93b80d6773b3f757c78e756c9755b47b81',
+ maven_coords = 'com.fasterxml.jackson.core:jackson-annotations:2.10.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jackson-core',
- out = 'jackson-core-2.9.5.jar',
- url = 'mvn:com.fasterxml.jackson.core:jackson-core:jar:2.9.5',
- sha1 = 'a22ac51016944b06fd9ffbc9541c6e7ce5eea117',
- maven_coords = 'com.fasterxml.jackson.core:jackson-core:2.9.5',
+ out = 'jackson-core-2.10.0.jar',
+ url = 'mvn:com.fasterxml.jackson.core:jackson-core:jar:2.10.0',
+ sha1 = '4e2c5fa04648ec9772c63e2101c53af6504e624e',
+ maven_coords = 'com.fasterxml.jackson.core:jackson-core:2.10.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jackson-databind',
- out = 'jackson-databind-2.9.5.jar',
- url = 'mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.9.5',
- sha1 = '3490508379d065fe3fcb80042b62f630f7588606',
- maven_coords = 'com.fasterxml.jackson.core:jackson-databind:2.9.5',
+ out = 'jackson-databind-2.10.0.jar',
+ url = 'mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.10.0',
+ sha1 = '1127c9cf62f2bb3121a3a2a0a1351d251a602117',
+ maven_coords = 'com.fasterxml.jackson.core:jackson-databind:2.10.0',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 4da1548..e4d90b2 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -152,9 +152,9 @@
"logging-interceptor": "mvn:com.squareup.okhttp3:logging-interceptor:3.9.1",
"moshi": "mvn:com.squareup.moshi:moshi:1.4.0",
"okio": "mvn:com.squareup.okio:okio:1.11.0",
- "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.9.5",
- "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.9.5",
- "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.9.5",
+ "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.10.0",
+ "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.10.0",
+ "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.10.0",
"javax.annotation-api": "mvn:javax.annotation:javax.annotation-api:1.2",
"javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.5.0-b42",
"javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.1",
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
index 7ecaf38..f319b26 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
@@ -34,6 +34,7 @@
import org.onosproject.net.key.DeviceKeyService;
import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
@@ -393,6 +394,8 @@
fail("POST of null device key did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockDeviceKeyAdminService);
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
index 781cfae..b5e5829 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
@@ -34,6 +34,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetworkAdminService;
import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
@@ -276,6 +277,8 @@
fail("POST of null tenant id did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
index 2ab185c..808c3d1 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
@@ -60,6 +60,7 @@
import org.onosproject.net.PortNumber;
import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
@@ -490,6 +491,8 @@
fail("POST of null virtual network did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);
@@ -663,6 +666,8 @@
fail("POST of null virtual device did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);
@@ -827,6 +832,8 @@
fail("POST of null virtual port did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);
@@ -1034,6 +1041,8 @@
fail("POST of null virtual link did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);
@@ -1237,6 +1246,8 @@
fail("POST of null virtual host did not throw an exception");
} catch (BadRequestException ex) {
assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+ } catch (InternalServerErrorException ex) {
+ assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
}
verify(mockVnetAdminService);