Update communication module and fix json schema validation

Author: mariuswbr

MODULE.bazel

@@ -162,23 +162,42 @@ bazel_dep(name = "score_tooling", version = "1.0.4", dev_dependency = True)
 bazel_dep(name = "aspect_rules_lint", version = "2.3.0", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)
 
+# ============================================================================
+# JSON Schema Validation
+# ============================================================================
+bazel_dep(name = "nlohmann_json", version = "3.11.3", dev_dependency = True)
+bazel_dep(name = "download_utils", version = "1.2.2", dev_dependency = True)
+
+download_archive = use_repo_rule("@download_utils//download/archive:defs.bzl", "download_archive")
+
+download_archive(
+    name = "json_schema_validator",
+    build = "//third_party/json_schema_validator:json_schema_validator.BUILD",
+    strip_prefix = "json-schema-validator-2.1.0",
+    urls = ["https://github.com/pboettch/json-schema-validator/archive/refs/tags/2.1.0.tar.gz"],
+)
+
+download_archive(
+    name = "jsonschema",
+    build = "//third_party/jsonschema:jsonschema.BUILD",
+    strip_prefix = "jsonschema-4.23.0",
+    urls = ["https://github.com/python-jsonschema/jsonschema/archive/refs/tags/v4.23.0.tar.gz"],
+)
+
 # ============================================================================
 # Documentation
 # ============================================================================
-bazel_dep(name = "score_docs_as_code", version = "2.3.0", dev_dependency = True)
+bazel_dep(name = "score_docs_as_code", version = "3.0.0", dev_dependency = True)
 
 # ============================================================================
 # Communication Framework
 # ============================================================================
