Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # .github/workflows/build.yml
ehrbase · Apr 19, 2024 · 8686240 · 8686240
2 parents 7ae1235 + 6f7455d
commit 8686240
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java
+      - name: Setup - Java 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
@@ -35,7 +35,7 @@ jobs:
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn clean verify test jacoco:report-aggregate package sonar:sonar \
+          mvn --batch-mode sonar:sonar \
             -Dsonar.host.url=https://sonarcloud.io \
             -Dsonar.organization=ehrbase \
             -Dsonar.projectKey=ehrbase_openEHR_SDK \

diff --git a/...hrbase/openehr/sdk/serialisation/flatencoding/std/marshal/config/DvOrdinalConfigTest.java b/...hrbase/openehr/sdk/serialisation/flatencoding/std/marshal/config/DvOrdinalConfigTest.java
@@ -43,7 +43,8 @@ void buildChildValuesOrdinalOnlySymbolNullSafe() {
     void buildChildValuesWithSymbol() {
 
         Map<String, Object> childValues = buildChildValues(
-                "some_other/current_activity/ordinal", new DvOrdinal(42L, new DvCodedText("lorem ipsum", "PWVGUTHASM")));
+                "some_other/current_activity/ordinal",
+                new DvOrdinal(42L, new DvCodedText("lorem ipsum", "PWVGUTHASM")));
         assertThat(childValues)
                 .hasSize(3)
                 .containsEntry("some_other/current_activity/ordinal|ordinal", 42L)