Skip to content

Commit 530adfb

Browse files
carl-mastrangelocarl-mastrangelo
authored
zuul-guice: update to Guice 5 (Netflix#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.
1 parent f7e1e88 commit 530adfb

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎zuul-core/dependencies.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
"locked": "1.68"
272272
},
273273
"org.mockito:mockito-core": {
274-
"locked": "3.8.0"
274+
"locked": "3.9.0"
275275
},
276276
"org.openjdk.jmh:jmh-core": {
277277
"locked": "1.29"
@@ -473,7 +473,7 @@
473473
"locked": "1.68"
474474
},
475475
"org.mockito:mockito-core": {
476-
"locked": "3.8.0"
476+
"locked": "3.9.0"
477477
},
478478
"org.slf4j:slf4j-api": {
479479
"locked": "1.7.25"
@@ -583,7 +583,7 @@
583583
"locked": "1.68"
584584
},
585585
"org.mockito:mockito-core": {
586-
"locked": "3.8.0"
586+
"locked": "3.9.0"
587587
},
588588
"org.slf4j:slf4j-api": {
589589
"firstLevelTransitive": [

‎zuul-discovery/dependencies.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"locked": "4.13"
8686
},
8787
"org.mockito:mockito-core": {
88-
"locked": "3.8.0"
88+
"locked": "3.9.0"
8989
},
9090
"org.openjdk.jmh:jmh-core": {
9191
"locked": "1.21"
@@ -146,7 +146,7 @@
146146
"locked": "4.13"
147147
},
148148
"org.mockito:mockito-core": {
149-
"locked": "3.8.0"
149+
"locked": "3.9.0"
150150
},
151151
"org.slf4j:slf4j-api": {
152152
"locked": "1.7.25"
@@ -178,7 +178,7 @@
178178
"locked": "4.13"
179179
},
180180
"org.mockito:mockito-core": {
181-
"locked": "3.8.0"
181+
"locked": "3.9.0"
182182
},
183183
"org.slf4j:slf4j-api": {
184184
"locked": "1.7.25"

‎zuul-groovy/dependencies.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@
401401
"locked": "3.0.3"
402402
},
403403
"org.mockito:mockito-core": {
404-
"locked": "3.8.0"
404+
"locked": "3.9.0"
405405
},
406406
"org.openjdk.jmh:jmh-core": {
407407
"locked": "1.21"
@@ -699,7 +699,7 @@
699699
"locked": "3.0.3"
700700
},
701701
"org.mockito:mockito-core": {
702-
"locked": "3.8.0"
702+
"locked": "3.9.0"
703703
},
704704
"org.slf4j:slf4j-api": {
705705
"firstLevelTransitive": [
@@ -882,7 +882,7 @@
882882
"locked": "3.0.3"
883883
},
884884
"org.mockito:mockito-core": {
885-
"locked": "3.8.0"
885+
"locked": "3.9.0"
886886
},
887887
"org.slf4j:slf4j-api": {
888888
"firstLevelTransitive": [

‎zuul-guice/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: "java-library"
22

33
dependencies {
44
implementation project(":zuul-core")
5-
api(group: 'com.google.inject', name: 'guice', version: "4.2.3", classifier: "no_aop")
5+
api(group: 'com.google.inject', name: 'guice', version: "5.0.1")
66
implementation 'commons-configuration:commons-configuration:1.8'
77

88
testImplementation libraries.junit,

‎zuul-guice/dependencies.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"locked": "2.12.1"
88
},
99
"com.google.inject:guice": {
10-
"locked": "4.2.3"
10+
"locked": "5.0.1"
1111
},
1212
"com.netflix.archaius:archaius-core": {
1313
"firstLevelTransitive": [
@@ -122,7 +122,7 @@
122122
"locked": "2.12.1"
123123
},
124124
"com.google.inject:guice": {
125-
"locked": "4.2.3"
125+
"locked": "5.0.1"
126126
},
127127
"com.netflix.archaius:archaius-core": {
128128
"firstLevelTransitive": [
@@ -245,10 +245,10 @@
245245
"com.netflix.zuul:zuul-core",
246246
"com.netflix.zuul:zuul-discovery"
247247
],
248-
"locked": "29.0-jre"
248+
"locked": "30.1-jre"
249249
},
250250
"com.google.inject:guice": {
251-
"locked": "4.2.3"
251+
"locked": "5.0.1"
252252
},
253253
"com.google.truth:truth": {
254254
"locked": "1.0.1"
@@ -404,7 +404,7 @@
404404
"locked": "1.68"
405405
},
406406
"org.mockito:mockito-core": {
407-
"locked": "3.8.0"
407+
"locked": "3.9.0"
408408
},
409409
"org.openjdk.jmh:jmh-core": {
410410
"locked": "1.21"
@@ -438,10 +438,10 @@
438438
"com.netflix.zuul:zuul-core",
439439
"com.netflix.zuul:zuul-discovery"
440440
],
441-
"locked": "29.0-jre"
441+
"locked": "30.1-jre"
442442
},
443443
"com.google.inject:guice": {
444-
"locked": "4.2.3"
444+
"locked": "5.0.1"
445445
},
446446
"com.netflix.archaius:archaius-core": {
447447
"firstLevelTransitive": [
@@ -606,7 +606,7 @@
606606
"locked": "2.12.1"
607607
},
608608
"com.google.inject:guice": {
609-
"locked": "4.2.3"
609+
"locked": "5.0.1"
610610
},
611611
"com.google.truth:truth": {
612612
"locked": "1.0.1"
@@ -705,7 +705,7 @@
705705
"locked": "4.13.1"
706706
},
707707
"org.mockito:mockito-core": {
708-
"locked": "3.8.0"
708+
"locked": "3.9.0"
709709
},
710710
"org.slf4j:slf4j-api": {
711711
"firstLevelTransitive": [
@@ -732,10 +732,10 @@
732732
"com.netflix.zuul:zuul-core",
733733
"com.netflix.zuul:zuul-discovery"
734734
],
735-
"locked": "29.0-jre"
735+
"locked": "30.1-jre"
736736
},
737737
"com.google.inject:guice": {
738-
"locked": "4.2.3"
738+
"locked": "5.0.1"
739739
},
740740
"com.google.truth:truth": {
741741
"locked": "1.0.1"
@@ -891,7 +891,7 @@
891891
"locked": "1.68"
892892
},
893893
"org.mockito:mockito-core": {
894-
"locked": "3.8.0"
894+
"locked": "3.9.0"
895895
},
896896
"org.slf4j:slf4j-api": {
897897
"firstLevelTransitive": [

‎zuul-sample/dependencies.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"firstLevelTransitive": [
190190
"com.netflix.zuul:zuul-guice"
191191
],
192-
"locked": "4.2.3"
192+
"locked": "5.0.1"
193193
},
194194
"com.netflix.archaius:archaius-core": {
195195
"firstLevelTransitive": [
@@ -319,7 +319,7 @@
319319
"firstLevelTransitive": [
320320
"com.netflix.zuul:zuul-guice"
321321
],
322-
"locked": "4.2.3"
322+
"locked": "5.0.1"
323323
},
324324
"com.netflix.archaius:archaius-core": {
325325
"firstLevelTransitive": [
@@ -455,13 +455,13 @@
455455
"com.netflix.zuul:zuul-discovery",
456456
"com.netflix.zuul:zuul-groovy"
457457
],
458-
"locked": "29.0-jre"
458+
"locked": "30.1-jre"
459459
},
460460
"com.google.inject:guice": {
461461
"firstLevelTransitive": [
462462
"com.netflix.zuul:zuul-guice"
463463
],
464-
"locked": "4.2.3"
464+
"locked": "5.0.1"
465465
},
466466
"com.netflix.archaius:archaius-core": {
467467
"firstLevelTransitive": [
@@ -668,13 +668,13 @@
668668
"com.netflix.zuul:zuul-discovery",
669669
"com.netflix.zuul:zuul-groovy"
670670
],
671-
"locked": "29.0-jre"
671+
"locked": "30.1-jre"
672672
},
673673
"com.google.inject:guice": {
674674
"firstLevelTransitive": [
675675
"com.netflix.zuul:zuul-guice"
676676
],
677-
"locked": "4.2.3"
677+
"locked": "5.0.1"
678678
},
679679
"com.netflix.archaius:archaius-core": {
680680
"firstLevelTransitive": [
@@ -867,7 +867,7 @@
867867
"firstLevelTransitive": [
868868
"com.netflix.zuul:zuul-guice"
869869
],
870-
"locked": "4.2.3"
870+
"locked": "5.0.1"
871871
},
872872
"com.netflix.archaius:archaius-core": {
873873
"firstLevelTransitive": [
@@ -997,13 +997,13 @@
997997
"com.netflix.zuul:zuul-discovery",
998998
"com.netflix.zuul:zuul-groovy"
999999
],
1000-
"locked": "29.0-jre"
1000+
"locked": "30.1-jre"
10011001
},
10021002
"com.google.inject:guice": {
10031003
"firstLevelTransitive": [
10041004
"com.netflix.zuul:zuul-guice"
10051005
],
1006-
"locked": "4.2.3"
1006+
"locked": "5.0.1"
10071007
},
10081008
"com.netflix.archaius:archaius-core": {
10091009
"firstLevelTransitive": [

0 commit comments

Comments
 (0)