bump gRPC and protobuf versions, use the new edition notation instead…

… of the syntax notation and switch out the license header action

.github/license-check/header-MIT-draeger-java.txt

@@ -1,6 +1,6 @@
-/*
-This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) %year% Draegerwerk AG & Co. KGaA.
-
-SPDX-License-Identifier: MIT
-*/
+/\*
+ \* This Source Code Form is subject to the terms of the MIT License.
+ \* Copyright \(c\) (?:([0-9]{4}-[0-9]{4})|([0-9]{4}))(?:, (?:([0-9]{4}-[0-9]{4})|([0-9]{4})))* Draegerwerk AG & Co. KGaA.
+ \*
+ \* SPDX-License-Identifier: MIT
+ \*/

.github/license-check/header-MIT-draeger-proto.txt

@@ -1,6 +1,6 @@
-/*
-This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) %year% Draegerwerk AG & Co. KGaA.
-
-SPDX-License-Identifier: MIT
-*/
+/\*
+ \* This Source Code Form is subject to the terms of the MIT License.
+ \* Copyright \(c\) (?:([0-9]{4}-[0-9]{4})|([0-9]{4}))(?:, (?:([0-9]{4}-[0-9]{4})|([0-9]{4})))* Draegerwerk AG & Co. KGaA.
+ \*
+ \* SPDX-License-Identifier: MIT
+ \*/

.github/license-check/header-MIT-draeger-python.txt

@@ -1,4 +1,4 @@
 # This Source Code Form is subject to the terms of the MIT License.
 #
-# Copyright (c) %year% Draegerwerk AG & Co. KGaA.
+# Copyright (c) (?:([0-9]{4}-[0-9]{4})|([0-9]{4}))(?:, (?:([0-9]{4}-[0-9]{4})|([0-9]{4})))* Draegerwerk AG & Co. KGaA.
 # SPDX-License-Identifier: MIT

.github/license-check/license-config

@@ -0,0 +1,23 @@
+[DraegerLicenseMITforJava]
+file_name_pattern: tests/java/src/**/*.java
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-java.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITforProto]
+file_name_pattern: src/**/*.proto
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-proto.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITforPythonSource]
+file_name_pattern: python/**/*.py
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-python.txt
+header_regex_file_encoding: utf-8
+
+[DraegerLicenseMITforPythonTests]
+file_name_pattern: tests/python/**/*.py
+file_header_encoding: utf-8
+header_regex_file: .github/license-check/header-MIT-draeger-python.txt
+header_regex_file_encoding: utf-8

.github/workflows/license-check.yml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
-      - uses: viperproject/check-license-header@v1
+      - uses: actions/checkout@v4
+      - uses: maximilianpilz/file-header-check@v1
         with:
-          path: .
-          config: .github/license-check/license-config.json
-          strict: false # <boolean indicating whether files not covered by the configuration should be reported as errors>
+          config: '.github/license-check/license-config'
+          config-encoding: 'utf-8'
+          log-level: 'DEBUG'

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- gRPC version to 1.60.1
+- protoc version to 25.0
+- protobuf syntax notation to edition notation
+
 ## [4.0.0] - 2023-11-20
 
 ### Added

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/versions.txt

@@ -1,6 +1,6 @@
-BASE_PACKAGE_VERSION=4.1.0
-COMMON_PROTOC_VERSION=24.1
-JAVA_PROTOC_VERSION=3.24.1
-JAVA_GRPC_VERSION=1.58.0
-PYTHON_PROTOC_VERSION=4.24.1
-PYTHON_GRPC_VERSION=1.58.0
+BASE_PACKAGE_VERSION=5.0.0
+COMMON_PROTOC_VERSION=25.0
+JAVA_PROTOC_VERSION=3.25.0
+JAVA_GRPC_VERSION=1.60.1
+PYTHON_PROTOC_VERSION=4.25.0
+PYTHON_GRPC_VERSION=1.60.1

src/t2iapi/activation_state/activation_state_requests.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.activation_state;
 
 import "t2iapi/activation_state/types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.activation_state";
 option java_outer_classname = "ActivationStateRequests";
 

src/t2iapi/activation_state/service.proto

@@ -1,11 +1,11 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.activation_state;
 

src/t2iapi/activation_state/types.proto

@@ -1,11 +1,11 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.activation_state;
 

src/t2iapi/alert/alert_requests.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.alert;
 
 import "t2iapi/alert/types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.alert";
 option java_outer_classname = "AlertRequests";
 

src/t2iapi/alert/service.proto

@@ -1,11 +1,11 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.alert;
 

src/t2iapi/alert/types.proto

@@ -1,11 +1,11 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.alert;
 

src/t2iapi/basic_requests.proto

@@ -1,14 +1,15 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi;
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi";
 option java_outer_classname = "BasicRequests";
 

src/t2iapi/basic_responses.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi;
 
 import "t2iapi/response_types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi";
 option java_outer_classname = "BasicResponses";
 

src/t2iapi/combined/combined_requests.proto

@@ -5,7 +5,7 @@ Copyright (c) 2023 Draegerwerk AG & Co. KGaA.
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.combined;
 
@@ -14,7 +14,7 @@ import "t2iapi/operation/types.proto";
 import "t2iapi/activation_state/types.proto";
 import "t2iapi/metric/types.proto";
 
-
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.combined";
 option java_outer_classname = "CombinedRequests";
 

src/t2iapi/combined/service.proto

@@ -5,7 +5,7 @@ Copyright (c) 2023 Draegerwerk AG & Co. KGaA.
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.combined;
 

src/t2iapi/context/context_requests.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.context;
 
 import "t2iapi/context/types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.context";
 option java_outer_classname = "ContextRequests";
 

src/t2iapi/context/context_responses.proto

@@ -1,18 +1,19 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.context;
 
 import "t2iapi/basic_responses.proto";
 import "t2iapi/response_types.proto";
 import "t2iapi/context/types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.context";
 option java_outer_classname = "ContextResponses";
 

src/t2iapi/context/service.proto

@@ -1,11 +1,11 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.context;
 

src/t2iapi/context/types.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.context;
 
 import "google/protobuf/wrappers.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.context";
 option java_outer_classname = "ContextTypes";
 

src/t2iapi/device/device_requests.proto

@@ -1,16 +1,17 @@
 /*
 This Source Code Form is subject to the terms of the MIT License.
-Copyright (c) 2022 Draegerwerk AG & Co. KGaA.
+Copyright (c) 2022-2024 Draegerwerk AG & Co. KGaA.
 
 SPDX-License-Identifier: MIT
 */
 
-syntax = "proto3";
+edition = "2023";
 
 package t2iapi.device;
 
 import "t2iapi/device/types.proto";
 
+option features.field_presence = IMPLICIT;
 option java_package = "com.draeger.medical.t2iapi.device";
 option java_outer_classname = "DeviceRequests";