Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #3705 from alexmay48/alexmay48/update-protobuf
Browse files Browse the repository at this point in the history 
Update google protobuf to pass security checks
  • Loading branch information
@v1r3n
v1r3n committed Jul 23, 2023
2 parents f013a53 + 625bbf3 commit fc8a206
Show file tree
Hide file tree
Showing 23 changed files with 283 additions and 155 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ lib/
build/
*/build/

# asdf version file
.tool-versions

4 changes: 2 additions & 2 deletions awss3-storage/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -273,7 +273,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down
4 changes: 2 additions & 2 deletions awssqs-event-queue/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -294,7 +294,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down
6 changes: 3 additions & 3 deletions cassandra-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -196,7 +196,7 @@
"locked": "3.10.2"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.netflix.conductor:conductor-common": {
"project": true
Expand Down Expand Up @@ -291,7 +291,7 @@
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-core"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.jayway.jsonpath:json-path": {
"firstLevelTransitive": [
Expand Down
122 changes: 104 additions & 18 deletions client-spring/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.conductor:conductor-java-sdk": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.10.10"
},
Expand All @@ -34,6 +37,12 @@
}
},
"runtimeClasspath": {
"cglib:cglib": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "3.3.0"
},
"com.amazonaws:aws-java-sdk-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand All @@ -48,7 +57,8 @@
},
"com.fasterxml.jackson.core:jackson-databind": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.13.3"
},
Expand All @@ -70,11 +80,17 @@
],
"locked": "2.13.3"
},
"com.google.guava:guava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "30.0-jre"
},
"com.google.protobuf:protobuf-java": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.netflix.conductor:conductor-annotations": {
"firstLevelTransitive": [
Expand All @@ -83,14 +99,21 @@
"project": true
},
"com.netflix.conductor:conductor-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"project": true
},
"com.netflix.conductor:conductor-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"project": true
},
"com.netflix.conductor:conductor-java-sdk": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand All @@ -105,7 +128,8 @@
},
"com.sun.jersey:jersey-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "1.19.4"
},
Expand All @@ -115,6 +139,13 @@
],
"locked": "2.7"
},
"javax.ws.rs:javax.ws.rs-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.1.1"
},
"org.apache.bval:bval-jsr": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
Expand All @@ -132,42 +163,54 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.glassfish.jersey.core:jersey-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.35"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand All @@ -185,6 +228,9 @@
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.conductor:conductor-java-sdk": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.10.10"
},
Expand Down Expand Up @@ -220,6 +266,12 @@
}
},
"testRuntimeClasspath": {
"cglib:cglib": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "3.3.0"
},
"com.amazonaws:aws-java-sdk-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand All @@ -234,7 +286,8 @@
},
"com.fasterxml.jackson.core:jackson-databind": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.13.3"
},
Expand All @@ -256,11 +309,17 @@
],
"locked": "2.13.3"
},
"com.google.guava:guava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "30.0-jre"
},
"com.google.protobuf:protobuf-java": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-common"
],
"locked": "3.13.0"
"locked": "3.21.7"
},
"com.netflix.conductor:conductor-annotations": {
"firstLevelTransitive": [
Expand All @@ -269,14 +328,21 @@
"project": true
},
"com.netflix.conductor:conductor-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"project": true
},
"com.netflix.conductor:conductor-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"project": true
},
"com.netflix.conductor:conductor-java-sdk": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand All @@ -291,7 +357,8 @@
},
"com.sun.jersey:jersey-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "1.19.4"
},
Expand All @@ -301,6 +368,13 @@
],
"locked": "2.7"
},
"javax.ws.rs:javax.ws.rs-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.1.1"
},
"junit:junit": {
"locked": "4.13.2"
},
Expand All @@ -321,42 +395,54 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-annotations",
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-common"
"com.netflix.conductor:conductor-common",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.17.2"
},
"org.glassfish.jersey.core:jersey-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client",
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "2.35"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
Expand Down
Loading

0 comments on commit fc8a206

Please sign in to comment.