From 3d35f52edfd9c3fe1323f22efd600a92f7bc945e Mon Sep 17 00:00:00 2001 From: Piotr Korkus Date: Fri, 10 Jul 2026 10:56:38 +0200 Subject: [PATCH] Update docs as code ensure valid_from is update in other modules --- MODULE.bazel.lock | 4 ++-- bazel_common/score_modules_target_sw.MODULE.bazel | 4 ++-- bazel_common/score_modules_tooling.MODULE.bazel | 4 ++-- known_good.json | 11 ++++++----- .../001-restore-remote-backend-in-datarouter.patch | 14 -------------- .../002-needs-json-deps-not-dev-dependency.patch | 11 +++++++---- .../003-docs-as-code-not-dev-dependency.patch | 12 ++++++++++++ 7 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 patches/logging/001-restore-remote-backend-in-datarouter.patch create mode 100644 patches/logging/003-docs-as-code-not-dev-dependency.patch diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index d20089bf64e..56c0ec56333 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1022,8 +1022,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_cr_checker/0.3.1/source.json": "ad038d99c0e2a59cca3a7fa1aac6d87cd0d752314b65b52a91451ab0bd0f7171", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_dash_license_checker/0.1.2/MODULE.bazel": "89ba8c942dfd8d05cbf59b48868c919207aa189c670f97194078d5b8e09c6a8a", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_dash_license_checker/0.1.2/source.json": "f327a8103a33b0668c5cb35a4e68593c5ead8c946abab347b4a09481aaf28465", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.7.0/MODULE.bazel": "f9a5971fbd05f0ed14e7a373dbf58af72a5c58d081537a75c314daaf61c92ae9", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.7.0/source.json": "a3f55522fd9f63fae7a92f3cb5f91c25ae7474a39e9f9c633f0cf797fc0ca8e5", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/source.json": "ef316fad71fdbd53daf43fc0a82fbc7c293908a2712214ff79134c177d028024", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_format_checker/0.1.1/MODULE.bazel": "1acc254faa90e9f97b79ac69af25b6c21c561f8d6079914f6352b9b20d26bd37", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_format_checker/0.1.1/source.json": "e3d10be878d1a007967b75a5c6d9c3ec3d47c320685904b7f31c689b3cbcdb3a", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 12176080861..9f55b32aee1 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -75,11 +75,11 @@ git_override( bazel_dep(name = "score_logging") git_override( module_name = "score_logging", - commit = "6c855d97e6004034ebe6e947770824dfb9358ca8", + commit = "6282f3a2ec6b1eeeab87c8e9a4435c586bcf9973", patch_strip = 1, patches = [ - "//patches/logging:001-restore-remote-backend-in-datarouter.patch", "//patches/logging:002-needs-json-deps-not-dev-dependency.patch", + "//patches/logging:003-docs-as-code-not-dev-dependency.patch", ], remote = "https://github.com/eclipse-score/logging.git", ) diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 8ac792fdda8..f55417054c0 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -38,7 +38,7 @@ git_override( bazel_dep(name = "score_platform") git_override( module_name = "score_platform", - commit = "80e96e9dbf01a5d2df4398cec4d6606ca0535603", + commit = "24ec6f276cd37755b5dae7f2345913628d56831f", remote = "https://github.com/eclipse-score/score.git", ) @@ -59,7 +59,7 @@ git_override( bazel_dep(name = "score_docs_as_code") git_override( module_name = "score_docs_as_code", - commit = "8d28586a12daa57c29d9b0a3b0b532246b59ea64", + commit = "f1f20f0579ab5e63513561db0ab055cbec46c987", remote = "https://github.com/eclipse-score/docs-as-code.git", ) diff --git a/known_good.json b/known_good.json index e7279ab5806..5bed03af72b 100644 --- a/known_good.json +++ b/known_good.json @@ -99,10 +99,11 @@ }, "score_logging": { "repo": "https://github.com/eclipse-score/logging.git", - "hash": "6c855d97e6004034ebe6e947770824dfb9358ca8", + "hash": "6282f3a2ec6b1eeeab87c8e9a4435c586bcf9973", "bazel_patches": [ - "//patches/logging:001-restore-remote-backend-in-datarouter.patch", - "//patches/logging:002-needs-json-deps-not-dev-dependency.patch" + "//patches/logging:002-needs-json-deps-not-dev-dependency.patch", + "//patches/logging:003-docs-as-code-not-dev-dependency.patch" + ], "metadata": { "code_root_path": "//score/mw/log/...", @@ -144,7 +145,7 @@ }, "score_platform": { "repo": "https://github.com/eclipse-score/score.git", - "hash": "80e96e9dbf01a5d2df4398cec4d6606ca0535603" + "hash": "24ec6f276cd37755b5dae7f2345913628d56831f" }, "score_bazel_platforms": { "repo": "https://github.com/eclipse-score/bazel_platforms.git", @@ -156,7 +157,7 @@ }, "score_docs_as_code": { "repo": "https://github.com/eclipse-score/docs-as-code.git", - "hash": "8d28586a12daa57c29d9b0a3b0b532246b59ea64" + "hash": "f1f20f0579ab5e63513561db0ab055cbec46c987" }, "score_process": { "repo": "https://github.com/eclipse-score/process_description.git", diff --git a/patches/logging/001-restore-remote-backend-in-datarouter.patch b/patches/logging/001-restore-remote-backend-in-datarouter.patch deleted file mode 100644 index 07a9e455229..00000000000 --- a/patches/logging/001-restore-remote-backend-in-datarouter.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/score/datarouter/BUILD b/score/datarouter/BUILD -index 8a986a39..00000000 100644 ---- a/score/datarouter/BUILD -+++ b/score/datarouter/BUILD -@@ -899,6 +899,7 @@ cc_binary( - ":datarouter_app", - "@score_baselibs//score/os:errno_logging", - "@score_baselibs//score/os:pthread", - "@score_baselibs//score/os/utils:path", - "@score_baselibs//score/mw/log", -+ "//score/mw/log/backend:remote", - # "//third_party/jemalloc", # Ticket-231781 - ], - ) diff --git a/patches/logging/002-needs-json-deps-not-dev-dependency.patch b/patches/logging/002-needs-json-deps-not-dev-dependency.patch index 33e6a2049d1..47fb6ddf593 100644 --- a/patches/logging/002-needs-json-deps-not-dev-dependency.patch +++ b/patches/logging/002-needs-json-deps-not-dev-dependency.patch @@ -1,11 +1,14 @@ diff --git a/MODULE.bazel b/MODULE.bazel --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -52,5 +52,5 @@ bazel_dep(name = "score_tooling", version = "1.1.2") +@@ -47,8 +47,8 @@ single_version_override( + bazel_dep(name = "score_rust_policies", version = "0.0.5") - + -bazel_dep(name = "score_process", version = "1.5.4", dev_dependency = True) --bazel_dep(name = "score_platform", version = "0.5.5", dev_dependency = True) +-bazel_dep(name = "score_platform", version = "0.6.0", dev_dependency = True) +bazel_dep(name = "score_process", version = "1.5.4") -+bazel_dep(name = "score_platform", version = "0.5.5") ++bazel_dep(name = "score_platform", version = "0.6.0") bazel_dep(name = "score_itf", version = "0.4.0", dev_dependency = True) + + # OCI / Docker image rules for integration tests diff --git a/patches/logging/003-docs-as-code-not-dev-dependency.patch b/patches/logging/003-docs-as-code-not-dev-dependency.patch new file mode 100644 index 00000000000..40caa15eff1 --- /dev/null +++ b/patches/logging/003-docs-as-code-not-dev-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -37,7 +37,7 @@ bazel_dep(name = "platforms", version = "1.0.0") + # S-CORE process rules + bazel_dep(name = "score_bazel_platforms", version = "0.1.2") + +-bazel_dep(name = "score_docs_as_code", version = "4.6.0", dev_dependency = True) ++bazel_dep(name = "score_docs_as_code", version = "4.6.0") + + bazel_dep(name = "score_tooling", version = "1.2.0") + single_version_override(