Compilation using JDK 21.

Signed-off-by: Santiago Pericas-Geertsen <[email protected]>
spericas · Nov 19, 2024 · 06f9550 · 06f9550
1 parent 699db91
commit 06f9550
Show file tree

Hide file tree

Showing 45 changed files with 63 additions and 95 deletions.
diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -77,7 +77,7 @@
                         <systemPropertyVariables>
                             <java.util.logging.config.file>${project.build.outputDirectory}/logging.properties</java.util.logging.config.file>
                         </systemPropertyVariables>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -87,7 +87,7 @@
                     <configuration>
                         <useModulePath>false</useModulePath>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -160,7 +160,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
-                        <defaultJvmOptions>--enable-preview</defaultJvmOptions>
+                        <defaultJvmOptions></defaultJvmOptions>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -206,7 +206,7 @@
                                 <buildArgs>
                                     <!-- Some native image features use the svm dependencies which require additional exports -->
                                     <arg>--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED</arg>
-                                    <arg>--enable-preview</arg>
+                                    <arg></arg>
                                 </buildArgs>
                             </configuration>
                         </execution>

diff --git a/examples/integrations/neo4j/neo4j-se/pom.xml b/examples/integrations/neo4j/neo4j-se/pom.xml
@@ -128,7 +128,7 @@
                      as the database process is separate from the application
                      -->
                     <argLine>
-                        --enable-preview
+
                         --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
                         --add-opens=java.base/java.lang=ALL-UNNAMED
                         --add-opens=java.base/java.lang.reflect=ALL-UNNAMED

diff --git a/examples/jbatch/pom.xml b/examples/jbatch/pom.xml
@@ -110,7 +110,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>

diff --git a/examples/media/multipart/pom.xml b/examples/media/multipart/pom.xml
@@ -93,7 +93,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>

