diff --git a/doc/config-schema.md b/doc/config-schema.md index 351c8d34076..6be8634d423 100644 --- a/doc/config-schema.md +++ b/doc/config-schema.md @@ -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. | diff --git a/internal/config/language.go b/internal/config/language.go index 7a2d803cdba..be5a0f3f634 100644 --- a/internal/config/language.go +++ b/internal/config/language.go @@ -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 diff --git a/internal/librarian/java/generate.go b/internal/librarian/java/generate.go index 26972398e5c..9faf88c071f 100644 --- a/internal/librarian/java/generate.go +++ b/internal/librarian/java/generate.go @@ -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 } diff --git a/internal/librarian/java/postprocess.go b/internal/librarian/java/postprocess.go index 1c396a6d37a..bfeb28715dc 100644 --- a/internal/librarian/java/postprocess.go +++ b/internal/librarian/java/postprocess.go @@ -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 } diff --git a/internal/librarian/library.go b/internal/librarian/library.go index d3304620711..6cc0021f77b 100644 --- a/internal/librarian/library.go +++ b/internal/librarian/library.go @@ -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 } diff --git a/internal/librarian/library_test.go b/internal/librarian/library_test.go index 464e97654d4..d052702b83c 100644 --- a/internal/librarian/library_test.go +++ b/internal/librarian/library_test.go @@ -1262,7 +1262,6 @@ func TestMergeJava(t *testing.T) { ExtraVersionedModules: "extra", GroupID: "com.new", IssueTrackerOverride: "issue", - LibrariesBOMVersion: "bom", LibraryTypeOverride: "type", MinJavaVersion: 11, NamePrettyOverride: "pretty", @@ -1288,7 +1287,6 @@ func TestMergeJava(t *testing.T) { ExtraVersionedModules: "extra", GroupID: "com.new", IssueTrackerOverride: "issue", - LibrariesBOMVersion: "bom", LibraryTypeOverride: "type", MinJavaVersion: 11, NamePrettyOverride: "pretty",