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 #2674 from flavioschuindt/fix-log4shell
Browse files Browse the repository at this point in the history 
Bump log4j to 2.17.0 to fix log4shell vulnerability
  • Loading branch information
@apanicker-nflx
apanicker-nflx authored Dec 22, 2021
2 parents 70ed447 + b9a8b78 commit 0f45ac9
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 56 deletions.
8 changes: 4 additions & 4 deletions contribs/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -184,7 +184,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -348,7 +348,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -527,7 +527,7 @@
"locked": "1.11.86"
},
"com.amazonaws:aws-java-sdk-sqs": {
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.fasterxml.jackson.core:jackson-core": {
"firstLevelTransitive": [
Expand Down
16 changes: 8 additions & 8 deletions es5-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "5.6.8"
Expand Down Expand Up @@ -294,10 +294,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "5.6.8"
Expand Down Expand Up @@ -455,10 +455,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down Expand Up @@ -625,10 +625,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down
16 changes: 8 additions & 8 deletions es6-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
Expand Down Expand Up @@ -294,10 +294,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.glassfish:javax.el": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -457,10 +457,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down Expand Up @@ -627,10 +627,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down
16 changes: 8 additions & 8 deletions es7-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "7.10.1"
Expand Down Expand Up @@ -294,10 +294,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.glassfish:javax.el": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -457,10 +457,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down Expand Up @@ -627,10 +627,10 @@
"locked": "3.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.awaitility:awaitility": {
"locked": "3.1.2"
Expand Down
36 changes: 18 additions & 18 deletions server/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -355,14 +355,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.eclipse.jetty:jetty-jmx": {
"locked": "9.4.22.v20191022"
Expand Down Expand Up @@ -453,7 +453,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -798,14 +798,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.eclipse.jetty:jetty-jmx": {
"locked": "9.4.22.v20191022"
Expand Down Expand Up @@ -956,7 +956,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -1301,14 +1301,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.eclipse.jetty:jetty-jmx": {
"locked": "9.4.22.v20191022"
Expand Down Expand Up @@ -1399,7 +1399,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -1744,14 +1744,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -1833,7 +1833,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -2181,14 +2181,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.eclipse.jetty:jetty-jmx": {
"locked": "9.4.22.v20191022"
Expand Down Expand Up @@ -2282,7 +2282,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-contribs"
],
"locked": "1.12.129"
"locked": "1.12.130"
},
"com.datastax.cassandra:cassandra-driver-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -2630,14 +2630,14 @@
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es5-persistence",
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "2.11.1"
"locked": "2.17.0"
},
"org.eclipse.jetty:jetty-jmx": {
"locked": "9.4.22.v20191022"
Expand Down
Loading

0 comments on commit 0f45ac9

Please sign in to comment.