Skip to content

chore(java-cloud-bom): migrate java-cloud-bom into monorepo - #13498

Merged
jinseopkim0 merged 14 commits into
mainfrom
migrate-java-cloud-bom
Jun 30, 2026
Merged

chore(java-cloud-bom): migrate java-cloud-bom into monorepo#13498
jinseopkim0 merged 14 commits into
mainfrom
migrate-java-cloud-bom

Conversation

@jinseopkim0

@jinseopkim0jinseopkim0 commented Jun 16, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

b/477663818

This PR migrates the java-cloud-bom package (historically hosted in a separate split repository) directly into the google-cloud-java monorepo. This consolidation allows us to centrally validate, build, and publish the release BOMs (google-cloud-bom and libraries-bom) inline with the rest of the libraries.

  1. BOM Migration:
    • Consolidated all java-cloud-bom source modules, metadata, and tools (including dashboard, release-note-generation, and tests submodules) under /java-cloud-bom.
    • Centralized configuration POMs for google-cloud-bom and libraries-bom.
  2. CI/CD Workflows:
    • Added GitHub Actions configurations for validating the BOM on presubmits, verifying content assertions, and executing dependency convergence rules.

gemini-code-assist[bot]
gemini-code-assistBot reviewed Jun 16, 2026
View reviewed changes

@gemini-code-assistgemini-code-assistBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request integrates the java-cloud-bom module into the monorepo, introducing BOM configurations, validation tests, a dashboard generator, and release-note utilities. The code review identified several critical issues that need to be addressed: a missing comma in a Python list in updateREADMETable.py causing implicit string concatenation, multiple unclosed file streams in ArtifactMavenData.java and DashboardMain.java leading to resource leaks, a potential deadlock in ReleaseNoteGeneration.java when reading process streams, and missing explicit UTF-8 encoding specifications in both Java and Python file operations.

Comment threadjava-cloud-bom/libraries-bom-table-generation/updateREADMETable.py Outdated
Comment thread...ard/src/main/java/com/google/cloud/tools/opensource/cloudbomdashboard/ArtifactMavenData.java Outdated
Comment thread...ard/src/main/java/com/google/cloud/tools/opensource/cloudbomdashboard/ArtifactMavenData.java Outdated
Comment thread...-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
Comment thread...shboard/src/main/java/com/google/cloud/tools/opensource/cloudbomdashboard/DashboardMain.java Outdated
Comment threadjava-cloud-bom/libraries-bom-table-generation/updateREADMETable.py Outdated
Comment threadjava-cloud-bom/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java Outdated
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch 3 times, most recently from 6f9b129 to 209f419CompareJune 17, 2026 15:36
@jinseopkim0
jinseopkim0 marked this pull request as ready for review June 18, 2026 09:01
@jinseopkim0
jinseopkim0 requested review from a team as code ownersJune 18, 2026 09:01
blakeli0
blakeli0 reviewed Jun 22, 2026
View reviewed changes
Comment threadsdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml Outdated
Comment thread.github/CODEOWNERS Outdated
Comment thread.github/workflows/java-cloud-bom-release-note-generation.yaml

@blakeli0blakeli0Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to generate release note similar to https://github.com/googleapis/java-cloud-bom/releases/tag/v26.83.0. Is there anyway we can test it before merging the PR? If not, can we test it with a pre-release right after merging the PR?

Separately, we need to think about the Github release strategies. I don't think the current release process can create a separate Github release for libraries-bom.

@jinseopkim0jinseopkim0Jun 22, 2026•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the questions and feedback.

We need to generate release note similar to https://github.com/googleapis/java-cloud-bom/releases/tag/v26.83.0. Is there anyway we can test it before merging the PR? If not, can we test it with a pre-release right after merging the PR?

I'll test it with a pre-release right after merging the PR. Created b/526676540 to track this.

Separately, we need to think about the Github release strategies. I don't think the current release process can create a separate Github release for libraries-bom.

Agree. I'm thinking we could have an additional tag (e.g. libraries-bom/v26.84.0), then have GH workflow pick it up to publish the release notes. I've created b/526685922 to track this. I don't think this should be a blocker for this PR. I'll follow-up with a new PR.

blakeli0
blakeli0 reviewed Jun 24, 2026
View reviewed changes
Comment thread.github/workflows/ci.yaml Outdated
Comment thread.github/workflows/java-cloud-bom-ci.yaml
Comment thread.kokoro/presubmit/cloud-bom-integration.cfg
Comment threadsdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml Outdated
@jinseopkim0
jinseopkim0 requested review from a team as code ownersJune 25, 2026 18:44
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch 3 times, most recently from 2d76bff to d280a93CompareJune 28, 2026 01:56
@jinseopkim0
jinseopkim0 requested a review from a team as a code ownerJune 28, 2026 18:57
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch from 0f05a1a to 7560c18CompareJune 28, 2026 23:07
blakeli0
blakeli0 reviewed Jun 29, 2026
View reviewed changes
Comment thread.github/CODEOWNERS Outdated
blakeli0
blakeli0 reviewed Jun 29, 2026
View reviewed changes
Comment threadgeneration/apply_versions.sh Outdated
blakeli0
blakeli0 reviewed Jun 29, 2026
View reviewed changes
Comment threadjava-bigquery-jdbc/pom.xml Outdated
blakeli0
blakeli0 reviewed Jun 29, 2026
View reviewed changes
Comment threadjava-spanner-jdbc/documentation/connection_properties.md
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch from 7560c18 to d50467fCompareJune 29, 2026 14:04
@jinseopkim0jinseopkim0 added kokoro:force-run Add this label to force Kokoro to re-run the tests. kokoro:run Add this label to force Kokoro to re-run the tests. labels Jun 29, 2026
@yoshi-kokoroyoshi-kokoro removed kokoro:run Add this label to force Kokoro to re-run the tests. kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Jun 29, 2026
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch from b690396 to 24af15bCompareJune 30, 2026 01:26
@jinseopkim0jinseopkim0 added the kokoro:run Add this label to force Kokoro to re-run the tests. label Jun 30, 2026
@yoshi-kokoroyoshi-kokoro removed kokoro:run Add this label to force Kokoro to re-run the tests. kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Jun 30, 2026
blakeli0
blakeli0 reviewed Jun 30, 2026
View reviewed changes
Comment threadjava-bigquery-jdbc/pom.xml Outdated
blakeli0
blakeli0 approved these changes Jun 30, 2026
View reviewed changes

