You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2020/09/01 16:03:43 UTC
[beam] branch master updated: [BEAM-5002] Upgrade SLF4J version in
all non-vendored artifacts.
This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 6d3653e [BEAM-5002] Upgrade SLF4J version in all non-vendored artifacts.
new afa59c4 Merge pull request #12741 from lukecwik/beam5002
6d3653e is described below
commit 6d3653e4826e204b559d08d2d06dcb78c0026998
Author: Luke Cwik <lc...@google.com>
AuthorDate: Mon Aug 31 15:05:31 2020 -0700
[BEAM-5002] Upgrade SLF4J version in all non-vendored artifacts.
---
.../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 9 +++++----
.../groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy | 2 +-
learning/katas/kotlin/build.gradle | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 1213467..975ae9a 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -414,6 +414,7 @@ class BeamModulePlugin implements Plugin<Project> {
def proto_google_common_protos_version = "1.17.0"
def protobuf_version = "3.11.1"
def quickcheck_version = "0.8"
+ def slf4j_version = "1.7.30"
def spark_version = "2.4.6"
def spotbugs_version = "4.0.6"
def testcontainers_localstack_version = "1.14.3"
@@ -556,10 +557,10 @@ class BeamModulePlugin implements Plugin<Project> {
proto_google_cloud_pubsublite_v1 : "com.google.api.grpc:proto-google-cloud-pubsublite-v1:$google_cloud_pubsublite_version",
proto_google_cloud_spanner_admin_database_v1: "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$google_cloud_spanner_version",
proto_google_common_protos : "com.google.api.grpc:proto-google-common-protos:$proto_google_common_protos_version",
- slf4j_api : "org.slf4j:slf4j-api:1.7.25",
- slf4j_simple : "org.slf4j:slf4j-simple:1.7.25",
- slf4j_jdk14 : "org.slf4j:slf4j-jdk14:1.7.25",
- slf4j_log4j12 : "org.slf4j:slf4j-log4j12:1.7.25",
+ slf4j_api : "org.slf4j:slf4j-api:$slf4j_version",
+ slf4j_simple : "org.slf4j:slf4j-simple:$slf4j_version",
+ slf4j_jdk14 : "org.slf4j:slf4j-jdk14:$slf4j_version",
+ slf4j_log4j12 : "org.slf4j:slf4j-log4j12:$slf4j_version",
snappy_java : "org.xerial.snappy:snappy-java:1.1.4",
spark_core : "org.apache.spark:spark-core_2.11:$spark_version",
spark_network_common : "org.apache.spark:spark-network-common_2.11:$spark_version",
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
index 3939c9a..e0ce931 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
@@ -89,7 +89,7 @@ class GrpcVendoring_1_26_0 {
'com.google.errorprone:error_prone_annotations:2.3.3',
'commons-logging:commons-logging:1.2',
'org.apache.logging.log4j:log4j-api:2.6.2',
- 'org.slf4j:slf4j-api:1.7.21',
+ 'org.slf4j:slf4j-api:1.7.30',
// TODO(BEAM-9288): Enable relocation for conscrypt
"org.conscrypt:conscrypt-openjdk-uber:$conscrypt_version"
]
diff --git a/learning/katas/kotlin/build.gradle b/learning/katas/kotlin/build.gradle
index 1e47932..db4c71d 100644
--- a/learning/katas/kotlin/build.gradle
+++ b/learning/katas/kotlin/build.gradle
@@ -21,7 +21,7 @@ buildscript {
beamVersion = '2.19.0'
guavaVersion = '28.1-jre'
jodaTimeVersion = '2.10.4'
- slf4jVersion = '1.7.28'
+ slf4jVersion = '1.7.30'
log4jSlf4jImpl = '2.12.1'
kotlinVersion = '1.3.72'