Skip to content

Commit

Permalink
[BEAM-11055] Update log4j to version 2.14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@iemejia
iemejia committed Apr 27, 2021
1 parent 9505f4e commit 1958090
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 23 deletions.
3 changes: 3 additions & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ class BeamModulePlugin implements Plugin<Project> {
def jaxb_api_version = "2.3.3"
def jsr305_version = "3.0.2"
def kafka_version = "2.4.1"
def log4j_version = "2.14.1"
def nemo_version = "0.1"
def netty_version = "4.1.52.Final"
def postgres_version = "42.2.16"
Expand Down Expand Up @@ -595,6 +596,8 @@ class BeamModulePlugin implements Plugin<Project> {
junit : "junit:junit:4.13.1",
kafka : "org.apache.kafka:kafka_2.11:$kafka_version",
kafka_clients : "org.apache.kafka:kafka-clients:$kafka_version",
log4j_api : "org.apache.logging.log4j:log4j-api:$log4j_version",
log4j_core : "org.apache.logging.log4j:log4j-core:$log4j_version",
mockito_core : "org.mockito:mockito-core:3.7.7",
mongo_java_driver : "org.mongodb:mongo-java-driver:3.12.7",
nemo_compiler_frontend_beam : "org.apache.nemo:nemo-compiler-frontend-beam:$nemo_version",
Expand Down
5 changes: 2 additions & 3 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 2.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 2.x"

def log4j_version = "2.6.2"
def elastic_search_version = "2.4.1"

dependencies {
Expand All @@ -36,13 +35,13 @@ dependencies {
testCompile project(":sdks:java:io:elasticsearch")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
testCompile library.java.slf4j_api
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.hamcrest_core
testCompile library.java.hamcrest_library
testCompile library.java.junit
testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2"
testCompile "org.elasticsearch:elasticsearch:$elastic_search_version"
testRuntimeOnly library.java.log4j_api
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
}
9 changes: 4 additions & 5 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@ test {
systemProperty "tests.security.manager", "false"
}

def log4j_version = "2.6.2"
def elastic_search_version = "5.6.3"

configurations.all {
resolutionStrategy {
// Make sure the log4j versions for api and core match instead of taking the default
// Gradle rule of using the latest.
force "org.apache.logging.log4j:log4j-api:$log4j_version"
force "org.apache.logging.log4j:log4j-core:$log4j_version"
force library.java.log4j_api
force library.java.log4j_core
}
}

Expand All @@ -54,13 +53,13 @@ dependencies {
testCompile project(path: ":sdks:java:core", configuration: "shadow")
testCompile project(":sdks:java:io:elasticsearch")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile library.java.slf4j_api
testCompile library.java.hamcrest_core
testCompile library.java.hamcrest_library
testCompile library.java.junit
testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
testRuntimeOnly library.java.log4j_api
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
}
9 changes: 4 additions & 5 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@ test {
systemProperty "tests.security.manager", "false"
}

def log4j_version = "2.6.2"
def elastic_search_version = "6.4.0"

configurations.all {
resolutionStrategy {
// Make sure the log4j versions for api and core match instead of taking the default
// Gradle rule of using the latest.
force "org.apache.logging.log4j:log4j-api:$log4j_version"
force "org.apache.logging.log4j:log4j-core:$log4j_version"
force library.java.log4j_api
force library.java.log4j_core
}
}

Expand All @@ -54,13 +53,13 @@ dependencies {
testCompile project(path: ":sdks:java:core", configuration: "shadow")
testCompile project(":sdks:java:io:elasticsearch")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile library.java.slf4j_api
testCompile library.java.hamcrest_core
testCompile library.java.hamcrest_library
testCompile library.java.junit
testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
testRuntimeOnly library.java.log4j_api
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
}
9 changes: 4 additions & 5 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@ test {
systemProperty "tests.security.manager", "false"
}

def log4j_version = "2.11.1"
def elastic_search_version = "7.9.2"

configurations.all {
resolutionStrategy {
// Make sure the log4j versions for api and core match instead of taking the default
// Gradle rule of using the latest.
force "org.apache.logging.log4j:log4j-api:$log4j_version"
force "org.apache.logging.log4j:log4j-core:$log4j_version"
force library.java.log4j_api
force library.java.log4j_core
}
}

Expand All @@ -54,13 +53,13 @@ dependencies {
testCompile project(path: ":sdks:java:core", configuration: "shadow")
testCompile project(":sdks:java:io:elasticsearch")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile library.java.slf4j_api
testCompile library.java.hamcrest_core
testCompile library.java.hamcrest_library
testCompile library.java.junit
testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
testRuntimeOnly library.java.log4j_api
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
}
9 changes: 4 additions & 5 deletions sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ applyJavaNature(
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: Common"
ext.summary = "Common test classes for ElasticsearchIO"

def log4j_version = "2.11.1"
def elastic_search_version = "7.9.2"

configurations.all {
resolutionStrategy {
// Make sure the log4j versions for api and core match instead of taking the default
// Gradle rule of using the latest.
force "org.apache.logging.log4j:log4j-api:$log4j_version"
force "org.apache.logging.log4j:log4j-core:$log4j_version"
force library.java.log4j_api
force library.java.log4j_core
}
}

Expand All @@ -43,12 +42,12 @@ dependencies {
testCompile project(":sdks:java:io:elasticsearch")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
testCompile library.java.slf4j_api
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.hamcrest_core
testCompile library.java.hamcrest_library
testCompile library.java.junit
testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
testRuntimeOnly library.java.log4j_api
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
}
1 change: 1 addition & 0 deletions sdks/java/io/hadoop-format/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ dependencies {
testCompile library.java.hamcrest_library
testCompile library.java.testcontainers_postgresql
testCompile library.java.netty_all
testRuntimeOnly library.java.log4j_core
testRuntimeOnly library.java.slf4j_jdk14
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")

Expand Down

0 comments on commit 1958090

Please sign in to comment.