From fee4887f9fe5510fccde256b9cd5b3f204888740 Mon Sep 17 00:00:00 2001 From: Charles Tan Date: Mon, 2 Jun 2025 16:19:39 -0500 Subject: [PATCH 1/3] Upgrade beam version to 2.65.0 --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ddae78dcd5..977bfc6b15 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ import org.typelevel.scalacoptions.JavaMajorVersion.javaMajorVersion // To test release candidates, find the beam repo and add it as a resolver // ThisBuild / resolvers += "apache-beam-staging" at "https://repository.apache.org/content/repositories/" val beamVendorVersion = "0.1" -val beamVersion = "2.64.0" +val beamVersion = "2.65.0" // check version used by beam // https://github.com/apache/beam/blob/v2.64.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -43,7 +43,7 @@ val commonsCompressVersion = "1.26.2" val commonsIoVersion = "2.16.1" val commonsLang3Version = "3.14.0" val commonsMath3Version = "3.6.1" -val gcpLibrariesVersion = "26.56.0" +val gcpLibrariesVersion = "26.57.0" val googleClientsVersion = "2.0.0" val guavaVersion = "33.1.0-jre" val hamcrestVersion = "2.1" @@ -69,7 +69,7 @@ val sparkVersion = "3.5.0" // runners/spark/3/build.gradle val sparkMajorVersion = VersionNumber(sparkVersion).numbers.take(1).mkString(".") // check recommended versions from libraries-bom -// https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/26.56.0/index.html +// https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/26.57.0/index.html val failureAccessVersion = "1.0.2" val checkerQualVersion = "3.49.0" val jsr305Version = "3.0.2" From c0c78972f55ea56ada679fae647f4bc08c55760a Mon Sep 17 00:00:00 2001 From: Charles Tan Date: Mon, 2 Jun 2025 20:34:24 -0500 Subject: [PATCH 2/3] update google-api-services-bigquery version --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 977bfc6b15..65447f44df 100644 --- a/build.sbt +++ b/build.sbt @@ -56,10 +56,9 @@ val protobufVersion = "3.25.5" val slf4jVersion = "1.7.30" val zstdJniVersion = "1.5.6-3" // dependent versions -val googleApiServicesBigQueryVersion = s"v2-rev20250216-$googleClientsVersion" +val googleApiServicesBigQueryVersion = s"v2-rev20250313-$googleClientsVersion" val googleApiServicesDataflowVersion = s"v1b3-rev20250106-$googleClientsVersion" val googleApiServicesPubsubVersion = s"v1-rev20220904-$googleClientsVersion" -val googleApiServicesStorageVersion = s"v1-rev20241206-$googleClientsVersion" // beam tested versions val zetasketchVersion = "0.1.0" // sdks/java/extensions/zetasketch/build.gradle val flinkVersion = "1.19.0" // runners/flink/1.19/build.gradle From 71de374c945ce36ecc10b46713257d6d8b99f1f4 Mon Sep 17 00:00:00 2001 From: Charles Tan Date: Tue, 3 Jun 2025 08:55:53 -0500 Subject: [PATCH 3/3] Update netty --- build.sbt | 4 ++-- project/Exclude.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 65447f44df..0fc3641639 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ val beamVendorVersion = "0.1" val beamVersion = "2.65.0" // check version used by beam -// https://github.com/apache/beam/blob/v2.64.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +// https://github.com/apache/beam/blob/v2.65.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy val autoServiceVersion = "1.0.1" val autoValueVersion = "1.9" val avroVersion = sys.props.getOrElse("avro.version", "1.11.4") @@ -51,7 +51,7 @@ val httpClientVersion = "4.5.13" val httpCoreVersion = "4.4.14" val jacksonVersion = "2.15.4" val jodaTimeVersion = "2.10.14" -val nettyVersion = "4.1.110.Final" +val nettyVersion = "4.1.118.Final" val protobufVersion = "3.25.5" val slf4jVersion = "1.7.30" val zstdJniVersion = "1.5.6-3" diff --git a/project/Exclude.scala b/project/Exclude.scala index a1d13d1684..60842c91a2 100644 --- a/project/Exclude.scala +++ b/project/Exclude.scala @@ -17,7 +17,7 @@ object Exclude { "log4j" % "log4j" ) - // Beam 2.64 pulls in jackson-module-scala_2.12, which pulls in chill_2.12 + // Beam 2.65 pulls in jackson-module-scala_2.12, which pulls in chill_2.12 def jacksonCrossBuilt(scalaVersion: String): Seq[ExclusionRule] = VersionNumber( scalaVersion ) match {