From a9945761183c3799bf80216cc3b6bd1248459e93 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Fri, 13 Oct 2023 18:21:46 +0200
Subject: [PATCH] Run the virtual threads tests with Java 21

---
 .github/workflows/ci-actions-incremental.yml                | 6 +++---
 .../src/main/resources/application.properties               | 2 --
 .../src/main/resources/application.properties               | 2 --
 .../src/main/resources/application.properties               | 2 --
 .../src/main/resources/application.properties               | 2 --
 .../src/main/resources/application.properties               | 3 +--
 integration-tests/virtual-threads/pom.xml                   | 3 +--
 .../src/main/resources/application.properties               | 3 ---
 .../src/main/resources/application.properties               | 4 +---
 .../src/main/resources/application.properties               | 1 -
 .../src/main/resources/application.properties               | 1 -
 .../src/main/resources/application.properties               | 3 ---
 .../src/main/resources/application.properties               | 1 -
 .../src/main/resources/application.properties               | 3 +--
 14 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
index 4423a550a06ea..d9d32558c5bd1 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -771,11 +771,11 @@ jobs:
           path: .
       - name: Extract .m2/repository/io/quarkus
         run: tar -xzf m2-io-quarkus.tgz -C ~
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 20
+          java-version: 21
       # We do this so we can get better analytics for the downloaded version of the build images
       - name: Update Docker Client User Agent
         run: |
@@ -785,7 +785,7 @@ jobs:
           TEST_MODULES: ${{matrix.test-modules}}
           CONTAINER_BUILD: ${{startsWith(matrix.os-name, 'windows') && 'false' || 'true'}}
         run: |
-          export LANG=en_US && ./mvnw $COMMON_MAVEN_ARGS -f integration-tests/virtual-threads -pl "$TEST_MODULES" $NATIVE_TEST_MAVEN_ARGS -Dextra-args=--enable-preview -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-20
+          export LANG=en_US && ./mvnw $COMMON_MAVEN_ARGS -f integration-tests/virtual-threads -pl "$TEST_MODULES" $NATIVE_TEST_MAVEN_ARGS -Dextra-args=--enable-preview -Dquarkus.native.container-build=true
       - name: Upload build reports (if build failed)
         uses: actions/upload-artifact@v3
         if: ${{ failure() || cancelled() }}
diff --git a/integration-tests/virtual-threads/amqp-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/amqp-virtual-threads/src/main/resources/application.properties
index f212b575de362..f6768433c2a8a 100644
--- a/integration-tests/virtual-threads/amqp-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/amqp-virtual-threads/src/main/resources/application.properties
@@ -3,5 +3,3 @@ mp.messaging.incoming.prices.broadcast=true
 mp.messaging.outgoing.prices-out.address=prices
 
 smallrye.messaging.worker.<virtual-thread>.max-concurrency=10
-
-quarkus.native.additional-build-args=--enable-preview
diff --git a/integration-tests/virtual-threads/grpc-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/grpc-virtual-threads/src/main/resources/application.properties
index c5e8d4afaaaf6..7646bf42cfd05 100644
--- a/integration-tests/virtual-threads/grpc-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/grpc-virtual-threads/src/main/resources/application.properties
@@ -3,7 +3,5 @@ quarkus.grpc.clients.service.port=9001
 
 %vertx.quarkus.grpc.server.use-separate-server=false
 
-quarkus.native.additional-build-args=--enable-preview
-
 %vertx.quarkus.grpc.clients.service.port=8081
 %vertx.quarkus.grpc.clients.service.use-quarkus-grpc-client=true
diff --git a/integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties
index 176a3abff2075..57d7613b5e8e5 100644
--- a/integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties
@@ -4,7 +4,5 @@ mp.messaging.outgoing.prices-out.destination=prices
 
 smallrye.messaging.worker.<virtual-thread>.max-concurrency=5
 
-quarkus.native.additional-build-args=--enable-preview
-
 quarkus.artemis.devservices.enabled=true
 quarkus.artemis.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:1.0.18
diff --git a/integration-tests/virtual-threads/kafka-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/kafka-virtual-threads/src/main/resources/application.properties
index c361e848bc491..ad3c16899286a 100644
--- a/integration-tests/virtual-threads/kafka-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/kafka-virtual-threads/src/main/resources/application.properties
@@ -4,5 +4,3 @@ mp.messaging.incoming.prices.auto.offset.reset=earliest
 mp.messaging.outgoing.prices-out.topic=prices
 
 smallrye.messaging.worker.<virtual-thread>.max-concurrency=10
