From abdc45ed66fbf05d698854fbf4399b7f9d9d1819 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:27:01 -0500 Subject: [PATCH 01/15] feat: LTS8 --- boms/cloud-lts-bom/pom.xml | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 372ed3206..1cd78d25d 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -49,53 +49,53 @@ UTF-8 - 33.1.0-jre - 1.10.4 - 3.25.4 - 1.62.2 - 1.44.1 - 1.35.0 - 1.23.0 - 2.4.0 + 33.3.1-jre + 1.11.0 + 4.29.0 + 1.70.0 + 1.46.3 + 1.38.0 + 1.33.1 + 2.7.2 - 2.48.0 - 2.31.0 - 2.38.0 - 2.39.0 + 2.62.0 + 2.45.0 + 2.52.0 + 2.53.0 - 2.46.0 - 2.46.0 - 3.44.0 - 1.43.0 - 2.46.0 - 1.45.0 - 2.43.0 - 2.43.0 - 2.43.0 - 2.43.0 + 2.62.0 + 2.62.0 + 3.60.0 + 1.59.0 + 2.62.0 + 1.61.0 + 2.59.0 + 2.59.0 + 2.59.0 + 3.57.0 3.41.0 - 3.38.0 - 2.43.0 - 2.43.0 - v3-rev20240418-2.0.0 - 2.0.26 - 2.2.22 - 2.40.1 + 3.54.0 + 2.59.0 + 2.59.0 + v3-rev20250102-2.0.0 + 2.0.31 + 2.2.26 + 2.48.1 - v2-rev20240323-2.0.0 - 3.5.1 + v2-rev20250216-2.0.0 + 3.11.4 2.39.2 - 3.17.1 - 2.19.2 - 1.129.3 + 3.21.4 + 2.26.4 + 1.137.1 - 1.111.3 - 6.66.0 - 2.38.0 + 1.119.1 + 6.88.0 + 2.47.0 - 2.57.0 + 2.63.0 2.14.3 From 7cbfcbcfeae82ff0699fc622fc319672e9bbca87 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 07:55:05 -0500 Subject: [PATCH 02/15] fix version translate and vision --- boms/cloud-lts-bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 1cd78d25d..504a3bee9 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -73,8 +73,8 @@ 2.59.0 2.59.0 2.59.0 - 3.57.0 - 3.41.0 + 2.59.0 + 3.57.0 3.54.0 2.59.0 2.59.0 From 58fb9f4f84b25dddb235c96dfdb178fd37577359 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:03:47 -0500 Subject: [PATCH 03/15] update guava version --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 504a3bee9..1053ec617 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 33.3.1-jre + 33.4.0-jre 1.11.0 4.29.0 1.70.0 From a6d525520db0b38c974c67be887e4ea77851f73f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:10:54 -0500 Subject: [PATCH 04/15] temp update bigtable until we have new version --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 1053ec617..b4c496829 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -85,7 +85,7 @@ v2-rev20250216-2.0.0 3.11.4 - 2.39.2 + 2.51.1 3.21.4 2.26.4 1.137.1 From 899700bc4b613e1bfb1bb4598bd3228a38a3142f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:30:42 -0500 Subject: [PATCH 05/15] update bigtable with correct version --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index b4c496829..1249cc1fc 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -85,7 +85,7 @@ v2-rev20250216-2.0.0 3.11.4 - 2.51.1 + 2.53.0 3.21.4 2.26.4 1.137.1 From 471043e9e506ab94e90b48801c2a1f5a7cc4a3f3 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:33:20 -0400 Subject: [PATCH 06/15] update protobuf to be version 3.25 + use exclusions --- boms/cloud-lts-bom/pom.xml | 42 +++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 1249cc1fc..dd2a4cffc 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -51,7 +51,7 @@ 33.4.0-jre 1.11.0 - 4.29.0 + 3.25.5 1.70.0 1.46.3 1.38.0 @@ -474,21 +474,61 @@ org.apache.beam beam-sdks-java-core ${beam.version} + + + com.google.protobuf + protobuf-java + + + com.google.protobuf + protobuf-java-util + + org.apache.beam beam-sdks-java-extensions-google-cloud-platform-core ${beam.version} + + + com.google.protobuf + protobuf-java + + + com.google.protobuf + protobuf-java-util + + org.apache.beam beam-runners-google-cloud-dataflow-java ${beam.version} + + + com.google.protobuf + protobuf-java + + + com.google.protobuf + protobuf-java-util + + org.apache.beam beam-sdks-java-io-google-cloud-platform ${beam.version} + + + com.google.protobuf + protobuf-java + + + com.google.protobuf + protobuf-java-util + + From 797be0463a1ca77bfe8f3c91b49e0b2310009e96 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:53:27 -0400 Subject: [PATCH 07/15] update protobuf to be version 3.25.6 --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index dd2a4cffc..41f5354fa 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -51,7 +51,7 @@ 33.4.0-jre 1.11.0 - 3.25.5 + 3.25.6 1.70.0 1.46.3 1.38.0 From 184be9f86ef7294729b335e7f52fb1f8669a7fa2 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Thu, 20 Mar 2025 10:16:11 -0400 Subject: [PATCH 08/15] exclude json pulled in by protobuf 3.25 --- boms/cloud-lts-bom/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 41f5354fa..5b6f430de 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -132,6 +132,12 @@ com.google.protobuf protobuf-java-util ${protobuf.version} + + + com.google.code.gson + gson + + com.google.http-client From a5e47bea389225f445d44c078e382e68dda92074 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:48:21 -0400 Subject: [PATCH 09/15] update beam to 2.64 --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 5b6f430de..6534e5e7a 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -95,7 +95,7 @@ 2.47.0 - 2.63.0 + 2.64.0 2.14.3 From 1ffe8b9253dc149d535b2b83d7208ae6532c846b Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:57:03 -0400 Subject: [PATCH 10/15] temporarily ignore downgrades --- .../src/test/java/com/google/cloud/BomContentTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java b/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java index d13978a5a..682cf3119 100644 --- a/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java +++ b/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java @@ -76,8 +76,8 @@ private void checkBom(Path bomPath) throws Exception { assertReachable(buildMavenCentralUrl(artifact)); } } - - assertNoDowngradeRule(bom); + // Temporarily ignore due to inability to process exclusion statements + //assertNoDowngradeRule(bom); assertUniqueClasses(artifacts); assertBomIsImported(bom); } From 20278e5ce23d6cbeaa66110a2368ac71c585add6 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:57:31 -0400 Subject: [PATCH 11/15] fix versions of bigtable and storage --- boms/cloud-lts-bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 6534e5e7a..02eee8d3d 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -85,14 +85,14 @@ v2-rev20250216-2.0.0 3.11.4 - 2.53.0 + 2.54.0 3.21.4 2.26.4 1.137.1 1.119.1 6.88.0 - 2.47.0 + 2.49.0 2.64.0 From eb06edf61483830ceefeadf2613e5afe34dbff03 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Mon, 5 May 2025 14:33:00 -0400 Subject: [PATCH 12/15] update hbase version --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 02eee8d3d..1d0f6295b 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -97,7 +97,7 @@ 2.64.0 - 2.14.3 + 2.14.9 From cddfeb2322488161f82ed9b711b5e92c831a12c6 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Mon, 5 May 2025 14:31:11 -0400 Subject: [PATCH 13/15] add hbase dependency --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 1d0f6295b..b8e071fb9 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -540,7 +540,7 @@ com.google.cloud.bigtable - bigtable-hbase-beam + dotvisu ${bigtable-hbase-beam.version} From 8367e439333ee9592c358aec85779224c80956ec Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Tue, 6 May 2025 12:00:13 -0400 Subject: [PATCH 14/15] test nodowngrade --- boms/cloud-lts-bom/pom.xml | 2 +- .../src/test/java/com/google/cloud/BomContentTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index b8e071fb9..0bff8d987 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -51,7 +51,7 @@ 33.4.0-jre 1.11.0 - 3.25.6 + 4.29.1 1.70.0 1.46.3 1.38.0 diff --git a/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java b/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java index 682cf3119..47597efa1 100644 --- a/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java +++ b/boms/integration-tests/src/test/java/com/google/cloud/BomContentTest.java @@ -77,7 +77,7 @@ private void checkBom(Path bomPath) throws Exception { } } // Temporarily ignore due to inability to process exclusion statements - //assertNoDowngradeRule(bom); + assertNoDowngradeRule(bom); assertUniqueClasses(artifacts); assertBomIsImported(bom); } From 5977bebc21236e87fb5d7e18e57a95a9cdebab16 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Tue, 6 May 2025 13:08:44 -0400 Subject: [PATCH 15/15] revert typo --- boms/cloud-lts-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boms/cloud-lts-bom/pom.xml b/boms/cloud-lts-bom/pom.xml index 0bff8d987..2091175f4 100644 --- a/boms/cloud-lts-bom/pom.xml +++ b/boms/cloud-lts-bom/pom.xml @@ -540,7 +540,7 @@ com.google.cloud.bigtable - dotvisu + bigtable-hbase-beam ${bigtable-hbase-beam.version}