Update score_baselibs commit hash to latest version

.github/workflows/build_and_test_linux.yml

@@ -48,7 +48,7 @@ jobs:
           enable-cache: false
       - name: Build image and product SBOM
         run: |
-          bazel build --lockfile_mode=error --config=linux-x86_64 \
+          bazel build --lockfile_mode=error --config=linux-x86_64 --keep_going \
             //images/linux_x86_64:image \
             //:sbom
       - name: Integration tests

bazel_common/score_modules_target_sw.MODULE.bazel

@@ -17,12 +17,11 @@
 bazel_dep(name = "score_baselibs")
 git_override(
     module_name = "score_baselibs",
-    commit = "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7",
+    commit = "9216215f3a8468f3487884b472e1f325ef36f92b",
     patch_strip = 1,
     patches = [
         "//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
         "//patches/baselibs:002-restore-qnx8-poll-workaround.patch",
-        "//patches/baselibs:005-rename-manual-verification-report-id.patch",
         "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch",
     ],
     remote = "https://github.com/eclipse-score/baselibs.git",
@@ -37,6 +36,7 @@ git_override(
         "//patches/communication:001-expose-comm-examples.patch",
         "//patches/communication:003-module-deps-visibility.patch",
         "//patches/communication:004-rules-build-error-not-dev-dependency.patch",
+        "//patches/communication:005-migrate-baselibs-rust-targets.patch",
     ],
     remote = "https://github.com/eclipse-score/communication.git",
 )
@@ -53,6 +53,7 @@ git_override(
         "//patches/persistency:004-imagefs-not-dev-dependency.patch",
         "//patches/persistency:005-googletest-not-dev-dependency.patch",
         "//patches/persistency:006-add-module-index-title.patch",
+        "//patches/persistency:007-migrate-baselibs-rust-targets.patch",
     ],
     remote = "https://github.com/eclipse-score/persistency.git",
 )
@@ -72,6 +73,10 @@ bazel_dep(name = "score_lifecycle")
 git_override(
     module_name = "score_lifecycle",
     commit = "85da2168328d17a3cf53791ebf93534e5ed921fc",
+    patch_strip = 1,
+    patches = [
+        "//patches/lifecycle:001-migrate-baselibs-rust-targets.patch",
+    ],
     remote = "https://github.com/eclipse-score/lifecycle.git",
 )
 

docs/verification_report/modules/index.rst

@@ -19,12 +19,12 @@ This page lists the per-module verification reports, each generated from the
 respective module's own needs data using the module verification report
 template introduced by docs-as-code.
 
-* :doc:`Baselibs <baselibs/baselibs_verification_report>`
+* :doc:`Baselibs </modules/score_baselibs/verification_report/module_verification_report>`
 * :doc:`Persistency <persistency/persistency_verification_report>`
 
 .. toctree::
    :titlesonly:
    :hidden:
 
-   Baselibs <baselibs/baselibs_verification_report>
+   Baselibs </modules/score_baselibs/verification_report/module_verification_report>
    Persistency <persistency/persistency_verification_report>

known_good.json

@@ -6,7 +6,6 @@
                 "bazel_patches": [
                     "//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
                     "//patches/baselibs:002-restore-qnx8-poll-workaround.patch",
-                    "//patches/baselibs:005-rename-manual-verification-report-id.patch",
                     "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch"
                 ],
                 "metadata": {
@@ -26,7 +25,7 @@
                         "cpp"
                     ]
                 },
