This is an automated email from the ASF dual-hosted git repository.
tvalentyn pushed a commit to branch release-2.35.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.35.0 by this push:
new f77878e [BEAM-13434] Cherry-picks pubsublite, log4j and flogger
changes from master into 2.35.0. (#16224)
f77878e is described below
commit f77878e4463f072301003efa2fc830ef5af7a67a
Author: tvalentyn <[email protected]>
AuthorDate: Tue Dec 14 18:44:34 2021 -0800
[BEAM-13434] Cherry-picks pubsublite, log4j and flogger changes from master
into 2.35.0. (#16224)
---
.../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 4 ++--
sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle | 2 +-
sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle | 2 +-
sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle | 4 ++--
.../io/elasticsearch-tests/elasticsearch-tests-common/build.gradle | 2 +-
sdks/java/io/hcatalog/build.gradle | 2 +-
6 files changed, 8 insertions(+), 8 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 9176b43..3cc9496 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -452,7 +452,7 @@ class BeamModulePlugin implements Plugin<Project> {
def errorprone_version = "2.3.4"
def google_clients_version = "1.32.1"
def google_cloud_bigdataoss_version = "2.2.4"
- def google_cloud_pubsublite_version = "1.2.0"
+ def google_cloud_pubsublite_version = "1.4.0.1"
def google_code_gson_version = "2.8.9"
def google_oauth_clients_version = "1.32.1"
// Try to keep grpc_version consistent with gRPC version in
google_cloud_platform_libraries_bom
@@ -535,7 +535,7 @@ class BeamModulePlugin implements Plugin<Project> {
commons_lang3 :
"org.apache.commons:commons-lang3:3.9",
commons_math3 :
"org.apache.commons:commons-math3:3.6.1",
error_prone_annotations :
"com.google.errorprone:error_prone_annotations:$errorprone_version",
- flogger_system_backend :
"com.google.flogger:flogger-system-backend:0.7.1",
+ flogger_system_backend :
"com.google.flogger:flogger-system-backend:0.7.2",
gax : "com.google.api:gax", //
google_cloud_platform_libraries_bom sets version
gax_grpc :
"com.google.api:gax-grpc", // google_cloud_platform_libraries_bom sets version
gax_httpjson :
"com.google.api:gax-httpjson", // google_cloud_platform_libraries_bom sets
version
diff --git
a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
index 1b8afc2..ba4086a 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 5.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 5.x"
-def log4j_version = "2.15.0"
+def log4j_version = "2.16.0"
def elastic_search_version = "5.6.3"
configurations.all {
diff --git
a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
index af8aa85..fe0b6fe 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 6.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 6.x"
-def log4j_version = "2.15.0"
+def log4j_version = "2.16.0"
def elastic_search_version = "6.4.0"
configurations.all {
diff --git
a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
index f4dabba..2ff6882 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 7.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 7.x"
-def log4j_version = "2.15.0"
+def log4j_version = "2.16.0"
def elastic_search_version = "7.13.4"
configurations.all {
@@ -66,4 +66,4 @@ dependencies {
//test {
// systemProperty 'elasticsearchVersion', elasticsearchVersion
-//}
\ No newline at end of file
+//}
diff --git
a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
index e843511..3ba1963 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
@@ -25,7 +25,7 @@ applyJavaNature(
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests ::
Common"
ext.summary = "Common test classes for ElasticsearchIO"
-def log4j_version = "2.15.0"
+def log4j_version = "2.16.0"
def elastic_search_version = "7.9.2"
configurations.all {
diff --git a/sdks/java/io/hcatalog/build.gradle
b/sdks/java/io/hcatalog/build.gradle
index 037efac..8d0e61b 100644
--- a/sdks/java/io/hcatalog/build.gradle
+++ b/sdks/java/io/hcatalog/build.gradle
@@ -43,7 +43,7 @@ test {
configurations.testRuntimeClasspath {
resolutionStrategy {
- def log4j_version = "2.15.0"
+ def log4j_version = "2.16.0"
// Beam's build system forces a uniform log4j version resolution for all
modules, however for
// the HCatalog case the current version of log4j produces
NoClassDefFoundError so we need to
// force an old version on the tests runtime classpath
