Changed build of jvm/native image in POM and Actions.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

.github/workflows/build-project.yml

@@ -52,7 +52,7 @@ jobs:
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
       - name: Build with Maven (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
-        run: ./mvnw -s custom_maven_settings.xml -B -Pbuild-image clean verify
+        run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify
       - name: Build with Maven (Push)
         if: ${{ github.event_name == 'push' }}
         run: ./mvnw -s custom_maven_settings.xml -B clean verify

.github/workflows/release-project.yml

@@ -66,6 +66,6 @@ jobs:
           ./mvnw -B -s custom_maven_settings.xml \
                  -DaltDeploymentRepository=github-packages-compas::default::https://maven.pkg.github.com/com-pas/compas-scl-validator \
                  -Dmaven.deploy.skip=snapshots \
-                 -Pbuild-image,release clean deploy
+                 -Pjvm-image,release clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/pom.xml

@@ -170,18 +170,47 @@ SPDX-License-Identifier: Apache-2.0
 
     <profiles>
         <profile>
-            <id>build-image</id>
+            <id>jvm-image</id>
 
             <properties>
                 <!-- Make a Docker Image, so the integration tests will be executed against the container -->
                 <quarkus.container-image.build>true</quarkus.container-image.build>
             </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <java.util.logging.manager>
+                                            org.jboss.logmanager.LogManager
+                                        </java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>
-            <id>native</id>
+            <id>native-image</id>
 
             <properties>
+                <!-- Make a Docker Image, so the integration tests will be executed against the container -->
+                <quarkus.container-image.build>true</quarkus.container-image.build>
+
                 <quarkus.package.type>native</quarkus.package.type>
                 <!-- Allows for creating a Linux executable without GraalVM being installed -->
                 <quarkus.native.container-build>true</quarkus.native.container-build>
@@ -235,6 +264,9 @@ SPDX-License-Identifier: Apache-2.0
             <id>release</id>
 
             <properties>
+                <!-- Make a Docker Image from the component -->
+                <quarkus.container-image.build>true</quarkus.container-image.build>
+
                 <!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
                 <quarkus.container-image.push>true</quarkus.container-image.push>
                 <quarkus.container-image.additional-tags>latest</quarkus.container-image.additional-tags>

app/src/test/java/org/lfenergy/compas/scl/validator/rest/NativeHealthCheckIT.java renamed to app/src/test/java/org/lfenergy/compas/scl/validator/rest/HealthCheckIT.java

@@ -6,6 +6,6 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
-class NativeHealthCheckIT extends HealthCheckTest {
+class HealthCheckIT extends HealthCheckTest {
     // Execute the same tests but in native mode.
 }