From b08d68030ffa6093a7c183d3afdb5b8b3e3ed88a Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Wed, 24 Jul 2024 11:55:15 +0200 Subject: [PATCH 1/3] Update to beam 2.58 --- build.sbt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index ef50630852..346360254b 100644 --- a/build.sbt +++ b/build.sbt @@ -28,11 +28,12 @@ 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/" +ThisBuild / resolvers += "apache-beam-staging" at "https://repository.apache.org/content/repositories/orgapachebeam-1381/" val beamVendorVersion = "0.1" -val beamVersion = "2.57.0" +val beamVersion = "2.58.0" // check version used by beam -// https://github.com/apache/beam/blob/v2.57.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +// https://github.com/apache/beam/blob/v2.58.0-RC1/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy val autoServiceVersion = "1.0.1" val autoValueVersion = "1.9" val bigdataossVersion = "2.2.16" @@ -42,20 +43,20 @@ val commonsCompressVersion = "1.26.2" val commonsIoVersion = "2.16.1" val commonsLang3Version = "3.14.0" val commonsMath3Version = "3.6.1" -val gcpLibrariesVersion = "26.36.0" +val gcpLibrariesVersion = "26.39.0" val googleClientsVersion = "2.0.0" -val guavaVersion = "32.1.2-jre" +val guavaVersion = "33.1.0-jre" val hamcrestVersion = "2.1" val httpClientVersion = "4.5.13" val httpCoreVersion = "4.4.14" val jacksonVersion = "2.15.4" -val jodaTimeVersion = "2.10.10" +val jodaTimeVersion = "2.10.14" val nettyVersion = "4.1.100.Final" val slf4jVersion = "1.7.30" val zstdJniVersion = "1.5.6-3" // dependent versions val googleApiServicesBigQueryVersion = s"v2-rev20240323-$googleClientsVersion" -val googleApiServicesDataflowVersion = s"v1b3-rev20240218-$googleClientsVersion" +val googleApiServicesDataflowVersion = s"v1b3-rev20240624-$googleClientsVersion" val googleApiServicesPubsubVersion = s"v1-rev20220904-$googleClientsVersion" val googleApiServicesStorageVersion = s"v1-rev20240319-$googleClientsVersion" // beam tested versions @@ -68,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.36.0/index.html +// https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/26.39.0/index.html val failureAccessVersion = "1.0.2" val checkerQualVersion = "3.42.0" val jsr305Version = "3.0.2" From 8740793237186407a783930e3234dae03b268aa1 Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Tue, 30 Jul 2024 11:40:34 +0200 Subject: [PATCH 2/3] Update to RC2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 346360254b..573adc0575 100644 --- a/build.sbt +++ b/build.sbt @@ -28,12 +28,12 @@ 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/" -ThisBuild / resolvers += "apache-beam-staging" at "https://repository.apache.org/content/repositories/orgapachebeam-1381/" +ThisBuild / resolvers += "apache-beam-staging" at "https://repository.apache.org/content/repositories/orgapachebeam-1382/" val beamVendorVersion = "0.1" val beamVersion = "2.58.0" // check version used by beam -// https://github.com/apache/beam/blob/v2.58.0-RC1/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +// https://github.com/apache/beam/blob/v2.58.0-RC2/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy val autoServiceVersion = "1.0.1" val autoValueVersion = "1.9" val bigdataossVersion = "2.2.16" From bef801e5f818900c2674bdb8cac14906bd356b7b Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Thu, 8 Aug 2024 14:10:54 +0200 Subject: [PATCH 3/3] Update to released version --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 573adc0575..2b3c442a76 100644 --- a/build.sbt +++ b/build.sbt @@ -28,12 +28,11 @@ 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/" -ThisBuild / resolvers += "apache-beam-staging" at "https://repository.apache.org/content/repositories/orgapachebeam-1382/" val beamVendorVersion = "0.1" val beamVersion = "2.58.0" // check version used by beam -// https://github.com/apache/beam/blob/v2.58.0-RC2/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +// https://github.com/apache/beam/blob/v2.58.0/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy val autoServiceVersion = "1.0.1" val autoValueVersion = "1.9" val bigdataossVersion = "2.2.16"