-
-quarkus.native.additional-build-args=--enable-preview
diff --git a/integration-tests/virtual-threads/mailer-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/mailer-virtual-threads/src/main/resources/application.properties
index 182aeaefac333..9d56807a66e4e 100644
--- a/integration-tests/virtual-threads/mailer-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/mailer-virtual-threads/src/main/resources/application.properties
@@ -1,3 +1,2 @@
-quarkus.native.additional-build-args=--enable-preview
 quarkus.mailer.mock=false
-quarkus.mailer.from=roger-the-robot@quarkus.io
\ No newline at end of file
+quarkus.mailer.from=roger-the-robot@quarkus.io
diff --git a/integration-tests/virtual-threads/pom.xml b/integration-tests/virtual-threads/pom.xml
index 853d39c10638b..5565ea6fa1dcc 100644
--- a/integration-tests/virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/pom.xml
@@ -103,7 +103,7 @@
                             <maven.home>${maven.home}</maven.home>
                         </systemPropertyVariables>
                         <!-- gradle scan capture test logging disabled: System.out in virtual threads cause pinning when enabled. -->
-                        <argLine>--enable-preview -Djdk.tracePinnedThreads -Dgradle.scan.captureTestLogging=false</argLine>
+                        <argLine>-Djdk.tracePinnedThreads -Dgradle.scan.captureTestLogging=false</argLine>
                         <skipTests>${skipTests}</skipTests>
                     </configuration>
                 </plugin>
@@ -130,7 +130,6 @@
                     <version>${version.compiler.plugin}</version>
                     <configuration>
                         <compilerArgs>
-                            <arg>--enable-preview</arg>
                             <arg>-parameters</arg>
                         </compilerArgs>
                     </configuration>
diff --git a/integration-tests/virtual-threads/quartz-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/quartz-virtual-threads/src/main/resources/application.properties
index 43b1e230c2184..e69de29bb2d1d 100644
--- a/integration-tests/virtual-threads/quartz-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/quartz-virtual-threads/src/main/resources/application.properties
@@ -1,3 +0,0 @@
-quarkus.native.additional-build-args=--enable-preview
-
-quarkus.package.quiltflower.enabled=true
\ No newline at end of file
diff --git a/integration-tests/virtual-threads/redis-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/redis-virtual-threads/src/main/resources/application.properties
index 651500d04fd6d..83f9967b1c962 100644
--- a/integration-tests/virtual-threads/redis-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/redis-virtual-threads/src/main/resources/application.properties
@@ -1,4 +1,2 @@
-quarkus.native.additional-build-args=--enable-preview
-
 quarkus.cache.redis.value-type=java.lang.String
-quarkus.cache.redis.ttl=10s
\ No newline at end of file
+quarkus.cache.redis.ttl=10s
diff --git a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/main/resources/application.properties
index 0bdbbf4a0cfe7..e69de29bb2d1d 100644
--- a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/main/resources/application.properties
@@ -1 +0,0 @@
-quarkus.native.additional-build-args=--enable-preview
diff --git a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/main/resources/application.properties
index 0632584e49a8d..e69de29bb2d1d 100644
--- a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/main/resources/application.properties
@@ -1 +0,0 @@
-quarkus.native.additional-build-args=--enable-preview
\ No newline at end of file
diff --git a/integration-tests/virtual-threads/scheduler-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/scheduler-virtual-threads/src/main/resources/application.properties
index 43b1e230c2184..e69de29bb2d1d 100644
--- a/integration-tests/virtual-threads/scheduler-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/scheduler-virtual-threads/src/main/resources/application.properties
@@ -1,3 +0,0 @@
-quarkus.native.additional-build-args=--enable-preview
-
-quarkus.package.quiltflower.enabled=true
\ No newline at end of file
diff --git a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/main/resources/application.properties b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/main/resources/application.properties
index 0bdbbf4a0cfe7..e69de29bb2d1d 100644
--- a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/main/resources/application.properties
@@ -1 +0,0 @@
-quarkus.native.additional-build-args=--enable-preview
diff --git a/integration-tests/virtual-threads/virtual-threads-disabled/src/main/resources/application.properties b/integration-tests/virtual-threads/virtual-threads-disabled/src/main/resources/application.properties
index c97efe2603807..4ac0c01bba146 100644
--- a/integration-tests/virtual-threads/virtual-threads-disabled/src/main/resources/application.properties
+++ b/integration-tests/virtual-threads/virtual-threads-disabled/src/main/resources/application.properties
@@ -1,2 +1 @@
-quarkus.native.additional-build-args=--enable-preview
-quarkus.virtual-threads.enabled=false
\ No newline at end of file
+quarkus.virtual-threads.enabled=false