Merge branch 'release/v2.9.0'

ehrbase · Apr 8, 2024 · bf971b5 · bf971b5
2 parents 4e55a2b + 337b203
commit bf971b5
Show file tree

Hide file tree

Showing 82 changed files with 468 additions and 7,183 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,7 @@ name: build
 
 on:
   push:
-    branches:
-      - master
-      - develop
+  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -23,34 +21,10 @@ jobs:
           java-version: '17'
           cache: 'maven'
 
-      - name: Build with Maven
-        run: mvn -B verify
 
-      - name: Setup Maven Central
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'maven'
-          server-id: ossrh
-          server-username: OSSRH_USERNAME
-          server-password: OSSRH_TOKEN
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-passphrase: GPG_PASSPHRASE
+      - name: Spotless
+        run: mvn -B spotless:apply
 
-      - name: Publish to Maven Central
-        run: mvn -B deploy -P release -DskipTests
-        env:
-          OSSRH_USERNAME: ${{ secrets.S01_OSSRH_USERNAME }}
-          OSSRH_TOKEN: ${{ secrets.S01_OSSRH_TOKEN }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Build with Maven
+        run: mvn -B verify
 
-      - name: 'Trigger ehrbase:next build'
-        if: github.ref == 'refs/heads/develop'
-        run: |
-          curl \
-            -X POST \
-            -H "Authorization: token ${{ secrets.PERSONAL_ACCESS_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            https://api.github.com/repos/ehrbase/ehrbase/dispatches \
-            -d '{"event_type":"build-ehrbase-next"}'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,56 @@
+name: publish
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+
+      - name: Build with Maven
+        run: mvn -B verify
+
+      - name: Setup Maven Central
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+          server-id: ossrh
+          server-username: OSSRH_USERNAME
+          server-password: OSSRH_TOKEN
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: GPG_PASSPHRASE
+
+      - name: Publish to Maven Central
+        run: mvn -B deploy -P release -DskipTests
+        env:
+          OSSRH_USERNAME: ${{ secrets.S01_OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.S01_OSSRH_TOKEN }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: 'Trigger ehrbase:next build'
+        if: github.ref == 'refs/heads/develop'
+        run: |
+          curl \
+            -X POST \
+            -H "Authorization: token ${{ secrets.PERSONAL_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            https://api.github.com/repos/ehrbase/ehrbase/dispatches \
+            -d '{"event_type":"build-ehrbase-next"}'
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.9.0]
+ ### Added 
+ ### Fixed 
+
 ## [2.8.0]
  ### Added 
  ### Fixed 
@@ -381,3 +385,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [2.6.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.5.0...v2.6.0
 [2.7.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.6.0...v2.7.0
 [2.8.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.7.0...v2.8.0
+[2.9.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.8.0...v2.9.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.8.0</version>
+        <version>2.9.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/aql/src/test/java/org/ehrbase/openehr/sdk/aql/parser/AqlQueryVisitorTest.java b/aql/src/test/java/org/ehrbase/openehr/sdk/aql/parser/AqlQueryVisitorTest.java
@@ -21,22 +21,6 @@
 
 import org.junit.jupiter.api.Test;
 
-/*
- * Copyright (c) 2022. vitasystems GmbH and Hannover Medical School.
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 class AqlQueryVisitorTest {
 
     @Test

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.8.0</version>
+    <version>2.9.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -352,6 +352,18 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>1.19.7</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>1.19.7</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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.8.0</version>
+        <version>2.9.0</version>
     </parent>
 
     <artifactId>client</artifactId>
@@ -156,6 +156,16 @@
             <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>