You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ib...@apache.org on 2021/10/11 20:39:36 UTC
[beam] branch release-2.34.0 updated: [BEAM-10114] Bump Pub/Sub
Lite version (#15640)
This is an automated email from the ASF dual-hosted git repository.
ibzib pushed a commit to branch release-2.34.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.34.0 by this push:
new f9c1007 [BEAM-10114] Bump Pub/Sub Lite version (#15640)
new 119f5b0 Merge pull request #15696 from ibzib/pslite-version
f9c1007 is described below
commit f9c1007cef0a44191f5ce67fcf61414e6847c475
Author: dpcollins-google <40...@users.noreply.github.com>
AuthorDate: Fri Oct 8 18:03:20 2021 -0400
[BEAM-10114] Bump Pub/Sub Lite version (#15640)
* Bump Pub/Sub Lite version
* [BEAM-10114] force old checker-qual version
Co-authored-by: Kyle Weaver <kc...@google.com>
---
.../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 3 ++-
sdks/java/io/google-cloud-platform/build.gradle | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
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 7ef3a40..7a679df 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.2"
- def google_cloud_pubsublite_version = "1.0.4"
+ def google_cloud_pubsublite_version = "1.2.0"
def google_code_gson_version = "2.8.6"
def google_oauth_clients_version = "1.31.0"
// Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom
@@ -526,6 +526,7 @@ class BeamModulePlugin implements Plugin<Project> {
bigdataoss_util : "com.google.cloud.bigdataoss:util:$google_cloud_bigdataoss_version",
cassandra_driver_core : "com.datastax.cassandra:cassandra-driver-core:$cassandra_driver_version",
cassandra_driver_mapping : "com.datastax.cassandra:cassandra-driver-mapping:$cassandra_driver_version",
+ checker_qual : "org.checkerframework:checker-qual:$checkerframework_version",
classgraph : "io.github.classgraph:classgraph:$classgraph_version",
commons_codec : "commons-codec:commons-codec:1.15",
commons_compress : "org.apache.commons:commons-compress:1.21",
diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle
index 731cf33..d16fb16 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -146,6 +146,14 @@ dependencies {
testRuntimeOnly library.java.slf4j_jdk14
}
+// Don't pull in newer versions of the checker framework from dependencies.
+// TODO(BEAM-11125) Remove this when Beam upgrades to newest checker framework version.
+configurations.compile {
+ resolutionStrategy {
+ force library.java.checker_qual
+ }
+}
+
/**
* These are integration tests with the real Pubsub service and the DirectRunner.