Merge branch 'main' into fix/improve-error-handling

GIScience · Feb 19, 2024 · 05f3e68 · 05f3e68
2 parents b47ccb5 + 057625a
commit 05f3e68
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/docker-build-and-test.yml b/.github/workflows/docker-build-and-test.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         id: buildx
@@ -84,7 +84,7 @@ jobs:
             echo "HEALTH_WAIT_TIME=260" >> $GITHUB_ENV
           fi
       - name: Set up QEMU for ${{ matrix.platform }}
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: ${{ matrix.platform }}
       - name: Set up Docker Buildx

diff --git a/.github/workflows/vulnerability-scanning.yml b/.github/workflows/vulnerability-scanning.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Set up QEMU for ${{ matrix.platform }}
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: ${{ matrix.platform }}
       - name: Set up Docker Buildx

diff --git a/Dockerfile b/Dockerfile
@@ -43,8 +43,8 @@ COPY ors-engine /ors-core/ors-engine
 COPY pom.xml /ors-core/pom.xml
 COPY ors-report-aggregation /ors-core/ors-report-aggregation
 
-# Build the project and ignore the report aggregation module as not needed for the API
-RUN mvn package -DskipTests -pl '!ors-report-aggregation'
+# Build the project and ignore the report aggregation module as not needed for the API build war
+RUN mvn package -DskipTests -P buildWar
 
 # build final image, just copying stuff inside
 FROM amazoncorretto:17.0.7-alpine3.17 as publish

diff --git a/ors-api/pom.xml b/ors-api/pom.xml
@@ -39,15 +39,6 @@
 
     <packaging>${packagingValue}</packaging>
 
-    <properties>
-        <!--
-            A default for packagingValue is needed, if profiles other than buildWar or buildFatJar are used, e.g. apitests.
-            The value is set/overridden in the profiles buildWar and buildFatJar, e.g.
-                mvn clean package -PbuildWar
-         -->
-        <packagingValue>jar</packagingValue>
-    </properties>
-
     <build>
         <finalName>ors</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -290,21 +281,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>buildWar</id>
-            <properties>
-                <packagingValue>war</packagingValue>
-            </properties>
-        </profile>
-        <profile>
-            <id>buildFatJar</id>
-            <properties>
-                <packagingValue>jar</packagingValue>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
         <profile>
             <id>apitests</id>
             <build>

diff --git a/ors-report-aggregation/pom.xml b/ors-report-aggregation/pom.xml
@@ -23,7 +23,7 @@
             <groupId>org.heigit.ors</groupId>
             <artifactId>ors-api</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
+            <type>${packagingValue}</type>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,12 @@
     </modules>
 
     <properties>
+        <!--
+            A default for packagingValue is needed, if profiles other than buildWar or buildFatJar are used, e.g. apitests.
+            The value is set/overridden in the profiles buildWar and buildFatJar, e.g.
+                mvn clean package -PbuildWar
+         -->
+        <packagingValue>jar</packagingValue>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -81,6 +87,24 @@
         </repository>
     </repositories>
 
+    <profiles>
+        <profile>
+            <id>buildWar</id>
+            <properties>
+                <packagingValue>war</packagingValue>
+            </properties>
+        </profile>
+        <profile>
+            <id>buildFatJar</id>
+            <properties>
+                <packagingValue>jar</packagingValue>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
+
     <dependencyManagement>
         <dependencies>
             <!-- As long as swagger-parser uses snakeyaml <2 it cannot be used. Too much vulnerabilities. -->