Skip to content

Commit

Permalink
use BouncyCastle jdk18on (#1691)
Browse files Browse the repository at this point in the history
  • Loading branch information
sullis authored Oct 30, 2023
1 parent 8ad1b16 commit e46ab42
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 98 deletions.
4 changes: 2 additions & 2 deletions zuul-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies {
implementation libraries.guava
// TODO(carl-mastrangelo): this can be implementation; remove Logger from public api points.
api libraries.slf4j
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.76'
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2'
api 'com.fasterxml.jackson.core:jackson-databind:2.14.2'

Expand Down
48 changes: 24 additions & 24 deletions zuul-core/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.36"
Expand Down Expand Up @@ -178,11 +178,11 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.openjdk.jmh:jmh-core": {
"locked": "1.37"
Expand Down Expand Up @@ -306,11 +306,11 @@
"org.awaitility:awaitility": {
"locked": "4.2.0"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down Expand Up @@ -446,11 +446,11 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -547,11 +547,11 @@
"org.awaitility:awaitility": {
"locked": "4.2.0"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down Expand Up @@ -681,11 +681,11 @@
"org.awaitility:awaitility": {
"locked": "4.2.0"
},
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcpkix-jdk18on": {
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
"org.bouncycastle:bcprov-jdk18on": {
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down
24 changes: 12 additions & 12 deletions zuul-groovy/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -424,17 +424,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.codehaus.groovy:groovy-all": {
"locked": "3.0.19"
Expand Down Expand Up @@ -638,17 +638,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.codehaus.groovy:groovy-all": {
"locked": "3.0.19"
Expand Down Expand Up @@ -971,17 +971,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.codehaus.groovy:groovy-all": {
"locked": "3.0.19"
Expand Down
24 changes: 12 additions & 12 deletions zuul-guice/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down Expand Up @@ -647,17 +647,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -983,17 +983,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down
32 changes: 16 additions & 16 deletions zuul-integration-test/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -696,17 +696,17 @@
"org.apache.logging.log4j:log4j-slf4j2-impl": {
"locked": "2.21.1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down Expand Up @@ -928,17 +928,17 @@
],
"locked": "1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -1336,17 +1336,17 @@
"org.apache.logging.log4j:log4j-slf4j2-impl": {
"locked": "2.21.1"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcpkix-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcprov-jdk18on": {
"firstLevelTransitive": [
"com.netflix.zuul:zuul-core"
],
"locked": "1.70"
"locked": "1.76"
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.0"
Expand Down
Loading

0 comments on commit e46ab42

Please sign in to comment.