From 5ce5941da3f3a2b34877a82b600687ebfdae851a Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 09:51:15 -0500 Subject: [PATCH 01/17] Update MongodB driver to mongodb-driver-legacy:5.3.1 --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 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 fafbc554dc8d..bd18b36d49eb 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -839,7 +839,7 @@ class BeamModulePlugin implements Plugin { log4j2_slf4j_impl : "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2_version", mockito_core : "org.mockito:mockito-core:3.7.7", mockito_inline : "org.mockito:mockito-inline:4.5.1", - mongo_java_driver : "org.mongodb:mongo-java-driver:3.12.11", + mongo_java_driver : "org.mongodb:mongodb-driver-legacy:5.3.1", nemo_compiler_frontend_beam : "org.apache.nemo:nemo-compiler-frontend-beam:$nemo_version", netty_all : "io.netty:netty-all:$netty_version", netty_handler : "io.netty:netty-handler:$netty_version", From c11e651561088d59ec72942231e7edf547d46950 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 12:56:29 -0500 Subject: [PATCH 02/17] Remove use of methods no longer available in the MongoDB driver --- .../java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java | 4 ++-- .../main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java index 07cc238c7e6b..6c0d2129994d 100644 --- a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java +++ b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java @@ -21,6 +21,7 @@ import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkNotNull; import com.google.auto.value.AutoValue; +import com.mongodb.BasicDBObject; import com.mongodb.DB; import com.mongodb.DBCursor; import com.mongodb.DBObject; @@ -29,7 +30,6 @@ import com.mongodb.gridfs.GridFS; import com.mongodb.gridfs.GridFSDBFile; import com.mongodb.gridfs.GridFSInputFile; -import com.mongodb.util.JSON; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -380,7 +380,7 @@ protected static class BoundedGridFSSource extends BoundedSource { private DBCursor createCursor(GridFS gridfs) { if (spec.filter() != null) { - DBObject query = (DBObject) JSON.parse(spec.filter()); + DBObject query = BasicDBObject.parse(spec.filter()); return gridfs.getFileList(query); } return gridfs.getFileList(); diff --git a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java index 13c5c92d87ba..4e9ac018b8bf 100644 --- a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java +++ b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java @@ -359,9 +359,7 @@ private static MongoClientOptions.Builder getOptions( if (sslEnabled) { optionsBuilder.sslEnabled(sslEnabled).sslInvalidHostNameAllowed(sslInvalidHostNameAllowed); if (ignoreSSLCertificate) { - SSLContext sslContext = SSLUtils.ignoreSSLCertificate(); - optionsBuilder.sslContext(sslContext); - optionsBuilder.socketFactory(sslContext.getSocketFactory()); + optionsBuilder.sslContext(SSLUtils.ignoreSSLCertificate()); } } return optionsBuilder; From 9fe96712f2b914f914329f7120aa703ab98d6207 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 13:05:44 -0500 Subject: [PATCH 03/17] Remove unused import --- .../src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java index 4e9ac018b8bf..447f3e9e6811 100644 --- a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java +++ b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbIO.java @@ -46,7 +46,6 @@ import java.util.NoSuchElementException; import java.util.Optional; import java.util.stream.Collectors; -import javax.net.ssl.SSLContext; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.SerializableCoder; import org.apache.beam.sdk.io.BoundedSource; From 967d13770b61014935571766af7431bd03d94e68 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 13:25:06 -0500 Subject: [PATCH 04/17] Check for null arguments --- .../java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java index 6c0d2129994d..5ac3dffa6c88 100644 --- a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java +++ b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java @@ -333,10 +333,10 @@ public void teardown() { public void processElement(final ProcessContext c) throws IOException { Preconditions.checkStateNotNull(gridfs); ObjectId oid = c.element(); - GridFSDBFile file = gridfs.find(oid); + GridFSDBFile file = gridfs.find(Preconditions.checkArgumentNotNull(oid)); Parser parser = Preconditions.checkStateNotNull(parser()); parser.parse( - file, + Preconditions.checkArgumentNotNull(file), new ParserCallback() { @Override public void output(T output, Instant timestamp) { From be30c006b35d3d39c6dd04a1ce581f43d7538178 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 14:45:30 -0500 Subject: [PATCH 05/17] Handle change to Filters#and --- .../test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java index d726dad5b871..3a2f49092d6c 100644 --- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java +++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java @@ -157,7 +157,7 @@ public void testSplitIntoBucket() { "{\"$match\": {\"_id\": {\"$lte\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(0).toString()); assertEquals( - "{\"$match\": {\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", + "{\"$match\": {\"[$and\": [{\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}]]}}", buckets.get(1).toString()); // add more splits and verify the buckets From 9bc37c0128d20b071705818f09b5e5edba359da2 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 15:03:15 -0500 Subject: [PATCH 06/17] Revert last commit --- .../test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java index 3a2f49092d6c..d726dad5b871 100644 --- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java +++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java @@ -157,7 +157,7 @@ public void testSplitIntoBucket() { "{\"$match\": {\"_id\": {\"$lte\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(0).toString()); assertEquals( - "{\"$match\": {\"[$and\": [{\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}]]}}", + "{\"$match\": {\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(1).toString()); // add more splits and verify the buckets From eb7c1d26d3edd5dcb54da4475143b5e6a75bdfef Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 15:13:24 -0500 Subject: [PATCH 07/17] Debugging --- .../java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java index d726dad5b871..8593e0a0c935 100644 --- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java +++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java @@ -156,8 +156,8 @@ public void testSplitIntoBucket() { assertEquals( "{\"$match\": {\"_id\": {\"$lte\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(0).toString()); - assertEquals( - "{\"$match\": {\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", + assertEquals("Got unexpected output: " + buckets.get(1).toString(), + "{\"$match\": {\"[$and\": [{\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}]]}}", buckets.get(1).toString()); // add more splits and verify the buckets From 3ccf8066659bbf00f93a44ef6605e32ff440e063 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 15:22:33 -0500 Subject: [PATCH 08/17] Add undeclared transitive dependencies --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 6 +++++- it/mongodb/build.gradle | 2 +- sdks/java/extensions/sql/build.gradle | 2 +- sdks/java/io/mongodb/build.gradle | 2 +- 4 files changed, 8 insertions(+), 4 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 bd18b36d49eb..a3a8b0559d3c 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -627,6 +627,7 @@ class BeamModulePlugin implements Plugin { def log4j2_version = "2.20.0" def nemo_version = "0.1" // [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom + def mongodb_version = "5.3.1" def netty_version = "4.1.110.Final" def postgres_version = "42.2.16" def powermock_version = "2.0.9" @@ -839,7 +840,10 @@ class BeamModulePlugin implements Plugin { log4j2_slf4j_impl : "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2_version", mockito_core : "org.mockito:mockito-core:3.7.7", mockito_inline : "org.mockito:mockito-inline:4.5.1", - mongo_java_driver : "org.mongodb:mongodb-driver-legacy:5.3.1", + mongodb_driver_legacy : "org.mongodb:mongodb-driver-legacy:$mongodb_version", + mongodb_driver_sync : "org.mongodb:mongodb-driver-sync:$mongodb_version", + mongodb_driver_core : "org.mongodb:mongodb-driver-core:$mongodb_version", + bson : "org.mongodb:bson:$mongodb_version", nemo_compiler_frontend_beam : "org.apache.nemo:nemo-compiler-frontend-beam:$nemo_version", netty_all : "io.netty:netty-all:$netty_version", netty_handler : "io.netty:netty-handler:$netty_version", diff --git a/it/mongodb/build.gradle b/it/mongodb/build.gradle index 6be9b91f5b34..6cf0246b5e4f 100644 --- a/it/mongodb/build.gradle +++ b/it/mongodb/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation library.java.testcontainers_base implementation library.java.testcontainers_mongodb implementation library.java.google_code_gson - implementation library.java.mongo_java_driver + implementation library.java.mongodb_driver_legacy implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.mockito_core diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 6f34891c2d3f..27a0fee0de07 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation "org.codehaus.janino:janino:3.0.11" implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core - implementation library.java.mongo_java_driver + implementation library.java.mongodb_driver_legacy implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.vendored_guava_32_1_2_jre diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index b9e90082f0dc..028aa27e3990 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -27,7 +27,7 @@ ext.summary = "IO to read and write on MongoDB." dependencies { implementation project(path: ":sdks:java:core", configuration: "shadow") implementation library.java.joda_time - implementation library.java.mongo_java_driver + implementation library.java.mongodb_driver_legacy implementation library.java.slf4j_api implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.junit From 1eb32c3fdce4adba29a9f826e49b2134b250b6ba Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 15:39:51 -0500 Subject: [PATCH 09/17] Add undeclared transitive dependencies --- it/mongodb/build.gradle | 3 +++ sdks/java/extensions/sql/build.gradle | 3 +++ sdks/java/io/mongodb/build.gradle | 3 +++ 3 files changed, 9 insertions(+) diff --git a/it/mongodb/build.gradle b/it/mongodb/build.gradle index 6cf0246b5e4f..139eea9b0d8d 100644 --- a/it/mongodb/build.gradle +++ b/it/mongodb/build.gradle @@ -35,6 +35,9 @@ dependencies { implementation library.java.testcontainers_mongodb implementation library.java.google_code_gson implementation library.java.mongodb_driver_legacy + implementation library.java.mongodb_driver_sync + implementation library.java.mongodb_driver_core + implementation library.java.bson implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.mockito_core diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 27a0fee0de07..cdc9e310c123 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -88,6 +88,9 @@ dependencies { implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core implementation library.java.mongodb_driver_legacy + implementation library.java.mongodb_driver_sync + implementation library.java.mongodb_driver_core + implementation library.java.bson implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.vendored_guava_32_1_2_jre diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 028aa27e3990..b44be3ab8372 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -28,6 +28,9 @@ dependencies { implementation project(path: ":sdks:java:core", configuration: "shadow") implementation library.java.joda_time implementation library.java.mongodb_driver_legacy + implementation library.java.mongodb_driver_sync + implementation library.java.mongodb_driver_core + implementation library.java.bson implementation library.java.slf4j_api implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.junit From 10d93efe29fb152f1c74836f40955f6a9f60e75c Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 16:04:03 -0500 Subject: [PATCH 10/17] Revert "Add undeclared transitive dependencies" This reverts commit 1eb32c3fdce4adba29a9f826e49b2134b250b6ba. --- it/mongodb/build.gradle | 3 --- sdks/java/extensions/sql/build.gradle | 3 --- sdks/java/io/mongodb/build.gradle | 3 --- 3 files changed, 9 deletions(-) diff --git a/it/mongodb/build.gradle b/it/mongodb/build.gradle index 139eea9b0d8d..6cf0246b5e4f 100644 --- a/it/mongodb/build.gradle +++ b/it/mongodb/build.gradle @@ -35,9 +35,6 @@ dependencies { implementation library.java.testcontainers_mongodb implementation library.java.google_code_gson implementation library.java.mongodb_driver_legacy - implementation library.java.mongodb_driver_sync - implementation library.java.mongodb_driver_core - implementation library.java.bson implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.mockito_core diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index cdc9e310c123..27a0fee0de07 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -88,9 +88,6 @@ dependencies { implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core implementation library.java.mongodb_driver_legacy - implementation library.java.mongodb_driver_sync - implementation library.java.mongodb_driver_core - implementation library.java.bson implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.vendored_guava_32_1_2_jre diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index b44be3ab8372..028aa27e3990 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -28,9 +28,6 @@ dependencies { implementation project(path: ":sdks:java:core", configuration: "shadow") implementation library.java.joda_time implementation library.java.mongodb_driver_legacy - implementation library.java.mongodb_driver_sync - implementation library.java.mongodb_driver_core - implementation library.java.bson implementation library.java.slf4j_api implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.junit From fd18f622c9a4f6c7e5c0cea6fe94d6208192be28 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 27 Feb 2025 16:26:12 -0500 Subject: [PATCH 11/17] Revert "Debugging" This reverts commit eb7c1d26d3edd5dcb54da4475143b5e6a75bdfef. --- .../java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java index 8593e0a0c935..d726dad5b871 100644 --- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java +++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java @@ -156,8 +156,8 @@ public void testSplitIntoBucket() { assertEquals( "{\"$match\": {\"_id\": {\"$lte\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(0).toString()); - assertEquals("Got unexpected output: " + buckets.get(1).toString(), - "{\"$match\": {\"[$and\": [{\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}]]}}", + assertEquals( + "{\"$match\": {\"_id\": {\"$gt\": {\"$oid\": \"52cc8f6254c5317943000005\"}}}}", buckets.get(1).toString()); // add more splits and verify the buckets From cfabd56f0fb6f50394eb9460226a6ed3f6f2f0a7 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 26 Mar 2025 12:37:03 -0400 Subject: [PATCH 12/17] Update MongoDB dependency to 5.4.0. --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 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 12bcf0cfc525..caf50ef6ba33 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -627,7 +627,7 @@ class BeamModulePlugin implements Plugin { def log4j2_version = "2.20.0" def nemo_version = "0.1" // [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom - def mongodb_version = "5.3.1" + def mongodb_version = "5.4.0" def netty_version = "4.1.110.Final" def postgres_version = "42.2.16" // [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom From 91b650d53530458c0040e82839e530763d09fb09 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 26 Mar 2025 12:42:10 -0400 Subject: [PATCH 13/17] Fixed mockito dependencies --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 -- 1 file changed, 2 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 caf50ef6ba33..703cae762172 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -841,8 +841,6 @@ class BeamModulePlugin implements Plugin { log4j2_log4j12_api : "org.apache.logging.log4j:log4j-1.2-api:$log4j2_version", mockito_core : "org.mockito:mockito-core:4.11.0", mockito_inline : "org.mockito:mockito-inline:4.11.0", - mockito_core : "org.mockito:mockito-core:3.7.7", - mockito_inline : "org.mockito:mockito-inline:4.5.1", mongodb_driver_legacy : "org.mongodb:mongodb-driver-legacy:$mongodb_version", mongodb_driver_sync : "org.mongodb:mongodb-driver-sync:$mongodb_version", mongodb_driver_core : "org.mongodb:mongodb-driver-core:$mongodb_version", From 2ec2639c57710d4e002c9c4bdc7ddd09264667f4 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Mon, 31 Mar 2025 12:22:49 -0400 Subject: [PATCH 14/17] Update dependency from legacy to core --- sdks/java/extensions/sql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 27a0fee0de07..5bc8a6d63a9a 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation "org.codehaus.janino:janino:3.0.11" implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core - implementation library.java.mongodb_driver_legacy + implementation library.java.mongodb_driver_core implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.vendored_guava_32_1_2_jre From 4622e6bc5c88ad11336f9bd4e218063caebf6c6e Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Mon, 31 Mar 2025 12:25:10 -0400 Subject: [PATCH 15/17] add bson dependency --- sdks/java/extensions/sql/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 5bc8a6d63a9a..8fa2bff100dd 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -88,6 +88,7 @@ dependencies { implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core implementation library.java.mongodb_driver_core + implementation library.java.bson implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.vendored_guava_32_1_2_jre From c43ed7ce0e3fb283a8f43aaa8062c3026db56f25 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Mon, 31 Mar 2025 13:33:42 -0400 Subject: [PATCH 16/17] add sync dependency --- sdks/java/extensions/sql/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 8fa2bff100dd..cbd2a61f0e44 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -87,6 +87,7 @@ dependencies { implementation "org.codehaus.janino:janino:3.0.11" implementation "org.codehaus.janino:commons-compiler:3.0.11" implementation library.java.jackson_core + implementation library.java.mongodb_driver_sync implementation library.java.mongodb_driver_core implementation library.java.bson implementation library.java.slf4j_api From 5349c158ab020854fa51ac8a3ef7f01563aba726 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Mon, 31 Mar 2025 13:53:01 -0400 Subject: [PATCH 17/17] Update dependencies --- it/mongodb/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/it/mongodb/build.gradle b/it/mongodb/build.gradle index 6cf0246b5e4f..fc6584f6dffa 100644 --- a/it/mongodb/build.gradle +++ b/it/mongodb/build.gradle @@ -34,7 +34,8 @@ dependencies { implementation library.java.testcontainers_base implementation library.java.testcontainers_mongodb implementation library.java.google_code_gson - implementation library.java.mongodb_driver_legacy + implementation library.java.mongodb_driver_sync + implementation library.java.bson implementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.mockito_core