From a9762c027442b220bb9431aec3c35cd636311336 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Sun, 15 Jun 2025 18:18:38 -0400 Subject: [PATCH 1/5] fix: copy project metadata Due to the boundary of com.google.api and com.google.cloud namespaces, we copy the project metadata rather than relying on the project inheritance across the boundary. --- java-core/pom.xml | 38 ++++++++++++++++++ java-iam/pom.xml | 13 +++++++ .../first-party-dependencies/pom.xml | 33 ++++++++++++++++ java-shared-dependencies/pom.xml | 39 +++++++++++++++++++ .../third-party-dependencies/pom.xml | 38 ++++++++++++++++++ 5 files changed, 161 insertions(+) diff --git a/java-core/pom.xml b/java-core/pom.xml index 468f09cae5..9bb35efe87 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -17,6 +17,44 @@ ../gapic-generator-java-pom-parent + + https://github.com/googleapis/sdk-platform-java + + + suztomo + Tomo Suzuki + suztomo@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/sdk-platform-java.git + scm:git:git@github.com:googleapis/sdk-platform-java.git + https://github.com/googleapis/sdk-platform-java + HEAD + + + https://github.com/googleapis/sdk-platform-java/issues + GitHub Issues + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + UTF-8 UTF-8 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 437a332ae4..1c013b43d1 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -17,6 +17,19 @@ ../gapic-generator-java-pom-parent + + https://github.com/googleapis/sdk-platform-java + + scm:git:git@github.com:googleapis/sdk-platform-java.git + scm:git:git@github.com:googleapis/sdk-platform-java.git + https://github.com/googleapis/sdk-platform-java + HEAD + chingor diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 7580c4e8f5..9e9fdb5f34 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -18,6 +18,39 @@ 1.16.0 + https://github.com/googleapis/sdk-platform-java + + + suztomo + Tomo Suzuki + suztomo@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/sdk-platform-java.git + scm:git:git@github.com:googleapis/sdk-platform-java.git + https://github.com/googleapis/sdk-platform-java + HEAD + + + https://github.com/googleapis/sdk-platform-java/issues + GitHub Issues + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + UTF-8 diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index ce05a780bf..3bdffc74a8 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -21,6 +21,45 @@ ../gapic-generator-java-pom-parent + + https://github.com/googleapis/sdk-platform-java + + + suztomo + Tomo Suzuki + suztomo@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/sdk-platform-java.git + scm:git:git@github.com:googleapis/sdk-platform-java.git + https://github.com/googleapis/sdk-platform-java + HEAD + + + https://github.com/googleapis/sdk-platform-java/issues + GitHub Issues + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + UTF-8 ${project.artifactId} diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index eedbdb1588..7268c796a7 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -18,6 +18,44 @@ 2.59.1 ../../gapic-generator-java-pom-parent + + https://github.com/googleapis/sdk-platform-java + + + suztomo + Tomo Suzuki + suztomo@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/sdk-platform-java.git + scm:git:git@github.com:googleapis/sdk-platform-java.git + https://github.com/googleapis/sdk-platform-java + HEAD + + + https://github.com/googleapis/sdk-platform-java/issues + GitHub Issues + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + UTF-8 From b7bc82dfd036d2e4cadd2cca1682a58110aae41e Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Sun, 15 Jun 2025 22:27:17 +0000 Subject: [PATCH 2/5] chore: generate libraries at Sun Jun 15 22:25:18 UTC 2025 --- java-iam/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 1c013b43d1..5cd0197cc0 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -23,8 +23,7 @@ following metadata (developers, scm, and licenses). This enables us to release this artifact independently from the parent artifact. --> https://github.com/googleapis/sdk-platform-java - + scm:git:git@github.com:googleapis/sdk-platform-java.git scm:git:git@github.com:googleapis/sdk-platform-java.git https://github.com/googleapis/sdk-platform-java From c6f1c7cb517801ce78b797ea6eae202d1f6cc047 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 16 Jun 2025 08:51:53 -0400 Subject: [PATCH 3/5] trying com.google.cloud for gapic-generator-java-pom-parent --- api-common-java/pom.xml | 2 +- gapic-generator-java-bom/pom.xml | 2 +- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- gax-java/pom.xml | 2 +- java-common-protos/pom.xml | 2 +- java-core/google-cloud-core-bom/pom.xml | 2 +- java-core/pom.xml | 2 +- java-iam/pom.xml | 2 +- java-shared-dependencies/pom.xml | 2 +- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index ffbf6d0043..5f1320cf03 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -10,7 +10,7 @@ Common utilities for Google APIs in Java - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 1b7f137d23..1eaa7908cc 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -13,7 +13,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index d28f4576fd..18c6dfb646 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> 4.0.0 - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 pom diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 1aa3d2e076..08d3714574 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -20,7 +20,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 3e67085c19..8519b38019 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -9,7 +9,7 @@ Google Api eXtensions for Java (Parent) - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 3ba92ea273..4272b0c44d 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -11,7 +11,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index 37b48355fb..b4bd4b37b0 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -7,7 +7,7 @@ pom - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../../gapic-generator-java-pom-parent diff --git a/java-core/pom.xml b/java-core/pom.xml index 9bb35efe87..71d8e05597 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -11,7 +11,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 5cd0197cc0..e6847a72b2 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -11,7 +11,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 3bdffc74a8..d1bc7af774 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -15,7 +15,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../gapic-generator-java-pom-parent diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 7268c796a7..18949aef0b 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -13,7 +13,7 @@ - com.google.api + com.google.cloud gapic-generator-java-pom-parent 2.59.1 ../../gapic-generator-java-pom-parent From 44cf37566882689dea331a9514acb3ef4f531bb8 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 16 Jun 2025 10:24:06 -0400 Subject: [PATCH 4/5] Trying gapic-generator-java-bom too --- gapic-generator-java-bom/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- java-shared-dependencies/first-party-dependencies/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 1eaa7908cc..0ca922bcd0 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.google.api + com.google.cloud gapic-generator-java-bom pom 2.59.1 diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 08d3714574..a30565dbe0 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -29,7 +29,7 @@ - com.google.api + com.google.cloud gapic-generator-java-bom 2.59.1 pom diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 9e9fdb5f34..cb5cbbbf45 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -64,7 +64,7 @@ - com.google.api + com.google.cloud gapic-generator-java-bom 2.59.1 pom From 251fefc964930a3f4a6beddddc8c772348d48b9c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 16 Jun 2025 11:02:59 -0400 Subject: [PATCH 5/5] Flattening the content of gax-bom in gapic-generator-java-bom --- gapic-generator-java-bom/pom.xml | 57 ++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 0ca922bcd0..9fa3467fec 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -77,13 +77,64 @@ api-common 2.50.1 + + com.google.api - gax-bom + gax 2.67.1 - pom - import + + com.google.api + gax + 2.67.1 + test-jar + testlib + + + com.google.api + gax + 2.67.1 + testlib + + + com.google.api + gax-grpc + 2.67.1 + + + com.google.api + gax-grpc + 2.67.1 + test-jar + testlib + + + com.google.api + gax-grpc + 2.67.1 + testlib + + + com.google.api + gax-httpjson + 2.67.1 + + + com.google.api + gax-httpjson + 2.67.1 + test-jar + testlib + + + com.google.api + gax-httpjson + 2.67.1 + testlib + + + com.google.api gapic-generator-java