Skip to content

fix: resolve Copybara build regressions in S-Core #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chahult wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: resolve Copybara build regressions in S-Core #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b5f270
fix: resolve Copybara build regressions in S-Core
May 21, 2026
34c870a
fix: apply formatting and copyright header fixes
May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build --tool_java_runtime_version=remotejdk_17
test --test_output=errors

common --@score_baselibs//score/json:base_library=nlohmann
common --@score_communication//score/mw/com/flags:tracing_library=stub
common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
common --//score/config_management/config_daemon/code:score_variant=True
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
common --registry=https://bcr.bazel.build
9 changes: 6 additions & 3 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# Copyright (c) 2025, 2026 Contributors to the Eclipse Foundation
# Copyright (c) 2025 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -67,12 +67,15 @@ bazel_dep(name = "score_docs_as_code", version = "4.0.3")

# s-core base libs
bazel_dep(name = "score_baselibs", version = "0.2.7")
git_override(
module_name = "score_baselibs",
commit = "498a4b256c9073602140243d30c33b106e279f75",
remote = "https://github.com/eclipse-score/baselibs.git",
)

# s-core communication
bazel_dep(name = "score_communication", version = "0.2.1")

bazel_dep(name = "score_logging", version = "0.2.1")

bazel_dep(name = "score_lifecycle_health", version = "0.2.0")

# s-core persistency
Expand Down
11 changes: 6 additions & 5 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion score/config_management/config_daemon/code/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ cc_test(
features = COMPILER_WARNING_FEATURES,
tags = ["unit"],
deps = [
"//score/config_management/config_daemon/code/app/details:app_for_unit_test",
"@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext_mock",
"@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock",
"//score/config_management/config_daemon/code/app/details:app_for_unit_test",
] + select({
":is_score_variant": ["//score/config_management/config_daemon/code/factory/details:mw_factory_for_unit_test"],
"//conditions:default": ["//score/config_management/config_daemon/code/factory/details:ara_factory_for_unit_test"],
Expand Down
26 changes: 13 additions & 13 deletions score/config_management/config_daemon/code/app/details/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ cc_library(
"//score/config_management/config_daemon/code:__pkg__",
],
deps = [
"@score_baselibs//score/concurrency:interruptible_wait",
"@score_baselibs//score/utils:scoped_operation",
"@score_lifecycle_health//src/lifecycle_client_lib:application",
"@score_logging//score/mw/log",
"//score/config_management/config_daemon/code/app:interface",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_manager",
"//score/config_management/config_daemon/code/data_model/details:parameterset_collection_manager_impl",
"//score/config_management/config_daemon/code/factory:interface",
"@score_baselibs//score/concurrency:interruptible_wait",
"@score_baselibs//score/utils:scoped_operation",
"@score_lifecycle_health//src/lifecycle_client_lib:application",
"@score_logging//score/mw/log",
],
)

Expand All @@ -46,14 +46,14 @@ cc_library(
"//score/config_management/config_daemon/code:__pkg__",
],
deps = [
"@score_baselibs//score/utils:scoped_operation",
"@score_lifecycle_health//src/lifecycle_client_lib:application_mock",
"@score_logging//score/mw/log",
"//score/config_management/config_daemon/code/app:interface",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_manager",
"//score/config_management/config_daemon/code/data_model/details:parameterset_collection_manager_impl",
"//score/config_management/config_daemon/code/factory:interface_for_unit_test",
"//score/config_management/config_daemon/code/fault_event_reporter",
"@score_baselibs//score/utils:scoped_operation",
"@score_lifecycle_health//src/lifecycle_client_lib:application_mock",
"@score_logging//score/mw/log",
],
)

Expand All @@ -66,22 +66,22 @@ cc_test(
features = COMPILER_WARNING_FEATURES,
tags = ["unit"],
visibility = [
"//score/config_management/config_daemon/code/app:__pkg__",
"//requirements:__pkg__",
"//score/config_management/config_daemon/code/app:__pkg__",
],
deps = [
":app_for_unit_test",
"@score_baselibs//score/os/mocklib:stat_mock",
"@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext",
"@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock",
"@score_communication//score/mw/service:factory",
"@score_communication//score/mw/service:provided_service_container",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_manager_mock",
"//score/config_management/config_daemon/code/factory:mock",
"//score/config_management/config_daemon/code/fault_event_reporter:mock",
"//score/config_management/config_daemon/code/plugins:mock",
"//score/config_management/config_daemon/code/plugins/plugin_collector:mock",
"//score/config_management/config_daemon/code/services:mock",
"@googletest//:gtest_main",
"@score_baselibs//score/os/mocklib:stat_mock",
"@score_communication//score/mw/service:factory",
"@score_communication//score/mw/service:provided_service_container",
"@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext",
"@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock",
],
)
6 changes: 3 additions & 3 deletions score/config_management/config_daemon/code/data_model/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ cc_library(
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_baselibs//score/json",
"@score_baselibs//score/result",
"//score/config_management/config_daemon/code/data_model:parameter_set_qualifier",
"//score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces:read_only_parameterset_collection",
"@score_baselibs//score/json",
"@score_baselibs//score/result",
],
)