-bazel_dep(name = "score_communication", version = "0.1.2")
-
-# On aarch64 (ARM), C's char is unsigned (u8)
-# Fixed upstream on main by commit b9efce9702d108fd63be806738db50c14d354302
-# Opened problem report at: https://github.com/eclipse-score/communication/issues/172
-single_version_override(
+bazel_dep(name = "score_communication", version = "0.1.4")
+# TODO: Remove override as soon as new release containing the GenericSkeleton is available.
+git_override(
     module_name = "score_communication",
-    patch_strip = 1,
-    patches = ["//:third_party/score_communication-cchar.patch"],
+    commit = "fea1b1058ea78ccd32fd04bf2e0d4728b34e18fa",
+    remote = "https://github.com/eclipse-score/communication.git",
 )
 
 # ============================================================================
@@ -187,29 +206,25 @@ single_version_override(
 # Patch note: baselibs-multiarch.patch adds multi-arch support for .deb downloads.
 # score_baselibs hardcodes amd64 URLs; patch replaces them with architecture-aware
 # selection (x86_64 or aarch64) based on TARGET_ARCH environment variable.
-bazel_dep(name = "score_baselibs", version = "0.2.2")
-single_version_override(
+bazel_dep(name = "score_baselibs", version = "0.2.4")
+git_override(
     module_name = "score_baselibs",
-    patch_strip = 1,
-    patches = ["//:third_party/baselibs-multiarch.patch"],
+    commit = "052c2f271be4239f97182b164f4903b8c88d6c72",
+    remote = "https://github.com/eclipse-score/baselibs.git",
+)
+
+bazel_dep(name = "score_logging", version = "0.1.0")
+git_override(
+    module_name = "score_logging",
+    commit = "38e8762881d512c89ae5c2e5e5238fd791d327df",
+    remote = "https://github.com/eclipse-score/logging.git",
 )
 
 # ============================================================================
 # Code Generation
 # ============================================================================
 bazel_dep(name = "flatbuffers", version = "25.12.19")
 
-# ============================================================================
-# Requirements Traceability
-# ============================================================================
-# TRLC (Traceability Language Compiler) for requirements management.
-# Overrides the transitive dependency to pin a verified release.
-git_override(
-    module_name = "trlc",
-    commit = "650b51a47264a4f232b3341f473527710fc32669",  # trlc-2.0.2 release
-    remote = "https://github.com/bmw-software-engineering/trlc.git",
-)
-
 # ============================================================================
 # Examples: Car Window Simulator
 # ============================================================================

bazel/tools/json_schema_validator.bzl

@@ -0,0 +1,55 @@
+"""
+Creates "validate_json_schema_test" test rule which validates the input "json" file against its "schema"
+"""
+
+def _impl(ctx):
+    script = """
+    readonly expected_failure={expected_failure}
+    '{validator}' '{schema}' < '{json}'
+    readonly ret=$?
+    if test "$expected_failure" = true && test "$ret" -ne 0; then
+        exit 0
+    elif test "$expected_failure" = false && test "$ret" -eq 0; then
+        exit 0
+    fi
+    echo "Test Failed: Json validator performed json validation of '{json}' against '{schema}' schema with exit code $ret, meanwhile rule attribute 'expected_failure' is equal to '{expected_failure}'.
+This means in case expected_failure=false then expected exit code should be zero (valid json). Otherwise, if expected_failure=true then exit code is non-zero (invalid json).
+Note: by default expected_failure is false."
+    exit 1
+    """.format(
+        validator = ctx.attr._validator.files_to_run.executable.short_path,
+        schema = ctx.file.schema.short_path,
+        json = ctx.file.json.short_path,
+        expected_failure = "true" if ctx.attr.expected_failure else "false",
+    )
+
+    ctx.actions.write(
+        output = ctx.outputs.executable,
+        content = script,
+    )
+
+    # To ensure the files needed by the script are available, put them in the runfiles
+    runfiles = ctx.runfiles(files = [ctx.file._validator, ctx.file.json, ctx.file.schema])
+    return [DefaultInfo(runfiles = runfiles)]
+
+validate_json_schema_test = rule(
+    implementation = _impl,
+    attrs = {
+        "expected_failure": attr.bool(default = False),
+        "json": attr.label(
+            allow_single_file = True,
+            mandatory = True,
+        ),
+        "schema": attr.label(
+            allow_single_file = True,
+            mandatory = True,
+        ),
+        "_validator": attr.label(
+            default = Label("@json_schema_validator"),
+            allow_single_file = True,
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+    test = True,
+)

bazel/tools/someip_config.bzl

@@ -13,7 +13,7 @@
 
 """Macros to generate and validate a SOME/IP gateway configuration"""
 
-load("@score_communication//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
+load("//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
 
 def _get_expected_binary_name(json):
     """Extracts the expected binary filename from a JSON label.

src/gatewayd/BUILD.bazel

@@ -20,7 +20,7 @@ load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
 load("@flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
-load("@score_communication//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
+load("//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
 load("@score_someip_gateway//bazel/tools:someip_config.bzl", "generate_someip_config_bin", "validate_someip_config_test")
 
 exports_files(

src/gatewayd/remote_service_instance.cpp

@@ -56,7 +56,7 @@ RemoteServiceInstance::RemoteServiceInstance(
                 // TODO: Check based on event/method id within the SOME/IP header which event was
                 // received, to forward via the correct IPC event. For now, we assume it's always
                 // the echo_response_tiny event.
-                auto& event = const_cast<score::mw::com::impl::GenericSkeletonEvent&>(
+                auto& event = const_cast<score::mw::com::GenericSkeletonEvent&>(
                     ipc_skeleton_.GetEvents().find("echo_response_tiny")->second);
                 auto maybe_sample = event.Allocate();
                 if (!maybe_sample.has_value()) {
@@ -103,7 +103,7 @@ Result<mw::com::FindServiceHandle> RemoteServiceInstance::CreateAsyncRemoteServi
                                       service_instance_config->instance_specifier()->str())
                                       .value();
 
-    std::vector<score::mw::com::impl::EventInfo> events{};
+    std::vector<score::mw::com::EventInfo> events{};
     events.reserve(service_instance_config->events()->size());
 
     for (const auto& event : *service_instance_config->events()) {
@@ -113,12 +113,12 @@ Result<mw::com::FindServiceHandle> RemoteServiceInstance::CreateAsyncRemoteServi
         }
 
         // TODO: Get the event type info from somewhere. Configuration?
-        score::mw::com::impl::DataTypeMetaInfo type_info{sizeof(echo_service::EchoResponseTiny),
-                                                         alignof(echo_service::EchoResponseTiny)};
+        score::mw::com::DataTypeMetaInfo type_info{sizeof(echo_service::EchoResponseTiny),
+                                                   alignof(echo_service::EchoResponseTiny)};
         events.push_back({event->event_name()->string_view(), type_info});
     }
 
-    score::mw::com::impl::GenericSkeletonServiceElementInfo create_params;
+    score::mw::com::GenericSkeletonServiceElementInfo create_params;
     create_params.events = events;
 
     auto create_ipc_result =

src/someipd/BUILD.bazel

@@ -16,7 +16,7 @@ This daemon contains the SOME/IP communication stack and is QM
 """
 
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
-load("@score_communication//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
+load("//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
 
 exports_files(["etc/mw_com_config.json"])
 

tests/benchmarks/BUILD.bazel

@@ -13,7 +13,7 @@
 
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
-load("@score_communication//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
+load("//bazel/tools:json_schema_validator.bzl", "validate_json_schema_test")
 
 cc_library(
     name = "echo_service",

third_party/json_schema_validator/BUILD

@@ -0,0 +1,12 @@
+# *******************************************************************************
+# Copyright (c) 2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************

third_party/json_schema_validator/json_schema_validator.BUILD

@@ -0,0 +1,33 @@
+# *******************************************************************************
+# Copyright (c) 2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "json_schema_validator_lib",
+    srcs = glob(["src/*"]),
+    hdrs = ["src/nlohmann/json-schema.hpp"],
+    features = [
+        "third_party_warnings",
+        "-treat_warnings_as_errors",
+    ],
+    includes = ["src"],
+    deps = ["@nlohmann_json//:json"],
+)
+
+cc_binary(
+    name = "json_schema_validator",
+    srcs = ["app/json-schema-validate.cpp"],
+    deps = [":json_schema_validator_lib"],
+)

third_party/jsonschema/BUILD

@@ -0,0 +1,17 @@
+# *******************************************************************************
+# Copyright (c) 2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+alias(
+    name = "jsonschema",
+    actual = "@jsonschema//:lib",
+    visibility = ["//visibility:public"],
+)