diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.1.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.1.0.jar deleted file mode 100644 index c03203fabb..0000000000 Binary files a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.2.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.2.0.jar new file mode 100644 index 0000000000..894ac88a8b Binary files /dev/null and b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-core-3.2.0.jar differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar deleted file mode 100644 index cbe84761a1..0000000000 Binary files a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar new file mode 100644 index 0000000000..43102c2633 Binary files /dev/null and b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar deleted file mode 100644 index 964b15a6e5..0000000000 Binary files a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar new file mode 100644 index 0000000000..cd81984a69 Binary files /dev/null and b/apps/openstacknetworking/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.15.jar b/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.15.jar deleted file mode 100644 index 34084e3325..0000000000 Binary files a/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.15.jar and /dev/null differ diff --git a/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.18.jar b/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.18.jar new file mode 100644 index 0000000000..e3fac8e789 Binary files /dev/null and b/apps/openstacknetworking/app/src/main/resources/deps/snakeyaml-1.18.jar differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.1.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.1.0.jar deleted file mode 100644 index c03203fabb..0000000000 Binary files a/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.2.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.2.0.jar new file mode 100644 index 0000000000..894ac88a8b Binary files /dev/null and b/apps/openstacknode/app/src/main/resources/deps/openstack4j-core-3.2.0.jar differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar deleted file mode 100644 index cbe84761a1..0000000000 Binary files a/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar new file mode 100644 index 0000000000..43102c2633 Binary files /dev/null and b/apps/openstacknode/app/src/main/resources/deps/openstack4j-http-connector-3.2.0.jar differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar deleted file mode 100644 index 964b15a6e5..0000000000 Binary files a/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.1.0.jar and /dev/null differ diff --git a/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar b/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar new file mode 100644 index 0000000000..cd81984a69 Binary files /dev/null and b/apps/openstacknode/app/src/main/resources/deps/openstack4j-httpclient-3.2.0.jar differ diff --git a/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.15.jar b/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.15.jar deleted file mode 100644 index 34084e3325..0000000000 Binary files a/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.15.jar and /dev/null differ diff --git a/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.18.jar b/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.18.jar new file mode 100644 index 0000000000..e3fac8e789 Binary files /dev/null and b/apps/openstacknode/app/src/main/resources/deps/snakeyaml-1.18.jar differ diff --git a/apps/openstacknode/openstack4j.bzl b/apps/openstacknode/openstack4j.bzl index 096b700174..b9598fa8cc 100644 --- a/apps/openstacknode/openstack4j.bzl +++ b/apps/openstacknode/openstack4j.bzl @@ -9,7 +9,7 @@ def get_openstack4j_deps_path(): "openstack4j-http-connector", "openstack4j-httpclient", ] - OPENSTACK4J_VER = "3.1.0" + OPENSTACK4J_VER = "3.2.0" openstack_deps_path = "" @@ -27,7 +27,7 @@ def get_jackson_deps_path(): "jackson-coreutils-1.6.jar", "msg-simple-1.1.jar", "btf-1.2.jar", - "snakeyaml-1.15.jar", + "snakeyaml-1.18.jar", ] jackson_deps_path = "" diff --git a/lib/deps.json b/lib/deps.json index c51141c02d..b7e7eaaa5e 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -296,9 +296,9 @@ "io_opencensus_opencensus_contrib_grpc_metrics": "mvn:io.opencensus:opencensus-contrib-grpc-metrics:0.18.0", // Openstack4j related jars - "openstack4j-core": "mvn:org.pacesys:openstack4j-core:3.1.0", - "openstack4j-http-connector": "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:3.1.0", - "openstack4j-httpclient": "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:3.1.0", + "openstack4j-core": "mvn:org.pacesys:openstack4j-core:3.2.0", + "openstack4j-http-connector": "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:3.2.0", + "openstack4j-httpclient": "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:3.2.0", "json-patch": "mvn:com.github.fge:json-patch:1.9", "jackson-coreutils": "mvn:com.github.fge:jackson-coreutils:1.6", "btf": "mvn:com.github.fge:btf:1.2", diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl index 0909948b42..ab171afddb 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 Sat, 23 Feb 2019 01:30:12 GMT. Do not edit this file manually. ***** +# ***** This file was auto-generated at Mon, 18 Mar 2019 09:41:29 GMT. Do not edit this file manually. ***** # ***** Use onos-lib-gen ***** load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION") @@ -1117,21 +1117,21 @@ def generated_maven_jars(): if "openstack4j_core" not in native.existing_rules(): java_import_external( name = "openstack4j_core", - jar_sha256 = "4f01b34bb74beaed691c97e69b62fa3cbbb99d85b3b1d2a56e4e143c58de9b5c", + jar_sha256 = "f818e00d9c1ae979b107ee6166455ae0c5c023d7aff08dce4089deddd41837c1", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j-core/3.1.0/openstack4j-core-3.1.0.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j-core/3.2.0/openstack4j-core-3.2.0.jar"], ) if "openstack4j_http_connector" not in native.existing_rules(): java_import_external( name = "openstack4j_http_connector", - jar_sha256 = "52b4bc0de07038e62335a2b9f44f6cf5b289c064a944946fb7a309c38a991045", + jar_sha256 = "7677a217126817d74ce42becb397bf5627a8d5c37b5a7cd318aa3099b1680d08", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j/connectors/openstack4j-http-connector/3.1.0/openstack4j-http-connector-3.1.0.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j/connectors/openstack4j-http-connector/3.2.0/openstack4j-http-connector-3.2.0.jar"], ) if "openstack4j_httpclient" not in native.existing_rules(): java_import_external( name = "openstack4j_httpclient", - jar_sha256 = "4ca3887f7281c9cda53f47e1a1accb34cdc5cd3a682a441c7d18e9a08b5e9870", + jar_sha256 = "3cb4f8cab734ca5727bfb89ee2a733b921b76c5a58eceb9a05281d4c040b802f", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j/connectors/openstack4j-httpclient/3.1.0/openstack4j-httpclient-3.1.0.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/org/pacesys/openstack4j/connectors/openstack4j-httpclient/3.2.0/openstack4j-httpclient-3.2.0.jar"], ) if "json_patch" not in native.existing_rules(): java_import_external( name = "json_patch", @@ -1376,8 +1376,8 @@ artifact_map["@jacoco_agent_runtime//:jacoco_agent_runtime"] = "mvn:org.jacoco:o 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["@javax_annotation_api_mvn//:javax_annotation_api_mvn"] = "mvn:javax.annotation:javax.annotation-api:jar:1.3" artifact_map["@jackson_dataformat_yaml//:jackson_dataformat_yaml"] = "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.9.5" +artifact_map["@javax_annotation_api_mvn//:javax_annotation_api_mvn"] = "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" artifact_map["@javax_activation//:javax_activation"] = "mvn:javax.activation:activation:jar:NON-OSGI:1.1.1" @@ -1484,9 +1484,9 @@ artifact_map["@com_google_auth_google_auth_library_oauth2_http//:com_google_auth artifact_map["@com_google_j2objc_j2objc_annotations//:com_google_j2objc_j2objc_annotations"] = "mvn:com.google.j2objc:j2objc-annotations:jar:NON-OSGI:1.1" artifact_map["@io_opencensus_opencensus_api//:io_opencensus_opencensus_api"] = "mvn:io.opencensus:opencensus-api:jar:NON-OSGI:0.18.0" artifact_map["@io_opencensus_opencensus_contrib_grpc_metrics//:io_opencensus_opencensus_contrib_grpc_metrics"] = "mvn:io.opencensus:opencensus-contrib-grpc-metrics:jar:NON-OSGI:0.18.0" -artifact_map["@openstack4j_core//:openstack4j_core"] = "mvn:org.pacesys:openstack4j-core:jar:3.1.0" -artifact_map["@openstack4j_http_connector//:openstack4j_http_connector"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:jar:3.1.0" -artifact_map["@openstack4j_httpclient//:openstack4j_httpclient"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:jar:3.1.0" +artifact_map["@openstack4j_core//:openstack4j_core"] = "mvn:org.pacesys:openstack4j-core:jar:3.2.0" +artifact_map["@openstack4j_http_connector//:openstack4j_http_connector"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:jar:3.2.0" +artifact_map["@openstack4j_httpclient//:openstack4j_httpclient"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:jar:3.2.0" artifact_map["@json_patch//:json_patch"] = "mvn:com.github.fge:json-patch:jar:1.9" 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"