Bump up jackson deps version to 2.10.0 with updated snakeyaml deps
Change-Id: I7c1b11abad0872d05321869a4221b3907b2aa155
diff --git a/deps/deps.json b/deps/deps.json
index 8d9efd0..d2bbb37 100644
--- a/deps/deps.json
+++ b/deps/deps.json
@@ -177,10 +177,10 @@
"moshi": "mvn:com.squareup.moshi:moshi:1.4.0",
"okio": "mvn:com.squareup.okio:okio:1.14.0",
"jacoco-agent-runtime": "mvn:org.jacoco:org.jacoco.agent:jar:runtime:0.8.2",
- "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-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml: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",
+ "jackson-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.0",
// Note: grpc imports "javax_annotation_api" has an http file, so we need to give a different name here
// See WORKSPACE
@@ -305,7 +305,7 @@
"jackson-coreutils": "mvn:com.github.fge:jackson-coreutils:1.6",
"btf": "mvn:com.github.fge:btf:1.2",
"msg-simple": "mvn:com.github.fge:msg-simple:1.1",
- "snakeyaml": "mvn:org.yaml:snakeyaml:1.18",
+ "snakeyaml": "mvn:org.yaml:snakeyaml:1.25",
// Kubernetes related jars
"k8s-client": "mvn:io.fabric8:kubernetes-client:4.6.4",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index a6d5cf7..748307d 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 13 Dec 2019 06:38:38 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 16 Dec 2019 13:20:34 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -451,27 +451,27 @@
if "jackson_annotations" not in native.existing_rules():
java_import_external(
name = "jackson_annotations",
- jar_sha256 = "38a0e450049f643570adac99888aa3480ec2de385790a7096908bf43bfc085d6",
+ jar_sha256 = "77a0846219774a8269bc1b38cc00294908d34e77f8a9da34d97673982f75853d",
licenses = ["notice"],
- jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.5/jackson-annotations-2.9.5.jar"], )
+ jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar"], )
if "jackson_core" not in native.existing_rules():
java_import_external(
name = "jackson_core",
- jar_sha256 = "a2bebaa325ad25455b02149c67e6052367a7d7fc1ce77de000eed284a5214eac",
+ jar_sha256 = "69e7695b1e40834fa1242fc328a4010607911ced3706ab79abc769d451197513",
licenses = ["notice"],
- jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.9.5/jackson-core-2.9.5.jar"], )
+ jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar"], )
if "jackson_databind" not in native.existing_rules():
java_import_external(
name = "jackson_databind",
- jar_sha256 = "0fb4e079c118e752cc94c15ad22e6782b0dfc5dc09145f4813fb39d82e686047",
+ jar_sha256 = "8e6c566c67fc61a96c5dfc4a71d430f2565765778ec9a6ef216c5460a9911b60",
licenses = ["notice"],
- jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.9.5/jackson-databind-2.9.5.jar"], )
+ jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar"], )
if "jackson_dataformat_yaml" not in native.existing_rules():
java_import_external(
name = "jackson_dataformat_yaml",
- jar_sha256 = "adc1c495e9c7286bfa1d861ca07e06c8d0980057ad981b48b04f68eb8dcade2c",
+ jar_sha256 = "235cb6f2816d55aa5e8a1c6e37b142cfc2bd5e459aa733820d68e736b6527f7c",
licenses = ["notice"],
- jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.9.5/jackson-dataformat-yaml-2.9.5.jar"], )
+ jar_urls = ["http://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.10.0/jackson-dataformat-yaml-2.10.0.jar"], )
if "javax_annotation_javax_annotation_api" not in native.existing_rules():
java_import_external(
name = "javax_annotation_javax_annotation_api",
@@ -1165,9 +1165,9 @@
if "snakeyaml" not in native.existing_rules():
java_import_external(
name = "snakeyaml",
- jar_sha256 = "81bf4c29d0275dace75fadb5febf5384553422816256023efa83b2b15a9ced60",
+ jar_sha256 = "b50ef33187e7dc922b26dbe4dd0fdb3a9cf349e75a08b95269901548eee546eb",
licenses = ["notice"],
- jar_urls = ["http://repo1.maven.org/maven2/org/yaml/snakeyaml/1.18/snakeyaml-1.18.jar"], )
+ jar_urls = ["http://repo1.maven.org/maven2/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar"], )
if "k8s_client" not in native.existing_rules():
java_import_external(
name = "k8s_client",
@@ -1379,10 +1379,10 @@
artifact_map["@moshi//:moshi"] = "mvn:com.squareup.moshi:moshi:jar:NON-OSGI:1.4.0"
artifact_map["@okio//:okio"] = "mvn:com.squareup.okio:okio:jar:NON-OSGI:1.14.0"
artifact_map["@jacoco_agent_runtime//:jacoco_agent_runtime"] = "mvn:org.jacoco:org.jacoco.agent:jar:runtime:NON-OSGI:0.8.2"
-artifact_map["@jackson_annotations//:jackson_annotations"] = "mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.9.5"
-artifact_map["@jackson_core//:jackson_core"] = "mvn:com.fasterxml.jackson.core:jackson-core:jar:2.9.5"
-artifact_map["@jackson_databind//:jackson_databind"] = "mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.9.5"
-artifact_map["@jackson_dataformat_yaml//:jackson_dataformat_yaml"] = "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.9.5"
+artifact_map["@jackson_annotations//:jackson_annotations"] = "mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.10.0"
+artifact_map["@jackson_core//:jackson_core"] = "mvn:com.fasterxml.jackson.core:jackson-core:jar:2.10.0"
+artifact_map["@jackson_databind//:jackson_databind"] = "mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.10.0"
+artifact_map["@jackson_dataformat_yaml//:jackson_dataformat_yaml"] = "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.10.0"
artifact_map["@javax_annotation_javax_annotation_api//:javax_annotation_javax_annotation_api"] = "mvn:javax.annotation:javax.annotation-api:jar:1.3"
artifact_map["@javax_inject//:javax_inject"] = "mvn:org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42"
artifact_map["@javax_ws_rs_api//:javax_ws_rs_api"] = "mvn:javax.ws.rs:javax.ws.rs-api:jar:2.1"
@@ -1498,7 +1498,7 @@
artifact_map["@jackson_coreutils//:jackson_coreutils"] = "mvn:com.github.fge:jackson-coreutils:jar:1.6"
artifact_map["@btf//:btf"] = "mvn:com.github.fge:btf:jar:1.2"
artifact_map["@msg_simple//:msg_simple"] = "mvn:com.github.fge:msg-simple:jar:1.1"
-artifact_map["@snakeyaml//:snakeyaml"] = "mvn:org.yaml:snakeyaml:jar:1.18"
+artifact_map["@snakeyaml//:snakeyaml"] = "mvn:org.yaml:snakeyaml:jar:1.25"
artifact_map["@k8s_client//:k8s_client"] = "mvn:io.fabric8:kubernetes-client:jar:NON-OSGI:4.6.4"
artifact_map["@k8s_model//:k8s_model"] = "mvn:io.fabric8:kubernetes-model:jar:4.6.4"
artifact_map["@zjsonpatch//:zjsonpatch"] = "mvn:io.fabric8:zjsonpatch:jar:0.3.0"
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..c81d5f5 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);
@@ -450,4 +453,4 @@
verify(mockDeviceKeyService);
verify(mockDeviceKeyAdminService);
}
-}
\ No newline at end of file
+}