@blakeli0blakeli0 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind updating the PR description regarding the high level changes?

@jinseopkim0
chore(java-cloud-bom): migrate java-cloud-bom into monorepo
826f6d9
@jinseopkim0
chore: explicitly build java-core in pre-install to fix dependency re…
5c038fe
…solution
@jinseopkim0
chore: align third-party dependencies in sdk-platform-java to prevent…
1151440
… BOM downgrade errors
@jinseopkim0
test: increase sleep time in ConnectionWorkerPoolTest to reduce flaki…
a1e8db1
…ness
@jinseopkim0
chore(java-cloud-bom): use requireUpperBoundDeps enforcer rule and re…
1085f35
…vert slf4j-api overrides
@jinseopkim0
chore(java-cloud-bom): revert slf4j-api dependencies and exclusions a…
e9f1232
…cross bigquery modules
@jinseopkim0
chore(java-cloud-bom): manage slf4j-api version in dependency-converg…
40f0354
…ence test POM
@jinseopkim0
chore(java-cloud-bom): explicitly install java-core submodules in pre…
9499a55
…-install
@jinseopkim0
chore(java-cloud-bom): revert libraries-bom and sdk-platform-java con…
b9a28e8
…figuration changes
@jinseopkim0
chore: remove unnecessary empty lines to clean up PR diff
424c984
@jinseopkim0
remove empty line
3d84796
@jinseopkim0
remove empty lines 2
ac4eac3
@jinseopkim0
fix(spanner): remove explicit tink version to resolve dependency conv…
f51c202
…ergence conflict
@jinseopkim0
jinseopkim0force-pushed the migrate-java-cloud-bom branch from 23f8b72 to f51c202CompareJune 30, 2026 19:59
@jinseopkim0
jinseopkim0 enabled auto-merge (squash) June 30, 2026 20:50
@jinseopkim0
jinseopkim0 merged commit 1309124 into mainJun 30, 2026
218 of 219 checks passed
@jinseopkim0
jinseopkim0 deleted the migrate-java-cloud-bom branch June 30, 2026 20:52
This was referenced Jul 1, 2026
Closed
Closed
Merged
zhumin8 added a commit to googleapis/librarian that referenced this pull request Jul 1, 2026
@zhumin8
fix(internal/librarian/java): exclude google-cloud-bom and libraries-…
b8e50a5
…bom when generating gapic-libraries-bom/pom.xml (#6601)
Exclude google-cloud-bom and libraries-bom when generating
gapic-libraries-bom/pom.xml. This is needed because
googleapis/google-cloud-java#13498 added new
modules, among them are these two BOMs.
Fixes#6600
For googleapis/google-cloud-java#13609
@zhumin8zhumin8 mentioned this pull request Jul 1, 2026
Open
@suztomosuztomo mentioned this pull request Jul 24, 2026
Merged
jinseopkim0 pushed a commit that referenced this pull request Jul 27, 2026
@suztomo
fix: fix java-cloud-bom README update workflow after monorepo migrati…
5b8e295
…on (#13892)
Fixes b/537369259
### Context
After the monorepo migration (PR #13498), the `java-cloud-bom`
repository was moved into the `java-cloud-bom/` subdirectory. The GitHub
Actions workflow
`.github/workflows/java-cloud-bom-update-readme-table.yaml` was copied
over from the split repository without updating its paths or filter
triggers.
### Root Causes
1. **Path-Filter Always Skips on Release Events:** On a `release` event,
`dorny/paths-filter` compares the release tag commit against `main`.
Since release commits are already merged to `main` prior to tagging, the
diff is empty, causing `dorny/paths-filter` to evaluate to `false` and
skip the `update-readme` job.
2. **Missing Working Directory:** The workflow attempted to run `python
libraries-bom-table-generation/updateREADMETable.py` from the repository
root, but both the script and target `README.md` are located within the
`java-cloud-bom/` subdirectory.
### Fix
- **Removed redundant `filter` job:** Replaced it with a direct job
condition:
```yaml
if: ${{ github.event_name == 'workflow_dispatch' ||
startsWith(github.event.release.tag_name, 'libraries-bom/') }}
```
This matches the release tag pattern (`libraries-bom/v*`) used by
`create_additional_release_tag.yaml` and
`java-cloud-bom-release-note-generation.yaml`.
- **Configured Working Directory:** Added
`defaults.run.working-directory: java-cloud-bom` to the `update-readme`
job so all steps execute inside `java-cloud-bom/`.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakeli0blakeli0blakeli0 approved these changes
+1 more reviewer
@gemini-code-assistgemini-code-assist[bot]gemini-code-assist[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jinseopkim0@blakeli0@yoshi-kokoro