move to testcontainer (#575)

ehrbase · Apr 2, 2024 · b9c1412 · b9c1412
1 parent 157ff1c
commit b9c1412
Show file tree

Hide file tree

Showing 66 changed files with 444 additions and 7,148 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/bom/pom.xml b/bom/pom.xml
@@ -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
@@ -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>