From 798d0b3e94ec10376832d1559b8334743ad96290 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 10 Apr 2026 08:13:28 -0400 Subject: [PATCH 1/3] fix(hermetic-build): use regex to prevent overwrite of Version.java --- .../library_generation/templates/owlbot.yaml.monorepo.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 b/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 index 37096be0ee56..55683bd64e08 100644 --- a/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 +++ b/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 @@ -21,7 +21,7 @@ deep-remove-regex: deep-preserve-regex: - "/{{ module_name }}/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" -- "/{{ module_name }}/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" +- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" deep-copy-regex: - source: "/{{ proto_path }}/(v.*)/.*-java/proto-google-.*/src" From 00fd7b7d36d7e5a95d3b190e972bfbeedb544ab9 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 10 Apr 2026 08:19:49 -0400 Subject: [PATCH 2/3] test: update golden --- .../tests/resources/goldens/.OwlBot-hermetic-golden.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml index 5aa364f72c33..907d8a51e396 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml @@ -21,7 +21,7 @@ deep-remove-regex: deep-preserve-regex: - "/java-bare-metal-solution/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" -- "/java-bare-metal-solution/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" +- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" deep-copy-regex: - source: "/google/cloud/baremetalsolution/(v.*)/.*-java/proto-google-.*/src" From 615591d2f76ed8b6a06abb90ea6da743c710db97 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 10 Apr 2026 11:58:27 -0400 Subject: [PATCH 3/3] chore: update template to latest --- .../library_generation/templates/owlbot.yaml.monorepo.j2 | 2 +- .../tests/resources/goldens/.OwlBot-hermetic-golden.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 b/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 index 55683bd64e08..0a67338e14a0 100644 --- a/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 +++ b/sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2 @@ -21,7 +21,7 @@ deep-remove-regex: deep-preserve-regex: - "/{{ module_name }}/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" -- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" +- "/.*google-.*/src/main/java/com/google/[^/]+/.*/v.*/stub/Version.java" deep-copy-regex: - source: "/{{ proto_path }}/(v.*)/.*-java/proto-google-.*/src" diff --git a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml index 907d8a51e396..b5d87a643212 100644 --- a/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml +++ b/sdk-platform-java/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml @@ -21,7 +21,7 @@ deep-remove-regex: deep-preserve-regex: - "/java-bare-metal-solution/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" -- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java" +- "/.*google-.*/src/main/java/com/google/[^/]+/.*/v.*/stub/Version.java" deep-copy-regex: - source: "/google/cloud/baremetalsolution/(v.*)/.*-java/proto-google-.*/src"