From 82d72e3816339197071b9c87ab249fd46d72c9af Mon Sep 17 00:00:00 2001
From: Dennis Labordus <dennis.labordus@alliander.com>
Date: Thu, 9 Dec 2021 08:42:25 +0100
Subject: [PATCH] Changed NativeTest execution and moved back to Quarkus 2.4.2.

Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
---
 .github/workflows/build-project.yml                           | 2 +-
 app/pom.xml                                                   | 1 +
 .../compas/scl/auto/alignment/rest/NativeHealthCheckIT.java   | 4 ++--
 pom.xml                                                       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename app/src/{native-test => test}/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java (76%)

diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
index 37777d4..2942f99 100644
--- a/.github/workflows/build-project.yml
+++ b/.github/workflows/build-project.yml
@@ -50,7 +50,7 @@ jobs:
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
       - name: Build Native with Maven
         if: ${{ github.event_name == 'pull_request' }}
-        run: ./mvnw -s custom_maven_settings.xml -B clean verify -Pnative
+        run: ./mvnw -s custom_maven_settings.xml -B -Pnative clean verify
       - name: Build with Maven
         if: ${{ github.event_name == 'push' }}
         run: ./mvnw -s custom_maven_settings.xml -B clean verify
diff --git a/app/pom.xml b/app/pom.xml
index 416bd56..93781ce 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -146,6 +146,7 @@ SPDX-License-Identifier: Apache-2.0
             <properties>
                 <quarkus.package.type>native</quarkus.package.type>
                 <quarkus.native.container-build>true</quarkus.native.container-build> <!-- Allows for creating a Linux executable without GraalVM being installed -->
+                <quarkus.container-image.build>true</quarkus.container-image.build> <!-- Also make a Docker Image, so the native test will be executed against the container -->
             </properties>
 
             <build>
diff --git a/app/src/native-test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java b/app/src/test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java
similarity index 76%
rename from app/src/native-test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java
rename to app/src/test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java
index 5d6650d..727be09 100644
--- a/app/src/native-test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java
+++ b/app/src/test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.rest;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 class NativeHealthCheckIT extends HealthCheckTest {
     // Execute the same tests but in native mode.
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 68f2df5..0c0deba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0
 
         <compas.core.version>0.6.0</compas.core.version>
 
-        <quarkus.platform.version>2.5.1.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
         <slf4j.version>1.7.32</slf4j.version>
         <powsybl.sld.version>2.5.1</powsybl.sld.version>
         <gson.version>2.8.9</gson.version>