diff --git a/examples/microprofile/static-content/pom.xml b/examples/microprofile/static-content/pom.xml
@@ -90,14 +90,14 @@
                         <exclude>**/*$*</exclude>
                         <exclude>io/helidon/microprofile/example/staticc/StaticContentTest.java</exclude>
                     </excludes>
-                    <argLine>--enable-preview</argLine>
+                    <argLine></argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
-                    <argLine>--enable-preview</argLine>
+                    <argLine></argLine>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/examples/nima/quickstart-standalone/pom.xml b/examples/nima/quickstart-standalone/pom.xml
@@ -133,7 +133,7 @@
                     <version>${version.plugin.compiler}</version>
                     <configuration>
                         <compilerArgs>
-                            <compilerArg>--enable-preview</compilerArg>
+                            <compilerArg></compilerArg>
                         </compilerArgs>
                     </configuration>
                 </plugin>
@@ -143,7 +143,7 @@
                     <version>${version.plugin.surefire}</version>
                     <configuration>
                         <useModulePath>false</useModulePath>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                         <trimStackTrace>false</trimStackTrace>
                     </configuration>
                 </plugin>
@@ -154,7 +154,7 @@
                     <configuration>
                         <useModulePath>false</useModulePath>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
@@ -109,7 +109,7 @@
                         <systemPropertyVariables>
                             <java.util.logging.config.file>${project.build.outputDirectory}/logging.properties</java.util.logging.config.file>
                         </systemPropertyVariables>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
@@ -127,7 +127,7 @@
                         <systemPropertyVariables>
                             <java.util.logging.config.file>${project.build.outputDirectory}/logging.properties</java.util.logging.config.file>
                         </systemPropertyVariables>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/examples/webserver/threadpool/pom.xml b/examples/webserver/threadpool/pom.xml
@@ -97,7 +97,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>

diff --git a/graphql/server/pom.xml b/graphql/server/pom.xml
@@ -63,7 +63,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>

diff --git a/messaging/connectors/aq/pom.xml b/messaging/connectors/aq/pom.xml
@@ -97,7 +97,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>
@@ -113,7 +113,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <additionalOptions>
-                        <additionalOption>--enable-preview</additionalOption>
+                        <additionalOption></additionalOption>
                     </additionalOptions>
                 </configuration>
             </plugin>

diff --git a/messaging/connectors/jms/pom.xml b/messaging/connectors/jms/pom.xml
@@ -106,7 +106,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>
@@ -122,7 +122,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <additionalOptions>
-                        <additionalOption>--enable-preview</additionalOption>
+                        <additionalOption></additionalOption>
                     </additionalOptions>
                 </configuration>
             </plugin>

diff --git a/messaging/messaging/pom.xml b/messaging/messaging/pom.xml
@@ -88,7 +88,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>
@@ -104,7 +104,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <additionalOptions>
-                        <additionalOption>--enable-preview</additionalOption>
+                        <additionalOption></additionalOption>
                     </additionalOptions>
                 </configuration>
             </plugin>

diff --git a/metrics/metrics/pom.xml b/metrics/metrics/pom.xml
@@ -97,7 +97,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/microprofile/fault-tolerance/pom.xml b/microprofile/fault-tolerance/pom.xml
@@ -128,7 +128,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/microprofile/graphql/server/pom.xml b/microprofile/graphql/server/pom.xml
@@ -89,31 +89,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                        <!-- phase is 'process-classes by default' -->
-                        <phase>integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet>
-                                    <directory>${project.build.directory}/classes</directory>
-                                </fileSet>
-                                <fileSet>
-                                    <directory>${project.build.directory}/test-classes</directory>
-                                </fileSet>
-                            </fileSets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/microprofile/grpc/metrics/pom.xml b/microprofile/grpc/metrics/pom.xml
@@ -111,7 +111,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>--enable-preview</argLine>
+                    <argLine></argLine>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/microprofile/lra/jax-rs/pom.xml b/microprofile/lra/jax-rs/pom.xml
@@ -105,7 +105,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/microprofile/server/pom.xml b/microprofile/server/pom.xml
@@ -174,7 +174,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/microprofile/tests/tck/pom.xml b/microprofile/tests/tck/pom.xml
@@ -68,7 +68,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
-                        <argLine>--enable-preview</argLine>
+                        <argLine></argLine>
                     </configuration>
                     <dependencies>
                         <dependency>

diff --git a/microprofile/tests/tck/tck-config/pom.xml b/microprofile/tests/tck/tck-config/pom.xml
@@ -81,7 +81,7 @@
                             <suiteXmlFile>src/test/tck-suite.xml</suiteXmlFile>
                         </suiteXmlFiles>
                         <!-- required for Weld -->
-                        <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --enable-preview</argLine>
+                        <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED </argLine>
                         <systemPropertyVariables>
                             <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
                             <config_ordinal>120</config_ordinal>

diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml
@@ -61,7 +61,7 @@
                     <argLine>
                         --add-opens=java.base/java.lang=ALL-UNNAMED
                         --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-                        --enable-preview
+
                     </argLine>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/tck-suite.xml</suiteXmlFile>

diff --git a/microprofile/tracing/pom.xml b/microprofile/tracing/pom.xml
@@ -110,7 +110,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/microprofile/websocket/pom.xml b/microprofile/websocket/pom.xml
@@ -32,7 +32,7 @@
     <description>Helidon MP integration with Tyrus</description>
 
     <properties>
-        <surefire.argLine>-Dmp.initializer.allow=true --enable-preview</surefire.argLine>
+        <surefire.argLine>-Dmp.initializer.allow=true </surefire.argLine>
     </properties>
 
     <dependencies>
@@ -116,7 +116,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>

diff --git a/nima/fault-tolerance/pom.xml b/nima/fault-tolerance/pom.xml
@@ -72,7 +72,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <compilerArg>--enable-preview</compilerArg>
+                        <compilerArg></compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>
@@ -81,7 +81,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <additionalOptions>
-                        <additionalOption>--enable-preview</additionalOption>
+                        <additionalOption></additionalOption>
                     </additionalOptions>
                 </configuration>
             </plugin>

diff --git a/nima/pom.xml b/nima/pom.xml
@@ -70,7 +70,7 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
                         <compilerArgs>
-                            <compilerArg>--enable-preview</compilerArg>
+                            <compilerArg></compilerArg>
                         </compilerArgs>
                     </configuration>
                 </plugin>
@@ -79,7 +79,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
                         <additionalOptions>
-                            <additionalOption>--enable-preview</additionalOption>
+                            <additionalOption></additionalOption>
                         </additionalOptions>
                     </configuration>
                 </plugin>

diff --git a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/LoomServer.java b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/LoomServer.java
@@ -145,7 +145,6 @@ class LoomServer implements WebServer {
 
         this.listeners = Map.copyOf(listeners);
         this.executorService = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
-                                                                          .allowSetThreadLocals(true)
                                                                           .inheritInheritableThreadLocals(inheritThreadLocals)
                                                                           .factory());
     }

diff --git a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerListener.java b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerListener.java
@@ -95,21 +95,18 @@ class ServerListener implements ListenerContext {
         this.context = listenerConfig.context();
 
         this.serverThread = Thread.ofPlatform()
-                .allowSetThreadLocals(true)
                 .inheritInheritableThreadLocals(true)
                 .daemon(false)
                 .name("server-" + socketName + "-listener")
                 .unstarted(this::listen);
 
         // to read requests and execute tasks
         this.readerExecutor = ThreadPerTaskExecutor.create(Thread.ofVirtual()
-                                                                         .allowSetThreadLocals(true)
                                                                          .inheritInheritableThreadLocals(inheritThreadLocals)
                                                                          .factory());
 
         // to do anything else (writers etc.)
         this.sharedExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
-                                                                         .allowSetThreadLocals(true)
                                                                          .inheritInheritableThreadLocals(inheritThreadLocals)
                                                                          .factory());