From 32703e6f4e79bd9fe7435b1a49fb23805f4bfe9d Mon Sep 17 00:00:00 2001 From: David van Geest Date: Thu, 9 Nov 2023 23:14:53 -0500 Subject: [PATCH 1/6] Bump pubsub protos. --- project/Dependencies.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a1e8bd302..bbcd83e75 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -238,10 +238,9 @@ object Dependencies { // see Pekko gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/ - "com.google.cloud" % "google-cloud-pubsub" % "1.112.5" % "protobuf-src", + "com.google.cloud" % "google-cloud-pubsub" % "1.125.2" % "protobuf-src", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, "com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion, - "com.google.protobuf" % "protobuf-java" % protobufJavaVersion, // pull in Pekko Discovery for our Pekko version "org.apache.pekko" %% "pekko-discovery" % PekkoVersion)) From 115e72eea894a88695bb15d86e733d0eb6503c98 Mon Sep 17 00:00:00 2001 From: David van Geest Date: Thu, 9 Nov 2023 23:22:45 -0500 Subject: [PATCH 2/6] Remove other protobuf-java dep. --- project/Dependencies.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bbcd83e75..02058bc35 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -36,7 +36,6 @@ object Dependencies { val ScalaTestVersion = "3.2.14" val TestContainersScalaTestVersion = "0.40.14" val mockitoVersion = "4.2.0" // check even https://github.com/scalatest/scalatestplus-mockito/releases - val protobufJavaVersion = "3.21.12" val hoverflyVersion = "0.14.1" val scalaCheckVersion = "1.16.0" @@ -220,7 +219,6 @@ object Dependencies { "org.apache.avro" % "avro" % AvroVersion % "provided", "org.apache.arrow" % "arrow-vector" % "4.0.0" % "provided", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, - "com.google.protobuf" % "protobuf-java" % protobufJavaVersion, "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-http-core" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, From 98e0cd40d5f8f543a5fcd493bcf74552df7d24f6 Mon Sep 17 00:00:00 2001 From: David van Geest Date: Fri, 10 Nov 2023 09:03:15 -0500 Subject: [PATCH 3/6] Add back protobuf-java with upgrade. --- project/Dependencies.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 02058bc35..2fae646e5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -36,6 +36,7 @@ object Dependencies { val ScalaTestVersion = "3.2.14" val TestContainersScalaTestVersion = "0.40.14" val mockitoVersion = "4.2.0" // check even https://github.com/scalatest/scalatestplus-mockito/releases + val protobufJavaVersion = "3.25.0" val hoverflyVersion = "0.14.1" val scalaCheckVersion = "1.16.0" @@ -219,6 +220,7 @@ object Dependencies { "org.apache.avro" % "avro" % AvroVersion % "provided", "org.apache.arrow" % "arrow-vector" % "4.0.0" % "provided", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, + "com.google.protobuf" % "protobuf-java" % protobufJavaVersion % Runtime, "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-http-core" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, @@ -239,6 +241,7 @@ object Dependencies { "com.google.cloud" % "google-cloud-pubsub" % "1.125.2" % "protobuf-src", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, "com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion, + "com.google.protobuf" % "protobuf-java" % protobufJavaVersion % Runtime, // pull in Pekko Discovery for our Pekko version "org.apache.pekko" %% "pekko-discovery" % PekkoVersion)) From 65131c300b91c7d1c76455cad56b09ae7ad90291 Mon Sep 17 00:00:00 2001 From: David van Geest Date: Fri, 10 Nov 2023 09:03:23 -0500 Subject: [PATCH 4/6] .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ed5a415cf..b91fab001 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ ext-lib-src/ .metals/ metals.sbt .bsp/ +.vscode/ From 8afed1934c6bfe91e0bc456bf7e0b099de9a8cd6 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 7 Feb 2024 00:37:52 +0100 Subject: [PATCH 5/6] Update Dependencies.scala --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2737de0a2..5eea0f14f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -225,7 +225,7 @@ object Dependencies { // see Pekko gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-bigquerystorage/tree/master/proto-google-cloud-bigquerystorage-v1 - "com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "2.36.1" % "protobuf-src", + "com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "2.47.0" % "protobuf-src", "org.apache.avro" % "avro" % AvroVersion % "provided", "org.apache.arrow" % "arrow-vector" % ArrowVersion % "provided", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, @@ -248,7 +248,7 @@ object Dependencies { // see Pekko gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/ - "com.google.cloud" % "google-cloud-pubsub" % "1.125.2" % "protobuf-src", + "com.google.cloud" % "google-cloud-pubsub" % "1.126.2" % "protobuf-src", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, "com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion, "com.google.protobuf" % "protobuf-java" % protobufJavaVersion % Runtime, From 17eccc9fea6c14504a6e773807b9db930ee1a9f5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 7 Feb 2024 01:00:45 +0100 Subject: [PATCH 6/6] Update Dependencies.scala --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5eea0f14f..29fd73044 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -225,7 +225,7 @@ object Dependencies { // see Pekko gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-bigquerystorage/tree/master/proto-google-cloud-bigquerystorage-v1 - "com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "2.47.0" % "protobuf-src", + "com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "2.36.1" % "protobuf-src", "org.apache.avro" % "avro" % AvroVersion % "provided", "org.apache.arrow" % "arrow-vector" % ArrowVersion % "provided", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, @@ -248,7 +248,7 @@ object Dependencies { // see Pekko gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/ - "com.google.cloud" % "google-cloud-pubsub" % "1.126.2" % "protobuf-src", + "com.google.cloud" % "google-cloud-pubsub" % "1.123.20" % "protobuf-src", "io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion, "com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion, "com.google.protobuf" % "protobuf-java" % protobufJavaVersion % Runtime,