You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2022/03/24 05:33:38 UTC
[incubator-heron] branch master updated: Update to Guice 5.1.0 to support JDK17 (#3792)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 9cfc5c4 Update to Guice 5.1.0 to support JDK17 (#3792)
9cfc5c4 is described below
commit 9cfc5c4785ba0c14d26dfbbf0fe1d6b477dd38a5
Author: choi se <th...@gmail.com>
AuthorDate: Thu Mar 24 14:33:32 2022 +0900
Update to Guice 5.1.0 to support JDK17 (#3792)
---
WORKSPACE | 4 +-
heron/healthmgr/src/java/BUILD | 1 +
heron/healthmgr/tests/java/BUILD | 1 +
maven_install.json | 116 +++++++++++++++++++--------------------
4 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index 0f1a199..f41dfe8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -81,7 +81,7 @@ maven_install(
"org.apache.zookeeper:zookeeper:3.6.3",
"io.kubernetes:client-java:" + kubernetes_client_version,
"io.kubernetes:client-java-api-fluent:" + kubernetes_client_version,
- "com.esotericsoftware:kryo:5.2.0",
+ "com.esotericsoftware:kryo:5.2.1",
"org.apache.avro:avro:1.7.4",
"org.apache.mesos:mesos:0.22.0",
"com.hashicorp.nomad:nomad-sdk:0.7.0",
@@ -112,6 +112,8 @@ maven_install(
"io.netty:netty-all:4.1.72.Final",
"aopalliance:aopalliance:1.0",
"org.roaringbitmap:RoaringBitmap:0.6.51",
+ "com.google.inject:guice:5.1.0",
+ "com.google.inject.extensions:guice-assistedinject:5.1.0",
"com.google.guava:guava:23.6-jre",
"io.gsonfire:gson-fire:1.8.3",
"org.apache.curator:curator-framework:" + curator_version,
diff --git a/heron/healthmgr/src/java/BUILD b/heron/healthmgr/src/java/BUILD
index 4f1b9f1..d0ca1a0 100644
--- a/heron/healthmgr/src/java/BUILD
+++ b/heron/healthmgr/src/java/BUILD
@@ -30,6 +30,7 @@ healthmgr_deps_files = [
"@maven//:com_jayway_jsonpath_json_path",
"@maven//:net_minidev_json_smart",
"@maven//:javax_ws_rs_javax_ws_rs_api",
+ "@maven//:javax_activation_activation",
"@maven//:javax_annotation_javax_annotation_api",
"@maven//:org_glassfish_hk2_external_javax_inject",
"@maven//:org_glassfish_jersey_core_jersey_client",
diff --git a/heron/healthmgr/tests/java/BUILD b/heron/healthmgr/tests/java/BUILD
index aae5d7b..67549b2 100644
--- a/heron/healthmgr/tests/java/BUILD
+++ b/heron/healthmgr/tests/java/BUILD
@@ -34,6 +34,7 @@ test_deps_files = \
"@maven//:javax_annotation_javax_annotation_api",
"@maven//:org_glassfish_hk2_external_javax_inject",
"@maven//:javax_ws_rs_javax_ws_rs_api",
+ "@maven//:javax_activation_activation",
"@maven//:net_minidev_json_smart",
"@maven//:org_apache_commons_commons_math3",
"@maven//:org_glassfish_hk2_hk2_api",
diff --git a/maven_install.json b/maven_install.json
index 52c7f30..1454800 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": -1060669318,
- "__RESOLVED_ARTIFACTS_HASH": 900910157,
+ "__INPUT_ARTIFACTS_HASH": 34782025,
+ "__RESOLVED_ARTIFACTS_HASH": -450596822,
"conflict_resolution": {},
"dependencies": [
{
@@ -487,7 +487,7 @@
"url": "https://jcenter.bintray.com/com/beust/jcommander/1.78/jcommander-1.78.jar"
},
{
- "coord": "com.esotericsoftware:kryo:jar:sources:5.2.0",
+ "coord": "com.esotericsoftware:kryo:jar:sources:5.2.1",
"dependencies": [
"com.esotericsoftware:minlog:jar:sources:1.3.1",
"com.esotericsoftware:reflectasm:jar:sources:1.11.9",
@@ -504,17 +504,17 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0-sources.jar",
- "https://maven.google.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0-sources.jar",
- "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0-sources.jar"
+ "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1-sources.jar",
+ "https://maven.google.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1-sources.jar",
+ "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1-sources.jar"
],
- "sha256": "04af8473dc45c99929736ea5352e550e41ccfd6046dec874ae16a35ce18e9ce8",
- "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0-sources.jar"
+ "sha256": "e86b8e030d9c43e2e46a7914e7783debc759c02bf91740454e7589cdb53eb528",
+ "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1-sources.jar"
},
{
- "coord": "com.esotericsoftware:kryo:5.2.0",
+ "coord": "com.esotericsoftware:kryo:5.2.1",
"dependencies": [
"com.esotericsoftware:minlog:1.3.1",
"com.esotericsoftware:reflectasm:1.11.9",
@@ -531,14 +531,14 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0.jar",
+ "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0.jar",
- "https://maven.google.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0.jar",
- "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0.jar"
+ "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1.jar",
+ "https://maven.google.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1.jar",
+ "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1.jar"
],
- "sha256": "c1ac2d60b3f937987c1bd5fe5de98b59335373b3f718a1f4864539d0525cbf6b",
- "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.0/kryo-5.2.0.jar"
+ "sha256": "2e23e1437ed197dc0ed1ea9a5f246c65813e26ac2c8c16cdc8f99ccdb49f5d0c",
+ "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.2.1/kryo-5.2.1.jar"
},
{
"coord": "com.esotericsoftware:minlog:jar:sources:1.3.1",
@@ -1103,15 +1103,15 @@
"url": "https://jcenter.bintray.com/com/google/http-client/google-http-client/1.22.0/google-http-client-1.22.0.jar"
},
{
- "coord": "com.google.inject.extensions:guice-assistedinject:jar:sources:4.0",
+ "coord": "com.google.inject.extensions:guice-assistedinject:jar:sources:5.1.0",
"dependencies": [
"aopalliance:aopalliance:jar:sources:1.0",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.inject:guice:jar:sources:4.0",
+ "com.google.inject:guice:jar:sources:5.1.0",
"javax.inject:javax.inject:jar:sources:1"
],
"directDependencies": [
- "com.google.inject:guice:jar:sources:4.0"
+ "com.google.inject:guice:jar:sources:5.1.0"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -1119,25 +1119,25 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0-sources.jar",
- "https://maven.google.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0-sources.jar",
- "https://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0-sources.jar"
+ "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0-sources.jar",
+ "https://maven.google.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0-sources.jar",
+ "https://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0-sources.jar"
],
- "sha256": "689d2ee112437e3b03082876a902bd228f6067568d7d31c02b31a22babc889f3",
- "url": "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0-sources.jar"
+ "sha256": "18f3e02e95dab32b52059b733b02810d1f49108ec297580d62329c27796d094b",
+ "url": "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0-sources.jar"
},
{
- "coord": "com.google.inject.extensions:guice-assistedinject:4.0",
+ "coord": "com.google.inject.extensions:guice-assistedinject:5.1.0",
"dependencies": [
"aopalliance:aopalliance:1.0",
"com.google.guava:guava:23.6-jre",
- "com.google.inject:guice:4.0",
+ "com.google.inject:guice:5.1.0",
"javax.inject:javax.inject:1"
],
"directDependencies": [
- "com.google.inject:guice:4.0"
+ "com.google.inject:guice:5.1.0"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -1145,17 +1145,17 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar",
+ "file": "v1/https/jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar",
- "https://maven.google.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar",
- "https://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar"
+ "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0.jar",
+ "https://maven.google.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0.jar",
+ "https://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0.jar"
],
- "sha256": "ed44e4d809e6b3bc41ccd6e8b5acf43fb517234f4ac4c1125d7a82c44826f147",
- "url": "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar"
+ "sha256": "6f8753854d315da2eb3b92e124a82682d6292cd73adef1329dd8ec2125333ed3",
+ "url": "https://jcenter.bintray.com/com/google/inject/extensions/guice-assistedinject/5.1.0/guice-assistedinject-5.1.0.jar"
},
{
- "coord": "com.google.inject:guice:jar:sources:4.0",
+ "coord": "com.google.inject:guice:jar:sources:5.1.0",
"dependencies": [
"aopalliance:aopalliance:jar:sources:1.0",
"com.google.guava:guava:jar:sources:23.6-jre",
@@ -1172,17 +1172,17 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0-sources.jar",
- "https://maven.google.com/com/google/inject/guice/4.0/guice-4.0-sources.jar",
- "https://repo1.maven.org/maven2/com/google/inject/guice/4.0/guice-4.0-sources.jar"
+ "https://jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0-sources.jar",
+ "https://maven.google.com/com/google/inject/guice/5.1.0/guice-5.1.0-sources.jar",
+ "https://repo1.maven.org/maven2/com/google/inject/guice/5.1.0/guice-5.1.0-sources.jar"
],
- "sha256": "5ae16a56d478312ecee129b241a3df0fc9016b241bd4a0cbcd6b33f900a1eba6",
- "url": "https://jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0-sources.jar"
+ "sha256": "79484227656350f8ea315198ed2ebdc8583e7ba42ecd90d367d66a7e491de52e",
+ "url": "https://jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0-sources.jar"
},
{
- "coord": "com.google.inject:guice:4.0",
+ "coord": "com.google.inject:guice:5.1.0",
"dependencies": [
"aopalliance:aopalliance:1.0",
"com.google.guava:guava:23.6-jre",
@@ -1199,14 +1199,14 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0.jar",
+ "file": "v1/https/jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0.jar",
- "https://maven.google.com/com/google/inject/guice/4.0/guice-4.0.jar",
- "https://repo1.maven.org/maven2/com/google/inject/guice/4.0/guice-4.0.jar"
+ "https://jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0.jar",
+ "https://maven.google.com/com/google/inject/guice/5.1.0/guice-5.1.0.jar",
+ "https://repo1.maven.org/maven2/com/google/inject/guice/5.1.0/guice-5.1.0.jar"
],
- "sha256": "b378ffc35e7f7125b3c5f3a461d4591ae1685e3c781392f0c854ed7b7581d6d2",
- "url": "https://jcenter.bintray.com/com/google/inject/guice/4.0/guice-4.0.jar"
+ "sha256": "4130e50bfac48099c860f0d903b91860c81a249c90f38245f8fed58fc817bc26",
+ "url": "https://jcenter.bintray.com/com/google/inject/guice/5.1.0/guice-5.1.0.jar"
},
{
"coord": "com.google.oauth-client:google-oauth-client:jar:sources:1.22.0",
@@ -1417,17 +1417,15 @@
{
"coord": "com.microsoft.dhalion:dhalion:jar:sources:0.2.6",
"dependencies": [
- "aopalliance:aopalliance:jar:sources:1.0",
"com.google.code.gson:gson:jar:sources:2.8.9",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.inject.extensions:guice-assistedinject:jar:sources:4.0",
- "com.google.inject:guice:jar:sources:4.0",
+ "com.google.inject.extensions:guice-assistedinject:jar:sources:5.1.0",
+ "com.google.inject:guice:jar:sources:5.1.0",
"com.opencsv:opencsv:jar:sources:4.1",
"commons-beanutils:commons-beanutils:jar:sources:1.9.3",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-collections:commons-collections:jar:sources:3.2.1",
"it.unimi.dsi:fastutil:jar:sources:8.1.1",
- "javax.inject:javax.inject:jar:sources:1",
"org.apache.commons:commons-lang3:jar:sources:3.12.0",
"org.apache.commons:commons-math3:jar:sources:3.6.1",
"org.apache.commons:commons-text:jar:sources:1.1",
@@ -1438,8 +1436,8 @@
"tech.tablesaw:tablesaw-core:jar:sources:0.11.4"
],
"directDependencies": [
- "com.google.inject.extensions:guice-assistedinject:jar:sources:4.0",
- "com.google.inject:guice:jar:sources:4.0",
+ "com.google.inject.extensions:guice-assistedinject:jar:sources:5.1.0",
+ "com.google.inject:guice:jar:sources:5.1.0",
"commons-cli:commons-cli:jar:sources:1.3.1",
"org.yaml:snakeyaml:jar:sources:1.29",
"tech.tablesaw:tablesaw-core:jar:sources:0.11.4"
@@ -1462,17 +1460,15 @@
{
"coord": "com.microsoft.dhalion:dhalion:0.2.6",
"dependencies": [
- "aopalliance:aopalliance:1.0",
"com.google.code.gson:gson:2.8.9",
"com.google.guava:guava:23.6-jre",
- "com.google.inject.extensions:guice-assistedinject:4.0",
- "com.google.inject:guice:4.0",
+ "com.google.inject.extensions:guice-assistedinject:5.1.0",
+ "com.google.inject:guice:5.1.0",
"com.opencsv:opencsv:4.1",
"commons-beanutils:commons-beanutils:1.9.3",
"commons-cli:commons-cli:1.3.1",
"commons-collections:commons-collections:3.2.1",
"it.unimi.dsi:fastutil:8.1.1",
- "javax.inject:javax.inject:1",
"org.apache.commons:commons-lang3:3.12.0",
"org.apache.commons:commons-math3:3.6.1",
"org.apache.commons:commons-text:1.1",
@@ -1483,8 +1479,8 @@
"tech.tablesaw:tablesaw-core:0.11.4"
],
"directDependencies": [
- "com.google.inject.extensions:guice-assistedinject:4.0",
- "com.google.inject:guice:4.0",
+ "com.google.inject.extensions:guice-assistedinject:5.1.0",
+ "com.google.inject:guice:5.1.0",
"commons-cli:commons-cli:1.3.1",
"org.yaml:snakeyaml:1.29",
"tech.tablesaw:tablesaw-core:0.11.4"