-                "hash": "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7"
+                "hash": "9216215f3a8468f3487884b472e1f325ef36f92b"
             },
             "score_communication": {
                 "repo": "https://github.com/eclipse-score/communication.git",
@@ -35,7 +34,8 @@
                 "bazel_patches": [
                     "//patches/communication:001-expose-comm-examples.patch",
                     "//patches/communication:003-module-deps-visibility.patch",
-                    "//patches/communication:004-rules-build-error-not-dev-dependency.patch"
+                    "//patches/communication:004-rules-build-error-not-dev-dependency.patch",
+                    "//patches/communication:005-migrate-baselibs-rust-targets.patch"
                 ],
                 "metadata": {
                     "code_root_path": "//score/mw/com/impl/...",
@@ -57,12 +57,7 @@
                         "rust"
                     ],
                     "rust_coverage_config": "ferrocene-coverage"
-                },
-                "bazel_patches": [
-                    "//patches/communication:001-expose-comm-examples.patch",
-                    "//patches/communication:003-module-deps-visibility.patch",
-                    "//patches/communication:004-rules-build-error-not-dev-dependency.patch"
-                ]
+                }
             },
             "score_persistency": {
                 "repo": "https://github.com/eclipse-score/persistency.git",
@@ -72,7 +67,8 @@
                     "//patches/persistency:003-pip-not-dev-dependency.patch",
                     "//patches/persistency:004-imagefs-not-dev-dependency.patch",
                     "//patches/persistency:005-googletest-not-dev-dependency.patch",
-                    "//patches/persistency:006-add-module-index-title.patch"
+                    "//patches/persistency:006-add-module-index-title.patch",
+                    "//patches/persistency:007-migrate-baselibs-rust-targets.patch"
                 ],
                 "metadata": {
                     "code_root_path": "//score/kvs/...",
@@ -81,7 +77,6 @@
                         "@score_baselibs//score/json:base_library=nlohmann",
                         "@score_logging//score/mw/log/flags:KRemote_Logging=False"
                     ],
