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",
 )
@@ -68,13 +69,21 @@ 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",
 )
 
 bazel_dep(name = "score_logging")
 git_override(
     module_name = "score_logging",
     commit = "b4f272b0a036d46fc7ff2e9a051fdec95fd23b4f",
+    patch_strip = 1,
+    patches = [
+        "//patches/logging:001-migrate-baselibs-targets.patch",
+    ],
     remote = "https://github.com/eclipse-score/logging.git",
 )
 
@@ -96,6 +105,7 @@ git_override(
     patch_strip = 1,
     patches = [
         "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch",
+        "//patches/config_management:002-migrate-baselibs-targets.patch",
     ],
     remote = "https://github.com/eclipse-score/config_management.git",
 )

docs/verification_report/modules/index.rst

@@ -19,7 +19,7 @@ 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>`
 * :doc:`Logging </modules/score_logging/verification_report/module_verification_report>`
 
@@ -31,5 +31,5 @@ in this repository.
    :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/...",
@@ -105,6 +100,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": [],
@@ -116,7 +114,9 @@
             },
             "score_logging": {
                 "repo": "https://github.com/eclipse-score/logging.git",
-                "bazel_patches": [],
+                "bazel_patches": [
+                    "//patches/logging:001-migrate-baselibs-targets.patch"
+                ],
                 "metadata": {
                     "code_root_path": "//score/mw/log/...",
                     "extra_test_config": [
@@ -152,7 +152,8 @@
                 "docs": false,
                 "hash": "e0489b190ed6d2fa183b9a8063e2dba4f6378505",
                 "bazel_patches": [
-                    "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch"
+                    "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch",
+                    "//patches/config_management:002-migrate-baselibs-targets.patch"
                 ],
                 "metadata": {
                     "code_root_path": "//score/config_management/...",
@@ -171,10 +172,7 @@
                         "cpp"
                     ],
                     "rust_coverage_config": "ferrocene-coverage"
-                },
-                "bazel_patches": [
-                    "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch"
-                ]
+                }
             }
         },
         "tooling": {

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/config_management/002-migrate-baselibs-targets.patch

@@ -0,0 +1,26 @@
+diff --git a/score/config_management/config_provider/code/config_provider/details/BUILD b/score/config_management/config_provider/code/config_provider/details/BUILD
+index 937b056..9a71294 100644
+--- a/score/config_management/config_provider/code/config_provider/details/BUILD
++++ b/score/config_management/config_provider/code/config_provider/details/BUILD
+@@ -21,6 +21,7 @@ cc_library(
+         "@score_baselibs//score/concurrency:condition_variable",
+         "@score_baselibs//score/concurrency/future",
+         "@score_baselibs//score/language/futurecpp",
++        "@score_baselibs//score/string_manipulation:string_comparison_adaptor",
+         "@score_communication//score/mw/service:proxy_data",
+         "@score_logging//score/mw/log",
+     ],
+diff --git a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h b/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h
+index 7630e60..596a8e6 100644
+--- a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h
++++ b/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h
+@@ -19,8 +19,8 @@
+ #include "score/config_management/config_provider/code/persistency/persistency.h"
+ #include "score/config_management/config_provider/code/proxies/internal_config_provider.h"
+
+-#include "score/memory/string_comparison_adaptor.h"
+ #include "score/mw/log/logger.h"
++#include "score/string_manipulation/string_comparison_adaptor.h"
+
+ #include "score/concurrency/condition_variable.h"
+ #include "score/mw/service/proxy_data.h"