Merge branch 'release/v2.12.0'

ehrbase · Jun 6, 2024 · b24949c · b24949c
2 parents d0d27cd + c830b86
commit b24949c
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 51 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: build
+name: "Build & Test"
 
 # we have multiple workflows - this helps to distinguish for them
 run-name: "${{ github.event.pull_request.title && github.event.pull_request.title || github.ref_name }} - Build & Test"
@@ -32,17 +32,10 @@ jobs:
       - name: Jacoco - Integration Tests
         run: mvn --batch-mode jacoco:prepare-agent-integration failsafe:integration-test failsafe:verify verify jacoco:report
 
-      - name: Sonar - Analyze
-        # Dependabot has no access to the SONAR_TOKEN secret, so we need to skip sonar.
-        if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'ehrbase' }}
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          mvn --batch-mode sonar:sonar \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.organization=ehrbase \
-            -Dsonar.projectKey=ehrbase_openEHR_SDK \
-            -Dsonar.exclusions=test/** \
-            -Dsonar.coverage.exclusions=test/**,test-data/**/*,opt-14/**/*,response-dto/**/* \
-            -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/test-coverage/target/site/jacoco-overall-coverage/jacoco.xml
-
+      - name: Upload - Jacoco Overall Coverage
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-coverage-overall
+          path: ${{ github.workspace }}/test-coverage/target/site/jacoco-overall-coverage/jacoco.xml
+          if-no-files-found: error
diff --git a/.github/workflows/codeql.yml → .github/workflows/check-codeql.yml b/.github/workflows/codeql.yml → .github/workflows/check-codeql.yml
@@ -24,8 +24,8 @@ on:
     - cron: '43 18 * * 1'
 
 jobs:
-  analyze:
-    name: Analyze
+  codeql:
+    name: CodeQL
     runs-on: ubuntu-latest
     permissions:
       actions: read

diff --git a/.github/workflows/codestyle.yml → .github/workflows/check-style.yml b/.github/workflows/codestyle.yml → .github/workflows/check-style.yml
@@ -14,7 +14,8 @@ on:
 # Style-check it's a dedicated workflow. This allows us to open a PR, run all tests and fix styling issue later ;).
 #
 jobs:
-  check-codestyle:
+  spotless:
+    name: Spotless-Check
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/report-sonar-results.yml b/.github/workflows/report-sonar-results.yml
@@ -1,7 +1,7 @@
 name: "Report Sonar Results"
 
 # we have multiple workflows - this helps to distinguish for them
-run-name: "${{ github.event.pull_request.title && github.event.pull_request.title || github.ref_name }} - Report Sonar Results"
+run-name: "${{ github.event.workflow_run.pull_requests[0].title && github.event.workflow_run.pull_requests[0].title || github.event.workflow_run.head_branch }} - Report Sonar Results"
 
 on:
   workflow_run:
@@ -11,14 +11,18 @@ on:
 
 jobs:
   #
-  # Collect Junit reports generated by build_and_test
+  # Collect and upload sonar report with coverage generated by the Build & Test workflow
   #
-  collect-junit-reports:
+  sonar-report:
+    name: Sonar-Report
     runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          # repository: ${{ github.event.workflow_run.head_repository.full_name }}
+          ref: ${{ github.event.workflow_run.head_branch }}
           fetch-depth: 0
 
       - name: Setup - Java 17
@@ -27,7 +31,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'maven'
-      
+
       # Download jacoco overall coverage from build & test output
       - name: Download - Jacoco Overall Coverage
         uses: actions/download-artifact@v4
@@ -36,18 +40,20 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }} # download artifacts from build and test workflow
           pattern: jacoco-coverage-overall            # uses artifact of build and test workflow
           merge-multiple: true
-          path: ./
+          path: ${{ github.workspace }}/target/site/jacoco-overall-coverage
 
       - name: Sonar - Analyze
-        # Dependabot has no access to the SONAR_TOKEN secret, so we need to skip sonar.
-        # if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'ehrbase' }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           mvn --batch-mode -DskipTests compile sonar:sonar \
+            -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \
+            -Dsonar.pullrequest.key=${{ github.event.workflow_run.pull_requests[0].number }} \
+            -Dsonar.pullrequest.branch=${{ github.event.workflow_run.pull_requests[0].head.ref }} \
+            -Dsonar.pullrequest.base=${{ github.event.workflow_run.pull_requests[0].base.ref }} \
             -Dsonar.host.url=https://sonarcloud.io \
             -Dsonar.organization=ehrbase \
             -Dsonar.projectKey=ehrbase_openEHR_SDK \
             -Dsonar.exclusions=test/** \
             -Dsonar.coverage.exclusions=test/**,test-data/**/*,opt-14/**/*,response-dto/**/* \
-            -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/test-coverage/target/site/jacoco-overall-coverage/jacoco.xml
+            -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/target/site/jacoco-overall-coverage/jacoco.xml
diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml
@@ -3,7 +3,7 @@ name: Set test status
 
 on:
   workflow_run:
-    workflows: ["build"]
+    workflows: ["Build & Test"] # runs after build and test workflow
     types:
       - completed
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.12.0]
+ ### Changed 
+- Bumped libraries
+
 ## [2.11.0]
  ### Added 
 - Make AqlObjectPath serializable ([606](https://github.com/ehrbase/openEHR_SDK/pull/606))
@@ -407,3 +411,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [2.9.1]: https://github.com/ehrbase/openEHR_SDK/compare/v2.9.0...v2.9.1
 [2.10.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.9.1...v2.10.0
 [2.11.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.10.0...v2.11.0
+[2.12.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.11.0...v2.12.0
diff --git a/aql/pom.xml b/aql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>bom</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.11.0</version>
+    <version>2.12.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -68,7 +68,7 @@
         <slf4j.version>1.7.36</slf4j.version>
         <xmlbeans.version>3.1.0</xmlbeans.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+        <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>

diff --git a/client/pom.xml b/client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>client</artifactId>

diff --git a/example-generator/pom.xml b/example-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk-parent</artifactId>
         <groupId>org.ehrbase.openehr.sdk</groupId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator-commons/pom.xml b/generator-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>generator-commons</artifactId>
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sdk-parent</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.11.0</version>
+    <version>2.12.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -81,7 +81,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.6.0</version>
+            <version>3.7.0</version>
             <configuration>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
               <debug>false</debug>

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>generator</artifactId>
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <archive>
                         <manifest>

diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>opt-1.4</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.11.0</version>
+    <version>2.12.0</version>
     <packaging>pom</packaging>
     <name>openEHR SDK</name>
 

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.11.0</version>
+    <version>2.12.0</version>
   </parent>
 
   <artifactId>response-dto</artifactId>

diff --git a/serialisation/pom.xml b/serialisation/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>serialisation_conformance_test</artifactId>

diff --git a/terminology/pom.xml b/terminology/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>terminology</artifactId>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>test-coverage</artifactId>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>util</artifactId>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>validation</artifactId>
@@ -117,7 +117,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.1</version>
             <executions>
               <execution>
                 <goals>

diff --git a/web-template/pom.xml b/web-template/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>web-template</artifactId>