-                    "code_root_path": "//score/kvs/...",
                     "exclude_test_targets": [
                         "//score/kvs/tests:bm_kvs_cpp",
                         "//score/kvs/tests/integration_test_scenarios/...",
@@ -108,6 +103,9 @@
             },
             "score_lifecycle": {
                 "repo": "https://github.com/eclipse-score/lifecycle.git",
+                "bazel_patches": [
+                    "//patches/lifecycle:001-migrate-baselibs-rust-targets.patch"
+                ],
                 "metadata": {
                     "code_root_path": "//score/...",
                     "extra_test_config": [],

patches/communication/005-migrate-baselibs-rust-targets.patch

@@ -0,0 +1,77 @@
+diff --git a/score/mw/com/example/com-api-example/BUILD b/score/mw/com/example/com-api-example/BUILD
+index 4c834d489a..41c340eb68 100644
+--- a/score/mw/com/example/com-api-example/BUILD
++++ b/score/mw/com/example/com-api-example/BUILD
+@@ -21,7 +21,7 @@ rust_library(
+     deps = [
+         "//score/mw/com/example/com-api-example/com-api-gen",
+         "//score/mw/com/rust:score_com",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+         "@score_communication_crate_index//:clap",
+         "@score_communication_crate_index//:futures",
+     ],
+@@ -42,8 +42,8 @@ rust_binary(
+         ":com-api-example-lib",
+         "//score/mw/com/example/com-api-example/com-api-gen",
+         "//score/mw/com/rust:score_com",
+-        "@score_baselibs//src/log/score_log",
+-        "@score_baselibs//src/log/stdout_logger",
++        "@score_baselibs//score/log_rust/score_log",
++        "@score_baselibs//score/log_rust/stdout_logger",
+         "@score_communication_crate_index//:clap",
+         "@score_communication_crate_index//:futures",
+     ],
+diff --git a/score/mw/com/example/com-api-example/com-api-gen/BUILD b/score/mw/com/example/com-api-example/com-api-gen/BUILD
+index 94f6c8f96e..cd8ea32df7 100644
+--- a/score/mw/com/example/com-api-example/com-api-gen/BUILD
++++ b/score/mw/com/example/com-api-example/com-api-gen/BUILD
+@@ -26,7 +26,7 @@ rust_library(
+     deps = [
+         ":vehicle_gen_cpp",
+         "//score/mw/com/rust:score_com",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+     ],
+ )
+
+diff --git a/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD b/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD
+index a988186a96..81cd80485a 100644
+--- a/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD
++++ b/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD
+@@ -68,6 +68,6 @@ rust_library(
+     deps = [
+         ":bridge_ffi_rs",
+         "//score/mw/com/impl/plumbing/rust:sample_ptr_rs",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+     ],
+ )
+diff --git a/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD b/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD
+index aa5d094e23..3e7a59418e 100644
+--- a/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD
++++ b/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD
+@@ -28,7 +28,7 @@ rust_library(
+         "//score/mw/com/impl/rust/com-api/com-api-ffi-lola:bridge_ffi_lola",
+         "//score/mw/com/impl/rust/com-api/com-api-ffi-lola:bridge_ffi_rs",
+         "//score/mw/com/rust/score_com_concept",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+         "@score_communication_crate_index//:futures",
+     ],
+ )
+diff --git a/score/mw/com/rust/score_com_concept/BUILD b/score/mw/com/rust/score_com_concept/BUILD
+index 5386e8b2ef..8f51c7e6db 100644
+--- a/score/mw/com/rust/score_com_concept/BUILD
++++ b/score/mw/com/rust/score_com_concept/BUILD
+@@ -25,8 +25,8 @@ rust_library(
+         "//score/mw/com:__subpackages__",
+     ],
+     deps = [
+-        "@score_baselibs//src/containers",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/containers_rust:containers",
++        "@score_baselibs//score/log_rust/score_log",
+         "@score_communication_crate_index//:futures",
+         "@score_communication_crate_index//:thiserror",
+     ],

patches/lifecycle/001-migrate-baselibs-rust-targets.patch

@@ -0,0 +1,92 @@
+diff --git a/examples/rust_supervised_app/BUILD b/examples/rust_supervised_app/BUILD
+index 9738ceb0b7..2dff53f79c 100644
+--- a/examples/rust_supervised_app/BUILD
++++ b/examples/rust_supervised_app/BUILD
+@@ -36,8 +36,8 @@ rust_binary(
+     deps = [
+         "//score/health_monitor:health_monitoring_rust",
+         "//score/launch_manager:lifecycle_rust",
+-        "@score_baselibs//src/log/score_log",
+-        "@score_baselibs//src/log/stdout_logger",
++        "@score_baselibs//score/log_rust/score_log",
++        "@score_baselibs//score/log_rust/stdout_logger",
+         "@score_crates//:clap",
+         "@score_crates//:libc",
+         "@score_crates//:signal_hook",
+diff --git a/score/health_monitor/src/rust/BUILD b/score/health_monitor/src/rust/BUILD
+index 44ab61c9e2..15b09001f1 100644
+--- a/score/health_monitor/src/rust/BUILD
++++ b/score/health_monitor/src/rust/BUILD
+@@ -14,14 +14,14 @@
+ load("@rules_rust//rust:defs.bzl", "miri_test", "rust_library", "rust_static_library", "rust_test")
+
+ COMMON_RUST_DEPS = [
+-    "@score_baselibs//src/containers:containers",
+-    "@score_baselibs//src/thread:thread",
+-    "@score_baselibs//src/log/score_log:score_log",
++    "@score_baselibs//score/containers_rust:containers",
++    "@score_baselibs//score/thread",
++    "@score_baselibs//score/log_rust/score_log",
+     "//score/launch_manager:alive_rust",
+ ]
+
+ PROC_MACRO_DEPS = [
+-    "@score_baselibs//src/testing_macros:score_testing_macros",
++    "@score_baselibs//score/testing_macros:score_testing_macros",
+ ]
+
+ rust_library(
+@@ -78,7 +78,7 @@ rust_test(
+         "//config:unit_host": ["@platforms//os:linux"],  # see https://github.com/eclipse-score/lifecycle/issues/272
+         "//conditions:default": ["@platforms//:incompatible"],
+     }),
+-    deps = ["@score_baselibs//src/log/stdout_logger"],
++    deps = ["@score_baselibs//score/log_rust/stdout_logger"],
+ )
+
+ rust_test(
+@@ -110,7 +110,7 @@ rust_test(
+         "//conditions:default": ["@platforms//:incompatible"],
+     }),
+     deps = [
+-        "@score_baselibs//src/log/stdout_logger",
++        "@score_baselibs//score/log_rust/stdout_logger",
+         "@score_crates//:loom",
+     ],
+ )
+diff --git a/examples/cpp_supervised_app/BUILD b/examples/cpp_supervised_app/BUILD
+index 984f359388..320e13240d 100644
+--- a/examples/cpp_supervised_app/BUILD
++++ b/examples/cpp_supervised_app/BUILD
+@@ -34,6 +34,6 @@ cc_binary(
+     deps = [
+         "//score/health_monitor:health_monitoring_cc",
+         "//score/launch_manager:lifecycle_cc",
+-        "@score_baselibs//src/log/stdout_logger_cpp_init",
++        "@score_baselibs//score/log_rust/stdout_logger_cpp_init",
+     ],
+ )
+diff --git a/score/health_monitor/src/cpp/details/BUILD b/score/health_monitor/src/cpp/details/BUILD
+index 6dbd9e45fa..7ccfa29283 100644
+--- a/score/health_monitor/src/cpp/details/BUILD
++++ b/score/health_monitor/src/cpp/details/BUILD
+@@ -19,6 +19,6 @@ cc_library(
+     visibility = ["//score/health_monitor/src/cpp:__pkg__"],
+     deps = [
+         "@googletest//:gtest",
+-        "@score_baselibs//src/log/stdout_logger_cpp_init",
++        "@score_baselibs//score/log_rust/stdout_logger_cpp_init",
+     ],
+ )
+diff --git a/tests/integration/complex_monitoring/BUILD b/tests/integration/complex_monitoring/BUILD
+index 15306f47ec..7467efa724 100644
+--- a/tests/integration/complex_monitoring/BUILD
++++ b/tests/integration/complex_monitoring/BUILD
+@@ -42,6 +42,6 @@ cc_binary(
+         "//score/launch_manager:lifecycle_cc",
+         "//tests/utils/test_helper",
+         "@googletest//:gtest_main",
+-        "@score_baselibs//src/log/stdout_logger_cpp_init",
++        "@score_baselibs//score/log_rust/stdout_logger_cpp_init",
+     ],
+ )

patches/persistency/007-migrate-baselibs-rust-targets.patch

@@ -0,0 +1,26 @@
+diff --git a/score/kvs/rust_kvs/BUILD b/score/kvs/rust_kvs/BUILD
+index 0be840f70..07c7bf1fc 100644
+--- a/score/kvs/rust_kvs/BUILD
++++ b/score/kvs/rust_kvs/BUILD
+@@ -17,7 +17,7 @@ rust_library(
+     srcs = glob(["src/**/*.rs"]),
+     visibility = ["//visibility:public"],
+     deps = [
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+         "@score_crates//:adler32",
+         "@score_crates//:tinyjson",
+     ],
+diff --git a/score/kvs/rust_kvs_tool/BUILD b/score/kvs/rust_kvs_tool/BUILD
+index 831304c5e..47c9fcbf5 100644
+--- a/score/kvs/rust_kvs_tool/BUILD
++++ b/score/kvs/rust_kvs_tool/BUILD
+@@ -27,7 +27,7 @@ rust_binary(
+     visibility = ["//visibility:public"],
+     deps = [
+         "//score/kvs/rust_kvs",
+-        "@score_baselibs//src/log/score_log",
++        "@score_baselibs//score/log_rust/score_log",
+         "@score_crates//:pico_args",
+         "@score_crates//:tinyjson",
+         "@score_logging//score/mw/log/rust/score_log_bridge",