diff --git a/.bazelrc b/.bazelrc index 00cae52c0a4..9fb6375866a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -22,7 +22,7 @@ build --tool_java_runtime_version=remotejdk_17 build:_common --@score_baselibs//score/json:base_library=nlohmann build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False -build:_common --@score_baselibs//src/log:safety_level=qm +build:_common --@score_baselibs//score/log_rust:safety_level=qm build:_common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation build:_common --cxxopt=-Wno-error=mismatched-new-delete build:_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix @@ -94,7 +94,7 @@ build:ferrocene-coverage --remote_download_all # Persistency specific flags build:ferrocene-coverage-per --config=ferrocene-coverage -build:ferrocene-coverage-per --@score_baselibs//src/log:safety_level=qm +build:ferrocene-coverage-per --@score_baselibs//score/log_rust:safety_level=qm build:ferrocene-coverage-per --@score_baselibs//score/json:base_library=nlohmann build:ferrocene-coverage-per --@score_logging//score/mw/log/flags:KRemote_Logging=False diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 345f5061d98..2ca8f4a4a3c 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -274,6 +274,7 @@ "https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel": "99b8771e8c7cacb130170fed2a10c9e8fed26334a93e73b42d2953250885a158", "https://bcr.bazel.build/modules/grpc-java/1.66.0/MODULE.bazel": "86ff26209fac846adb89db11f3714b3dc0090fb2fb81575673cc74880cda4e7e", "https://bcr.bazel.build/modules/grpc-java/1.69.0/MODULE.bazel": "53887af6a00b3b406d70175d3d07e84ea9362016ff55ea90b9185f0227bfaf98", + "https://bcr.bazel.build/modules/grpc-java/1.70.0/MODULE.bazel": "cae8776b751f03c7984f651b00f604c297d7e759f1ce97da8fbf2fc7ce6cd226", "https://bcr.bazel.build/modules/grpc-java/1.75.0.bcr.1/MODULE.bazel": "ba818f142b40cc7fb82fbdc8a9f7475b6783cd7849f9a71da814bacaf0acfd74", "https://bcr.bazel.build/modules/grpc-java/1.78.0/MODULE.bazel": "48f790fbb95625245295df1283e0dba344a4e30b4a9a9cefbabfa92bd84f3691", "https://bcr.bazel.build/modules/grpc-java/1.78.0/source.json": "36c3a83c5ddeb864d7a4b97801456c464077f80a8216354ac1a71f7ce8699771", @@ -384,6 +385,8 @@ "https://bcr.bazel.build/modules/rules_buf/0.1.1/MODULE.bazel": "6189aec18a4f7caff599ad41b851ab7645d4f1e114aa6431acf9b0666eb92162", "https://bcr.bazel.build/modules/rules_buf/0.5.2/MODULE.bazel": "5f2492d284ab9bedf2668178303abf5f3cd7d8cdf85d768951008e88456e9c6a", "https://bcr.bazel.build/modules/rules_buf/0.5.2/source.json": "41876d4834c0832de4b393de6e55dfd1cb3b25d3109e4ba90eb7fb57c560e0d9", + "https://bcr.bazel.build/modules/rules_build_error/0.11.0/MODULE.bazel": "8a38981f82bb55ac4592a1bd14b0510deff7c7851b68b4ebc1ca2012e2aad427", + "https://bcr.bazel.build/modules/rules_build_error/0.11.0/source.json": "aa91cf45d69d0f6068fd20612a028e978ae2a195ee556a4fa87c7086b8c2dfdf", "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", @@ -780,6 +783,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.62.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.66.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.69.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.70.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.75.0.bcr.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.78.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-proto/0.0.0-20240627-ec30f58/MODULE.bazel": "not found", @@ -864,6 +868,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_apple/3.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_buf/0.1.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_buf/0.5.2/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_build_error/0.11.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.0.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.0.10/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.0.13/MODULE.bazel": "not found", @@ -1008,8 +1013,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.9/MODULE.bazel": "2f95cc2e07c5ed9df69e6af35a98843235ce43a96d0aef8c55398ebe6813b58a", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.9/source.json": "b94fa0e611e51d35c4742e2e49e6ee09750d68d79dc61b6028e758f08f58f849", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.10/MODULE.bazel": "eef4a41f8f8b6d5cf55c1445b340a2e8643a8dc83ad9ff52d0d26fe9a77973ec", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.10/source.json": "543286fb4828ff58404a0ddd034cac3e7937657353997119a3976dbaf913f2cf", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/MODULE.bazel": "5f14457f9b708302db05b5dc3c07bd41ae19b91cabf98a0dbffdca622bd6ac91", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/source.json": "2946be24c6b978aa788c934643aa7ec68aac4a926bea4eaa81d512fd48e9f4a8", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 86ba1857320..b528a883f17 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -21,13 +21,13 @@ single_version_override( patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", ], - version = "0.2.9", + version = "0.2.10", ) bazel_dep(name = "score_communication") git_override( module_name = "score_communication", - commit = "0e0640998096049a8dd65a4173b03a988d5a85a7", + commit = "57907535965108fe0799159d347fa4f79b863b76", patch_strip = 1, patches = [ "//patches/communication:001-expose-comm-examples.patch", @@ -64,7 +64,7 @@ git_override( bazel_dep(name = "score_lifecycle_health") git_override( module_name = "score_lifecycle_health", - commit = "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714", + commit = "7fb5140d39aca047a01880b4aa0a8ddd16d73f0f", remote = "https://github.com/eclipse-score/lifecycle.git", ) @@ -86,3 +86,10 @@ git_override( commit = "414d4ce4d984e461db8153c95eceb9d5a2020f57", remote = "https://github.com/eclipse-score/time.git", ) + +bazel_dep(name = "score_config_management") +git_override( + module_name = "score_config_management", + commit = "4c353248618335ee984cec997f40e754536a1598", + remote = "https://github.com/eclipse-score/config_management.git", +) diff --git a/known_good.json b/known_good.json index 708b6bfdcbd..292ce37c4a3 100644 --- a/known_good.json +++ b/known_good.json @@ -3,7 +3,7 @@ "target_sw": { "score_baselibs": { "repo": "https://github.com/eclipse-score/baselibs.git", - "version": "0.2.9", + "version": "0.2.10", "bazel_patches": [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch" ], @@ -16,8 +16,7 @@ "//score/language/safecpp/aborts_upon_exception:abortsuponexception_toolchain_test", "//score/containers:dynamic_array_test", "//score/mw/log/configuration:*", - "//score/json/examples:*", - "//score/flatbuffers/examples/config_usecase:demo_app" + "//score/json/examples:*" ], "langs": [ "cpp" @@ -26,7 +25,7 @@ }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", - "hash": "0e0640998096049a8dd65a4173b03a988d5a85a7", + "hash": "57907535965108fe0799159d347fa4f79b863b76", "bazel_patches": [ "//patches/communication:001-expose-comm-examples.patch", "//patches/communication:003-module-deps-visibility.patch" @@ -52,7 +51,7 @@ ], "metadata": { "extra_test_config": [ - "@score_baselibs//src/log:safety_level=qm", + "@score_baselibs//score/log_rust:safety_level=qm", "@score_baselibs//score/json:base_library=nlohmann", "@score_logging//score/mw/log/flags:KRemote_Logging=False" ], @@ -85,7 +84,7 @@ }, "score_lifecycle_health": { "repo": "https://github.com/eclipse-score/lifecycle.git", - "hash": "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714", + "hash": "7fb5140d39aca047a01880b4aa0a8ddd16d73f0f", "bazel_patches": [], "metadata": { "code_root_path": "//score/...", @@ -126,6 +125,20 @@ "cpp" ] } + }, + "score_config_management": { + "repo": "https://github.com/eclipse-score/config_management.git", + "hash": "4c353248618335ee984cec997f40e754536a1598", + "bazel_patches": [], + "metadata": { + "code_root_path": "//score/config_management/...", + "langs": [ + "cpp" + ], + "exclude_test_targets": [ + "//score/config_management/config_provider:component_tests" + ] + } } }, "tooling": { diff --git a/patches/communication/001-expose-comm-examples.patch b/patches/communication/001-expose-comm-examples.patch index 1692f66482d..ecebc074055 100644 --- a/patches/communication/001-expose-comm-examples.patch +++ b/patches/communication/001-expose-comm-examples.patch @@ -1,8 +1,16 @@ diff --git a/score/mw/com/example/com-api-example/BUILD b/score/mw/com/example/com-api-example/BUILD -index 91bfb109..b72591ca 100644 +index 10e02502..a4273bf8 100644 --- a/score/mw/com/example/com-api-example/BUILD +++ b/score/mw/com/example/com-api-example/BUILD -@@ -37,3 +37,7 @@ rust_test( +@@ -40,6 +40,7 @@ + "MW_LOG_CONFIG_FILE": "score/mw/com/example/com-api-example/etc/logging.json", + }, + features = ["link_std_cpp_lib"], ++ visibility = ["//visibility:public"], + deps = [ + ":com-api-example-lib", + "//score/mw/com/example/com-api-example/com-api-gen", +@@ -65,3 +66,7 @@ rust_test( "@score_communication_crate_index//:tokio", ], ) diff --git a/patches/communication/003-module-deps-visibility.patch b/patches/communication/003-module-deps-visibility.patch index f157b11d0be..6151474194e 100644 --- a/patches/communication/003-module-deps-visibility.patch +++ b/patches/communication/003-module-deps-visibility.patch @@ -1,13 +1,19 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 5b4a75cd..5b4b7e17 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -369,7 +369,6 @@ git_override( +@@ -382,7 +382,7 @@ + bazel_dep(name = "aspect_rules_lint", version = "2.5.0", dev_dependency = True) + bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True) +-bazel_dep(name = "rules_build_error", version = "0.11.0", dev_dependency = True) ++bazel_dep(name = "rules_build_error", version = "0.11.0") + bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) + bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True) + bazel_dep(name = "hedron_compile_commands", dev_dependency = True) + git_override( +@@ -394,7 +394,6 @@ download_archive( name = "json_schema_validator", build = "//third_party/json_schema_validator:json_schema_validator.BUILD", - dev_dependency = True, + integrity = "sha256-g/YdgRL0heDT8ectUWELo5JLF5kmqDdq7zwDh3D68gI=", strip_prefix = "json-schema-validator-2.1.0", urls = ["https://github.com/pboettch/json-schema-validator/archive/refs/tags/2.1.0.tar.gz"], - ) - diff --git a/patches/config_management/BUILD b/patches/config_management/BUILD new file mode 100644 index 00000000000..e69de29bb2d