From 530adfb6ed323f54bd122e0d3da0d4d60ba66070 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Tue, 20 Apr 2021 14:03:40 -0700 Subject: [PATCH] zuul-guice: update to Guice 5 (#1050) This is needed to run on later JDKs than 11, as it uses a better maintained classfile generator. From my reading, it is API compatible with Guice 4.2. --- zuul-core/dependencies.lock | 6 +++--- zuul-discovery/dependencies.lock | 6 +++--- zuul-groovy/dependencies.lock | 6 +++--- zuul-guice/build.gradle | 2 +- zuul-guice/dependencies.lock | 24 ++++++++++++------------ zuul-sample/dependencies.lock | 18 +++++++++--------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/zuul-core/dependencies.lock b/zuul-core/dependencies.lock index 8d3afbfe9f..41e52f0a7b 100644 --- a/zuul-core/dependencies.lock +++ b/zuul-core/dependencies.lock @@ -271,7 +271,7 @@ "locked": "1.68" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.openjdk.jmh:jmh-core": { "locked": "1.29" @@ -473,7 +473,7 @@ "locked": "1.68" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "locked": "1.7.25" @@ -583,7 +583,7 @@ "locked": "1.68" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/zuul-discovery/dependencies.lock b/zuul-discovery/dependencies.lock index b30deaa1f2..2aaf0b05a4 100644 --- a/zuul-discovery/dependencies.lock +++ b/zuul-discovery/dependencies.lock @@ -85,7 +85,7 @@ "locked": "4.13" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.openjdk.jmh:jmh-core": { "locked": "1.21" @@ -146,7 +146,7 @@ "locked": "4.13" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "locked": "1.7.25" @@ -178,7 +178,7 @@ "locked": "4.13" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "locked": "1.7.25" diff --git a/zuul-groovy/dependencies.lock b/zuul-groovy/dependencies.lock index 92f977383d..530d8b5aac 100644 --- a/zuul-groovy/dependencies.lock +++ b/zuul-groovy/dependencies.lock @@ -401,7 +401,7 @@ "locked": "3.0.3" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.openjdk.jmh:jmh-core": { "locked": "1.21" @@ -699,7 +699,7 @@ "locked": "3.0.3" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -882,7 +882,7 @@ "locked": "3.0.3" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/zuul-guice/build.gradle b/zuul-guice/build.gradle index 4db10851a8..94a1a331af 100644 --- a/zuul-guice/build.gradle +++ b/zuul-guice/build.gradle @@ -2,7 +2,7 @@ apply plugin: "java-library" dependencies { implementation project(":zuul-core") - api(group: 'com.google.inject', name: 'guice', version: "4.2.3", classifier: "no_aop") + api(group: 'com.google.inject', name: 'guice', version: "5.0.1") implementation 'commons-configuration:commons-configuration:1.8' testImplementation libraries.junit, diff --git a/zuul-guice/dependencies.lock b/zuul-guice/dependencies.lock index 1dc66c11ca..ad4e6993bf 100644 --- a/zuul-guice/dependencies.lock +++ b/zuul-guice/dependencies.lock @@ -7,7 +7,7 @@ "locked": "2.12.1" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -122,7 +122,7 @@ "locked": "2.12.1" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -245,10 +245,10 @@ "com.netflix.zuul:zuul-core", "com.netflix.zuul:zuul-discovery" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.google.truth:truth": { "locked": "1.0.1" @@ -404,7 +404,7 @@ "locked": "1.68" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.openjdk.jmh:jmh-core": { "locked": "1.21" @@ -438,10 +438,10 @@ "com.netflix.zuul:zuul-core", "com.netflix.zuul:zuul-discovery" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -606,7 +606,7 @@ "locked": "2.12.1" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.google.truth:truth": { "locked": "1.0.1" @@ -705,7 +705,7 @@ "locked": "4.13.1" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -732,10 +732,10 @@ "com.netflix.zuul:zuul-core", "com.netflix.zuul:zuul-discovery" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { - "locked": "4.2.3" + "locked": "5.0.1" }, "com.google.truth:truth": { "locked": "1.0.1" @@ -891,7 +891,7 @@ "locked": "1.68" }, "org.mockito:mockito-core": { - "locked": "3.8.0" + "locked": "3.9.0" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/zuul-sample/dependencies.lock b/zuul-sample/dependencies.lock index 4656c85f9f..2f75673e83 100644 --- a/zuul-sample/dependencies.lock +++ b/zuul-sample/dependencies.lock @@ -189,7 +189,7 @@ "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -319,7 +319,7 @@ "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -455,13 +455,13 @@ "com.netflix.zuul:zuul-discovery", "com.netflix.zuul:zuul-groovy" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -668,13 +668,13 @@ "com.netflix.zuul:zuul-discovery", "com.netflix.zuul:zuul-groovy" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -867,7 +867,7 @@ "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [ @@ -997,13 +997,13 @@ "com.netflix.zuul:zuul-discovery", "com.netflix.zuul:zuul-groovy" ], - "locked": "29.0-jre" + "locked": "30.1-jre" }, "com.google.inject:guice": { "firstLevelTransitive": [ "com.netflix.zuul:zuul-guice" ], - "locked": "4.2.3" + "locked": "5.0.1" }, "com.netflix.archaius:archaius-core": { "firstLevelTransitive": [