diff --git a/src/libraries/java/nv-boot-parent/tools/bazel/BUILD.bazel b/src/libraries/java/nv-boot-parent/tools/bazel/BUILD.bazel index b8494a40f..5dca0ab32 100644 --- a/src/libraries/java/nv-boot-parent/tools/bazel/BUILD.bazel +++ b/src/libraries/java/nv-boot-parent/tools/bazel/BUILD.bazel @@ -32,7 +32,10 @@ sh_test( ":generate_notice.py", ":notice_metadata.json", "//:MODULE.bazel", - "//:NOTICE", + # nv-boot-parent's own NOTICE (its Java closure), not the aggregate root + # NOTICE which also covers the Go/Rust subtrees and can never match a + # Java-only regeneration. + "//src/libraries/java/nv-boot-parent:NOTICE", "//:maven_install.json", ":notice_roots.json", ], diff --git a/src/libraries/java/nv-boot-parent/tools/bazel/notice_check_test.sh b/src/libraries/java/nv-boot-parent/tools/bazel/notice_check_test.sh index 13033e0b0..8e8a3dc8a 100755 --- a/src/libraries/java/nv-boot-parent/tools/bazel/notice_check_test.sh +++ b/src/libraries/java/nv-boot-parent/tools/bazel/notice_check_test.sh @@ -46,8 +46,12 @@ find_workspace() { } workspace="$(find_workspace)" +# nv-boot-parent is a subtree of the monorepo, not the workspace root, so its +# notice tooling and its own NOTICE live under this prefix rather than at the +# repo root. The Maven lock, however, is the single root maven_install.json. +nvboot="${workspace}/src/libraries/java/nv-boot-parent" -PYTHONPATH="${workspace}/tools/bazel" python3 - <<'PY' +PYTHONPATH="${nvboot}/tools/bazel" python3 - <<'PY' import pathlib import tempfile import zipfile @@ -96,9 +100,9 @@ with tempfile.TemporaryDirectory() as directory: raise AssertionError("Runtime NOTICE accepted a stale lockfile version") PY -exec python3 "${workspace}/tools/bazel/generate_notice.py" \ +exec python3 "${nvboot}/tools/bazel/generate_notice.py" \ --maven-install "${workspace}/maven_install.json" \ - --metadata "${workspace}/tools/bazel/notice_metadata.json" \ - --notice "${workspace}/NOTICE" \ - --root-manifest "${workspace}/tools/bazel/notice_roots.json" \ + --metadata "${nvboot}/tools/bazel/notice_metadata.json" \ + --notice "${nvboot}/NOTICE" \ + --root-manifest "${nvboot}/tools/bazel/notice_roots.json" \ --check