Expand Down Expand Up @@ -69,8 +69,8 @@ cc_library(
hdrs = ["parameterset_collection_manager_mock.h"],
features = COMPILER_WARNING_FEATURES,
visibility = [
"//score/config_management/config_daemon/code:__subpackages__",
"//score:__subpackages__",
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
":parameterset_collection_manager",
Expand Down
14 changes: 7 additions & 7 deletions score/config_management/config_daemon/code/data_model/details/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ cc_library(
features = COMPILER_WARNING_FEATURES,
tags = ["FUSA"],
visibility = [
"//score/config_management/config_daemon/code:__subpackages__",
"//score:__subpackages__",
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_baselibs//score/filesystem",
"@score_baselibs//score/json",
"@score_logging//score/mw/log",
"//score/config_management/config_daemon/code/data_model:parameter_set_qualifier",
"//score/config_management/config_daemon/code/data_model:parameterset_collection",
"//score/config_management/config_daemon/code/data_model/error",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage",
"@score_baselibs//score/filesystem",
"@score_baselibs//score/json",
"@score_baselibs//score/language/futurecpp",
"@score_logging//score/mw/log",
],
)

Expand All @@ -56,11 +56,11 @@ cc_library(
],
deps = [
":parameterset_collection_impl",
"@score_logging//score/mw/log",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_manager",
"//score/config_management/config_daemon/code/data_model/error",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage",
"//score/config_management/config_daemon/code/plugins:plugin",
"@score_logging//score/mw/log",
],
)

Expand All @@ -75,8 +75,8 @@ cc_test(
visibility = ["//score/config_management/config_daemon/code/data_model:__pkg__"],
deps = [
":parameterset_collection_impl",
"@score_baselibs//score/json:mock",
"@googletest//:gtest_main",
"@score_baselibs//score/json:mock",
],
)

Expand All @@ -88,9 +88,9 @@ cc_test(
visibility = ["//score/config_management/config_daemon/code/data_model:__pkg__"],
deps = [
":parameterset_collection_manager_impl",
"@score_logging//score/mw/log/test/console_logging_environment",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage:mock",
"//score/config_management/config_daemon/code/plugins:mock",
"@googletest//:gtest_main",
"@score_logging//score/mw/log/test/console_logging_environment",
],
)
6 changes: 3 additions & 3 deletions score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ COMMON_FEATURES = [
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_baselibs//score/hash:safe_hash",
"@score_baselibs//score/json",
"//score/config_management/config_daemon/code/data_model:parameterset_collection",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage/error",
"@score_baselibs//score/hash:safe_hash",
"@score_baselibs//score/json",
] + dependencies,
)
for name, testonly, dependencies in [
Expand Down Expand Up @@ -71,10 +71,10 @@ cc_test(
],
deps = [
":details_score_for_unit_test",
"@score_logging//score/mw/log/test/console_logging_environment",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_mock",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@score_logging//score/mw/log/test/console_logging_environment",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ...nagement/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ cc_library(
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_baselibs//score/result",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage/error",
"@score_baselibs//score/result",
],
)

Expand Down
2 changes: 1 addition & 1 deletion score/config_management/config_daemon/code/data_model/parameter_set_storage/error/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ cc_library(
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_baselibs//score/result",
"@score_baselibs//score/language/futurecpp",
"@score_baselibs//score/result",
],
)

Expand Down
2 changes: 1 addition & 1 deletion .../config_management/config_daemon/code/data_model/parameterset_collection_interfaces/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ cc_library(
visibility = ["//score/config_management/config_daemon:__subpackages__"],
deps = [
"@score_baselibs//score/json",
"@score_baselibs//score/result",
"@score_baselibs//score/language/futurecpp",
"@score_baselibs//score/result",
],
)

Expand Down
2 changes: 1 addition & 1 deletion score/config_management/config_daemon/code/factory/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ load(":custom.bzl", "load_custom_test_suites")
"//score/config_management/config_daemon/code:__subpackages__",
],
deps = [
"@score_communication//score/mw/service",
"//score/config_management/config_daemon/code/data_model:parameterset_collection",
"//score/config_management/config_daemon/code/data_model:parameterset_collection_manager",
"//score/config_management/config_daemon/code/data_model/parameter_set_storage",
"//score/config_management/config_daemon/code/fault_event_reporter",
"//score/config_management/config_daemon/code/plugins/plugin_collector:interface",
"//score/config_management/config_daemon/code/services",
"@score_communication//score/mw/service",
] + dependencies,
)
for name, testonly, dependencies in [
Expand Down
Loading
Loading