Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions MODULE.bazel.lock

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

4 changes: 2 additions & 2 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ git_override(
bazel_dep(name = "score_logging")
git_override(
module_name = "score_logging",
commit = "6c855d97e6004034ebe6e947770824dfb9358ca8",
commit = "6282f3a2ec6b1eeeab87c8e9a4435c586bcf9973",
patch_strip = 1,
patches = [
"//patches/logging:001-restore-remote-backend-in-datarouter.patch",
"//patches/logging:002-needs-json-deps-not-dev-dependency.patch",
"//patches/logging:003-docs-as-code-not-dev-dependency.patch",
],
remote = "https://github.com/eclipse-score/logging.git",
)
Expand Down
4 changes: 2 additions & 2 deletions bazel_common/score_modules_tooling.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ git_override(
bazel_dep(name = "score_platform")
git_override(
module_name = "score_platform",
commit = "80e96e9dbf01a5d2df4398cec4d6606ca0535603",
commit = "24ec6f276cd37755b5dae7f2345913628d56831f",
remote = "https://github.com/eclipse-score/score.git",
)

Expand All @@ -59,7 +59,7 @@ git_override(
bazel_dep(name = "score_docs_as_code")
git_override(
module_name = "score_docs_as_code",
commit = "8d28586a12daa57c29d9b0a3b0b532246b59ea64",
commit = "f1f20f0579ab5e63513561db0ab055cbec46c987",
remote = "https://github.com/eclipse-score/docs-as-code.git",
)

Expand Down
11 changes: 6 additions & 5 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@
},
"score_logging": {
"repo": "https://github.com/eclipse-score/logging.git",
"hash": "6c855d97e6004034ebe6e947770824dfb9358ca8",
"hash": "6282f3a2ec6b1eeeab87c8e9a4435c586bcf9973",
"bazel_patches": [
"//patches/logging:001-restore-remote-backend-in-datarouter.patch",
"//patches/logging:002-needs-json-deps-not-dev-dependency.patch"
"//patches/logging:002-needs-json-deps-not-dev-dependency.patch",
"//patches/logging:003-docs-as-code-not-dev-dependency.patch"

],
"metadata": {
"code_root_path": "//score/mw/log/...",
Expand Down Expand Up @@ -144,7 +145,7 @@
},
"score_platform": {
"repo": "https://github.com/eclipse-score/score.git",
"hash": "80e96e9dbf01a5d2df4398cec4d6606ca0535603"
"hash": "24ec6f276cd37755b5dae7f2345913628d56831f"
},
"score_bazel_platforms": {
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
Expand All @@ -156,7 +157,7 @@
},
"score_docs_as_code": {
"repo": "https://github.com/eclipse-score/docs-as-code.git",
"hash": "8d28586a12daa57c29d9b0a3b0b532246b59ea64"
"hash": "f1f20f0579ab5e63513561db0ab055cbec46c987"
},
"score_process": {
"repo": "https://github.com/eclipse-score/process_description.git",
Expand Down
14 changes: 0 additions & 14 deletions patches/logging/001-restore-remote-backend-in-datarouter.patch

This file was deleted.

11 changes: 7 additions & 4 deletions patches/logging/002-needs-json-deps-not-dev-dependency.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -52,5 +52,5 @@ bazel_dep(name = "score_tooling", version = "1.1.2")
@@ -47,8 +47,8 @@ single_version_override(

bazel_dep(name = "score_rust_policies", version = "0.0.5")

-bazel_dep(name = "score_process", version = "1.5.4", dev_dependency = True)
-bazel_dep(name = "score_platform", version = "0.5.5", dev_dependency = True)
-bazel_dep(name = "score_platform", version = "0.6.0", dev_dependency = True)
+bazel_dep(name = "score_process", version = "1.5.4")
+bazel_dep(name = "score_platform", version = "0.5.5")
+bazel_dep(name = "score_platform", version = "0.6.0")
bazel_dep(name = "score_itf", version = "0.4.0", dev_dependency = True)

# OCI / Docker image rules for integration tests
12 changes: 12 additions & 0 deletions patches/logging/003-docs-as-code-not-dev-dependency.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -37,7 +37,7 @@ bazel_dep(name = "platforms", version = "1.0.0")
# S-CORE process rules
bazel_dep(name = "score_bazel_platforms", version = "0.1.2")

-bazel_dep(name = "score_docs_as_code", version = "4.6.0", dev_dependency = True)
+bazel_dep(name = "score_docs_as_code", version = "4.6.0")

bazel_dep(name = "score_tooling", version = "1.2.0")
single_version_override(
Loading