From e6e6490a4c415446dc3bcd6a2d2a8b8996976005 Mon Sep 17 00:00:00 2001 From: Raghavendra Maddikery Date: Thu, 22 Jan 2026 14:53:14 +0100 Subject: [PATCH 1/5] Removes deprecated feature flag in mw/log --- .bazelrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index a3426dda..3f3dbbaa 100644 --- a/.bazelrc +++ b/.bazelrc @@ -26,7 +26,6 @@ build --java_runtime_version=remotejdk_17 build --tool_java_runtime_version=remotejdk_17 build --@score_baselibs//score/json:base_library=nlohmann -build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False # Clippy linting (enabled by default) build --aspects=@score_rust_policies//clippy:linters.bzl%clippy_strict From 7e14ecb2ed7fa41b5a35f8fd621e9d39018228f9 Mon Sep 17 00:00:00 2001 From: Raghavendra Maddikery Date: Thu, 22 Jan 2026 14:54:08 +0100 Subject: [PATCH 2/5] Fix mw/log target deps while importing logging - library targets should depend on the log frontend to limit lib dep footprint. - while test targets need to proivide concrete backends. For unit tests a lightweight console recorder with console logging backend is sufficient. - for a binary target a log target that includes all backends is ideal. --- MODULE.bazel | 21 ++++++++++++++++++- src/cpp/src/BUILD | 2 +- src/cpp/tests/BUILD | 2 ++ tests/test_scenarios/cpp/BUILD | 1 + .../test_scenarios/cpp/src/cit/snapshots.cpp | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 289d2438..cd813640 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -77,7 +77,26 @@ bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True) bazel_dep(name = "platforms", version = "1.0.0") ## S-CORE bazel registry -bazel_dep(name = "score_baselibs", version = "0.1.2") +bazel_dep(name = "score_baselibs", version = "0.1.3") +git_override( + module_name = "score_baselibs", + commit = "99d49637a2199f33a71edc479d39970e3bdcb271", + remote = "https://github.com/eclipse-score/baselibs.git", +) +bazel_dep(name = "score_logging", version = "0.0.3") +git_override( + module_name = "score_logging", + commit = "2b3e56cf12cf582d0c0a235cad3d1d9b9fc1e494", # latest main + remote = "https://github.com/eclipse-score/logging.git", +) + +# TRLC required transitively via: score_logging -> score_communication -> trlc +bazel_dep(name = "trlc", version = "0.0.0") +git_override( + module_name = "trlc", + commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release + remote = "https://github.com/bmw-software-engineering/trlc.git", +) bazel_dep(name = "score_bazel_platforms", version = "0.0.4") bazel_dep(name = "score_docs_as_code", version = "3.0.0", dev_dependency = True) diff --git a/src/cpp/src/BUILD b/src/cpp/src/BUILD index a3a80744..30e8dea8 100644 --- a/src/cpp/src/BUILD +++ b/src/cpp/src/BUILD @@ -49,7 +49,7 @@ cc_library( "//src/cpp/src/internal:error", "@score_baselibs//score/filesystem", "@score_baselibs//score/json", - "@score_baselibs//score/mw/log", + "@score_baselibs//score/mw/log:frontend", "@score_baselibs//score/result", ], ) diff --git a/src/cpp/tests/BUILD b/src/cpp/tests/BUILD index 801697ff..5718ea5b 100644 --- a/src/cpp/tests/BUILD +++ b/src/cpp/tests/BUILD @@ -31,6 +31,7 @@ cc_test( "@score_baselibs//score/filesystem:mock", "@score_baselibs//score/json:mock", "@score_baselibs//score/result", + "@score_baselibs//score/mw/log:backend_stub_testutil", ], ) @@ -48,5 +49,6 @@ cc_test( "@score_baselibs//score/filesystem", "@score_baselibs//score/json", "@score_baselibs//score/result", + "@score_baselibs//score/mw/log:backend_stub_testutil", ], ) diff --git a/tests/test_scenarios/cpp/BUILD b/tests/test_scenarios/cpp/BUILD index 586514b9..25d5109a 100644 --- a/tests/test_scenarios/cpp/BUILD +++ b/tests/test_scenarios/cpp/BUILD @@ -27,6 +27,7 @@ cc_binary( visibility = ["//visibility:public"], deps = [ "//src/cpp/src:kvs_cpp", + "@score_logging//score/mw/log", "@score_test_scenarios//test_scenarios_cpp", ], ) diff --git a/tests/test_scenarios/cpp/src/cit/snapshots.cpp b/tests/test_scenarios/cpp/src/cit/snapshots.cpp index c941602b..ca296f43 100644 --- a/tests/test_scenarios/cpp/src/cit/snapshots.cpp +++ b/tests/test_scenarios/cpp/src/cit/snapshots.cpp @@ -143,7 +143,7 @@ class SnapshotMaxCount : public Scenario void run(const std::string& input) const final { auto obj{get_object(input)}; - auto count{get_field(obj, "count")}; + [[maybe_unused]] auto count{get_field(obj, "count")}; auto params{KvsParameters::from_json(input)}; auto kvs{kvs_instance(params)}; From ea410637e08ede00f7609e026c06e329f50d79f2 Mon Sep 17 00:00:00 2001 From: Raghavendra Maddikery Date: Tue, 10 Feb 2026 16:40:47 +0100 Subject: [PATCH 3/5] Fix: Use v1.10.2 for aspect_rules_lint - v2.0.0 is not compatible with bazel v8 and earlier - Issue filed: github.com/aspect-build/rules_lint/issues/759 --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index cd813640..8d59824b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -107,7 +107,7 @@ bazel_dep(name = "score_python_basics", version = "0.3.4") bazel_dep(name = "score_tooling", version = "1.1.0") # ToDo: implicit dependencies for score_tooling, but needed directly here?? -bazel_dep(name = "aspect_rules_lint", version = "2.0.0") +bazel_dep(name = "aspect_rules_lint", version = "1.10.2") bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") ## temporary overrides / tools From eede0ab03dd74162f94c3e2710bafaa352840d8f Mon Sep 17 00:00:00 2001 From: rmaddikery Date: Wed, 11 Feb 2026 13:17:44 +0100 Subject: [PATCH 4/5] Fixes starlark buildifier formatting --- MODULE.bazel | 1 + src/cpp/tests/BUILD | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8d59824b..7f6a939d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -83,6 +83,7 @@ git_override( commit = "99d49637a2199f33a71edc479d39970e3bdcb271", remote = "https://github.com/eclipse-score/baselibs.git", ) + bazel_dep(name = "score_logging", version = "0.0.3") git_override( module_name = "score_logging", diff --git a/src/cpp/tests/BUILD b/src/cpp/tests/BUILD index 5718ea5b..2f3e5d1f 100644 --- a/src/cpp/tests/BUILD +++ b/src/cpp/tests/BUILD @@ -30,8 +30,8 @@ cc_test( "@score_baselibs//score/filesystem", "@score_baselibs//score/filesystem:mock", "@score_baselibs//score/json:mock", - "@score_baselibs//score/result", "@score_baselibs//score/mw/log:backend_stub_testutil", + "@score_baselibs//score/result", ], ) @@ -48,7 +48,7 @@ cc_test( "@google_benchmark//:benchmark", "@score_baselibs//score/filesystem", "@score_baselibs//score/json", - "@score_baselibs//score/result", "@score_baselibs//score/mw/log:backend_stub_testutil", + "@score_baselibs//score/result", ], ) From c26079f5de71ae6dbf55a78b6e409ed2aaaec29f Mon Sep 17 00:00:00 2001 From: rmaddikery Date: Wed, 11 Feb 2026 13:51:52 +0100 Subject: [PATCH 5/5] Fixes documentation generation for score_process dep --- MODULE.bazel | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index 7f6a939d..f1028cf8 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -98,9 +98,16 @@ git_override( commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release remote = "https://github.com/bmw-software-engineering/trlc.git", ) + bazel_dep(name = "score_bazel_platforms", version = "0.0.4") +# Override score_docs_as_code to resolve compatibility level conflicts between dependencies bazel_dep(name = "score_docs_as_code", version = "3.0.0", dev_dependency = True) +single_version_override( + module_name = "score_docs_as_code", + version = "3.0.0", +) + bazel_dep(name = "score_platform", version = "0.5.3", dev_dependency = True) bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)