Skip to content

refactor(internal/config): remove deprecated libraries_bom_version from JavaModule #6584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofisl merged 5 commits into from
Jul 1, 2026
Merged

refactor(internal/config): remove deprecated libraries_bom_version from JavaModule #6584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00e597c
fix(internal/serviceconfig): normalize transport name for Java repo-m…
sofisl Jun 29, 2026
96b2663
feat: finalize the transition to JavaDefault from JavaModule
sofisl Jun 30, 2026
c0840dd
chore: update docs
sofisl Jun 30, 2026
c083edd
chore: respond to comments
sofisl Jun 30, 2026
478a553
Merge branch 'main' into finalizeDefaultJava
sofisl Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion doc/config-schema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ This document describes the schema for the librarian.yaml.
| `extra_versioned_modules` | string | Is a list of extra versioned modules. |
| `group_id` | string | Is the Maven group ID, defaults to "com.google.cloud". |
| `issue_tracker_override` | string | Allows the "issue_tracker" field in .repo-metadata.json to be overridden. |
| `libraries_bom_version` | string | Is the version of the libraries-bom to use for Java. |
| `released_version` | string | Is the last released version of the library. If omitted, it will be derived from the library version. Note: It assumes a minor bump from the previous '.0' version (e.g., '1.2.0-SNAPSHOT' -> '1.1.0') and does not support deriving previous patch releases (e.g., '1.1.1'). |
| `library_type_override` | string | Allows the "library_type" field in .repo-metadata.json to be overridden. |
| `min_java_version` | int | Is the minimum Java version required. |
Expand Down
3 changes: 0 additions & 3 deletions internal/config/language.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,6 @@ type JavaModule struct {
// to be overridden.
IssueTrackerOverride string `yaml:"issue_tracker_override,omitempty"`

// LibrariesBOMVersion is the version of the libraries-bom to use for Java.
LibrariesBOMVersion string `yaml:"libraries_bom_version,omitempty"`

// ReleasedVersion is the last released version of the library.
// If omitted, it will be derived from the library version.
// Note: It assumes a minor bump from the previous '.0' version
Expand Down
5 changes: 1 addition & 4 deletions internal/librarian/java/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,7 @@ func gapicOpt(key, value string) string {

// TODO(https://github.com/googleapis/librarian/issues/5152):
// BOM version should be required and pre-validated, remove this and inline when done.
func findBOMVersion(cfg *config.Config, library *config.Library) (string, error) {
if library != nil && library.Java != nil && library.Java.LibrariesBOMVersion != "" {
return library.Java.LibrariesBOMVersion, nil
}
func findBOMVersion(cfg *config.Config) (string, error) {
if cfg.Default != nil && cfg.Default.Java != nil && cfg.Default.Java.LibrariesBOMVersion != "" {
return cfg.Default.Java.LibrariesBOMVersion, nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/librarian/java/postprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func postProcessLibrary(ctx context.Context, params libraryPostProcessParams) er
if err := createOrVerifyOwlbotPy(params.outDir); err != nil {
return err
}
bomVersion, err := findBOMVersion(params.cfg, params.library)
bomVersion, err := findBOMVersion(params.cfg)
if err != nil {
return err
}
Expand Down
3 changes: 0 additions & 3 deletions internal/librarian/library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,6 @@ func mergeJava(dst, src *config.JavaModule) *config.JavaModule {
if src.IssueTrackerOverride != "" {
res.IssueTrackerOverride = src.IssueTrackerOverride
}
if src.LibrariesBOMVersion != "" {
res.LibrariesBOMVersion = src.LibrariesBOMVersion
}
if src.ReleasedVersion != "" {
res.ReleasedVersion = src.ReleasedVersion
}
Expand Down
2 changes: 0 additions & 2 deletions internal/librarian/library_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,6 @@ func TestMergeJava(t *testing.T) {
ExtraVersionedModules: "extra",
GroupID: "com.new",
IssueTrackerOverride: "issue",
LibrariesBOMVersion: "bom",
LibraryTypeOverride: "type",
MinJavaVersion: 11,
NamePrettyOverride: "pretty",
Expand All @@ -1288,7 +1287,6 @@ func TestMergeJava(t *testing.T) {
ExtraVersionedModules: "extra",
GroupID: "com.new",
IssueTrackerOverride: "issue",
LibrariesBOMVersion: "bom",
LibraryTypeOverride: "type",
MinJavaVersion: 11,
NamePrettyOverride: "pretty",
Expand Down
Loading