Merge branch 'main' into add_manipulation_CreateContextStateWithAssoc…

…AndSpecificValidatorAndSpecificIdentification
Draegerwerk · May 31, 2024 · f63be31 · f63be31
2 parents e99bc57 + 6a56dae
commit f63be31
Show file tree

Hide file tree

Showing 20 changed files with 260 additions and 90 deletions.
diff --git a/.github/workflows/buf-lint.yml b/.github/workflows/buf-lint.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Install the `buf` CLI
       - uses: bufbuild/buf-setup-action@v1
       # Lint your Protobuf sources

diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Source dependency versions
         working-directory: config
         run: |
@@ -29,73 +29,65 @@ jobs:
           wget https://github.com/protocolbuffers/protobuf/releases/download/v${{ env.COMMON_PROTOC_VERSION }}/protoc-${{ env.COMMON_PROTOC_VERSION }}-linux-x86_64.zip -P ${{ runner.temp }}/protoc_install
           unzip ${{ runner.temp }}/protoc_install/*.zip -d ${{ runner.temp }}/protoc_install/protoc
           echo "${{ runner.temp }}/protoc_install/protoc/bin" >> $GITHUB_PATH
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
       - name: Execute build
         working-directory: ./java
         run: ./gradlew jar
       - name: Archive built jars
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: target_jars
           path: java/build/libs/*.jar
-  run-tests-java11:
+  run-tests-java17:
     runs-on: ubuntu-latest
     needs: build-java
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download t2iapi jar artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target_jars
           path: java/build/libs/
       - name: Detect release version
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
           echo RELEASE_VERSION=1 >> $GITHUB_ENV
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
       - name: Execute tests
         working-directory: tests/java
         run: ./gradlew test
       - name: Archive test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test_results
           path: tests/java/build/reports/tests/test/**/*.*
-  deploy-github-packages:
+  deploy-maven-central:
     runs-on: ubuntu-latest
-    needs: run-tests-java11
+    needs: run-tests-java17
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
-    permissions:
-      packages: write
-      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Source dependency versions
         working-directory: config
         run: |
           cat versions.txt >> $GITHUB_ENV
-      - name: Download t2iapi test results artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: test_results
-          path: test_results/
       - name: Detect release version
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
@@ -107,21 +99,24 @@ jobs:
           wget https://github.com/protocolbuffers/protobuf/releases/download/v${{ env.COMMON_PROTOC_VERSION }}/protoc-${{ env.COMMON_PROTOC_VERSION }}-linux-x86_64.zip -P ${{ runner.temp }}/protoc_install
           unzip ${{ runner.temp }}/protoc_install/*.zip -d ${{ runner.temp }}/protoc_install/protoc
           echo "${{ runner.temp }}/protoc_install/protoc/bin" >> $GITHUB_PATH
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up Java for publishing to Maven Central Repository
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
       - name: Publish package
         working-directory: ./java
-        run: ./gradlew publish
+        run: |
+          ./gradlew publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          MAVEN_GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
       - name: Install zip
         if: startsWith(github.ref, 'refs/tags/')
         uses: montudor/action-zip@v1
@@ -140,4 +135,4 @@ jobs:
             java/build/publications/maven/pom-default.xml
             java-test-results.zip
           prerelease: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-          body_path: CHANGELOG.md
+          body_path: CHANGELOG.md
diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Source dependency versions
         working-directory: config
         run: |
@@ -32,7 +32,7 @@ jobs:
           wget https://github.com/protocolbuffers/protobuf/releases/download/v${{ env.COMMON_PROTOC_VERSION }}/protoc-${{ env.COMMON_PROTOC_VERSION }}-linux-x86_64.zip -P ${{ runner.temp }}/protoc_install
           unzip ${{ runner.temp }}/protoc_install/*.zip -d ${{ runner.temp }}/protoc_install/protoc
           echo "${{ runner.temp }}/protoc_install/protoc/bin" >> $GITHUB_PATH
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Install python dependencies
@@ -44,7 +44,7 @@ jobs:
         working-directory: ./python
         run: python setup.py sdist bdist_wheel
       - name: Archive wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: python/dist
@@ -53,12 +53,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-python
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Download t2iapi wheel artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dist
       - name: Install t2iapi package
@@ -70,13 +70,13 @@ jobs:
       - name: run unit tests
         run: python ./tests/python/html_report.py
       - name: Archive freeze information
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: freeze
           path: pip_freeze.txt
           retention-days: 1
       - name: Archive test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: html_unit_test
           path: unittest_results/*.html
@@ -89,17 +89,17 @@ jobs:
       contents: write
     steps:
       - name: Download t2iapi wheel artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist/
       - name: Download t2iapi test results artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: html_unit_test
           path: unittest_results/
       - name: Download pip freeze
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: freeze
           path: freeze/

diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Run `git checkout`
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: viperproject/check-license-header@v1
         with:
           path: .

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
 - manipulation CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification for contexts
+
+## [4.1.0] - 2024-02-22
+
+### Changed
+
+- gRPC version to 1.60.1
+- protoc version to 25.0
+
+## [4.0.0] - 2023-11-20
+
+### Added
+
+- manipulation SetInvocationEffectiveTimeoutLessThanOrEqualToThreshold for operations
+- manipulation SetModeOfOperationAndSetOperatingMode for combined settings
+- manipulation ConveyMetricDemoValues for metrics
+- manipulation SetAlertConditionAndAlertSignalActivationState for alert activation states
+
+### Changed
+
+- gRPC version to 1.58.0
+- protoc version to 24.1
+
+### Removed
+
+- manipulation ChangeOperationModeStatus for metrics
+
+## [3.0.0] - 2023-09-11
+
+### Added
+
 - manipulation SetComponentActivationAndSetOperatingMode for components and operations
 - manipulation SetAlertActivationAndSetOperatingMode for alerts and operations
 - manipulation TransitionFromCreateStateWithIdentificationToRemoveIdentification for contexts
@@ -21,7 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - manipulation SetAsActivationStateOnAndChangeAcPresenceFalse for alerts
 - manipulation SetActivationStateAndUserConfirmableValue for metrics
 - stub files which are integrated into the python package
-- description for allowed combinations of InstanceIdentifier/@Root and InstanceIdentifier/@Extension
+- description for allowed combinations of Root and Extension attributes of InstanceIdentifiers
 - manipulation ComponentActivationTransition
 - type hinting for python package via [types-protobuf](https://pypi.org/project/types-protobuf/)
 - TriggerAnyDescriptorUpdate manipulation
@@ -44,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     SetMetricValuesWithQualityMode
 - semantics for SetDeviceOperatingMode manipulation
 - message PartialIdentification to message PartialInstanceIdentifier
+- TriggerDescriptorUpdate to request an update for an arbitrary amount of handles
 
 ### Removed
 

diff --git a/LICENSE b/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

diff --git a/config/versions.txt b/config/versions.txt
@@ -1,6 +1,6 @@
-BASE_PACKAGE_VERSION=3.0.0
-COMMON_PROTOC_VERSION=21.7
-JAVA_PROTOC_VERSION=3.21.7
-JAVA_GRPC_VERSION=1.52.1
-PYTHON_PROTOC_VERSION=4.21.7
-PYTHON_GRPC_VERSION=1.51.1
+BASE_PACKAGE_VERSION=4.2.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