Changes necessary to compile M2 with JDK20.

Signed-off-by: Santiago Pericasgeertsen <[email protected]>
spericas · Oct 5, 2023 · 41dab86 · 41dab86
1 parent b636dde
commit 41dab86
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 15 deletions.
diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.source>20</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <maven.compiler.release>${maven.compiler.source}</maven.compiler.release>
         <version.plugin.compiler>3.11.0</version.plugin.compiler>
@@ -68,7 +68,7 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${version.plugin.compiler}</version>
                     <configuration>
-                        <proc>full</proc>
+                        <!-- proc>full</proc -->
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache
@@ -1,6 +1,6 @@
 
 # 1st stage, build the app
-FROM container-registry.oracle.com/java/openjdk:21 as build
+FROM container-registry.oracle.com/java/openjdk:20 as build
 
 # Install maven
 WORKDIR /usr/share
@@ -31,7 +31,7 @@ RUN mvn package -DskipTests
 RUN echo "done!"
 
 # 2nd stage, build the runtime image
-FROM container-registry.oracle.com/java/openjdk:21
+FROM container-registry.oracle.com/java/openjdk:20
 WORKDIR /helidon
 
 # Copy the binary built in the 1st stage

diff --git a/common/configurable/pom.xml b/common/configurable/pom.xml
@@ -88,6 +88,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                    <compilerArgs>--enable-preview</compilerArgs>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.helidon.config</groupId>

diff --git a/common/socket/pom.xml b/common/socket/pom.xml
@@ -65,6 +65,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                    <compilerArgs>--enable-preview</compilerArgs>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.helidon.config</groupId>

diff --git a/dbclient/jdbc/src/main/java/io/helidon/dbclient/jdbc/JdbcConnectionPool.java b/dbclient/jdbc/src/main/java/io/helidon/dbclient/jdbc/JdbcConnectionPool.java
@@ -73,7 +73,7 @@ static JdbcConnectionPool create(Config config) {
         if (poolProviders.isEmpty()) {
             throw new DbClientException("No JDBC connection pool provider is available");
         }
-        return poolProviders.getFirst().create(config, config.name());
+        return poolProviders.get(0).create(config, config.name());
     }
 
     /**

diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink b/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM container-registry.oracle.com/java/openjdk:21 as maven
+FROM container-registry.oracle.com/java/openjdk:20 as maven
 
 # Install maven
 WORKDIR /usr/share

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
@@ -29,7 +29,7 @@
         <helidon.version>4.0.0-M2</helidon.version>
         <mainClass>io.helidon.microprofile.cdi.Main</mainClass>
 
-        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.source>20</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <maven.site.skip>true</maven.site.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink
@@ -15,7 +15,7 @@
 #
 
 # 1st stage, build the app
-FROM container-registry.oracle.com/java/openjdk:21 as maven
+FROM container-registry.oracle.com/java/openjdk:20 as maven
 
 # Install maven
 WORKDIR /usr/share

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
@@ -30,7 +30,7 @@
         <helidon.version>4.0.0-M2</helidon.version>
         <mainClass>io.helidon.examples.quickstart.se.Main</mainClass>
 
-        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.source>20</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <maven.site.skip>true</maven.site.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/integrations/pom.xml b/integrations/pom.xml
@@ -63,6 +63,7 @@
                         <compilerArgs>
                             <arg>-Xlint:all</arg>
                             <arg>-parameters</arg>
+                            <arg>--enable-preview</arg>
                         </compilerArgs>
                     </configuration>
                 </plugin>

diff --git a/lra/coordinator/pom.xml b/lra/coordinator/pom.xml
@@ -31,6 +31,9 @@
     <name>Helidon LRA Coordinator Project</name>
 
     <packaging>pom</packaging>
+    <properties>
+        <java.version>20</java.version>
+    </properties>
 
     <modules>
         <module>client</module>

diff --git a/lra/coordinator/server/Dockerfile b/lra/coordinator/server/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM container-registry.oracle.com/java/openjdk:21 as build
+FROM container-registry.oracle.com/java/openjdk:20 as build
 
 WORKDIR /usr/share
 
@@ -41,7 +41,7 @@ RUN wget -q -O helidon_repo.zip https://github.com/${HELIDON_REPOSITORY}/archive
 RUN mvn install -pl :helidon-lra-coordinator-server -am -DskipTests && \
     echo "Helidon LRA Coordinator build successfully finished"
 
-FROM container-registry.oracle.com/java/openjdk:21
+FROM container-registry.oracle.com/java/openjdk:20
 WORKDIR /helidon
 
 COPY --from=build /helidon/lra/coordinator/server/target/helidon-lra-coordinator-server.jar ./

diff --git a/pom.xml b/pom.xml
@@ -35,14 +35,14 @@
     <description>Java libraries for writing microservices</description>
 
     <properties>
-        <version.java>21</version.java>
+        <version.java>20</version.java>
 
         <doclint>all</doclint>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <surefire.argLine>-Xmx1024m -Dfile.encoding=UTF-8</surefire.argLine>
-        <failsafe.argLine>-Xmx1024m -Dfile.encoding=UTF-8</failsafe.argLine>
+        <surefire.argLine>-Xmx1024m -Dfile.encoding=UTF-8 --enable-preview</surefire.argLine>
+        <failsafe.argLine>-Xmx1024m -Dfile.encoding=UTF-8 --enable-preview</failsafe.argLine>
         <surefire.coverage.argline />
         <failsafe.coverage.argline />
 
@@ -232,13 +232,14 @@
                         <target>${version.java}</target>
                         <release>${version.java}</release>
                         <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                        <proc>full</proc>
+                        <!-- proc>full</proc -->
                         <compilerArgs>
                             <arg>-Xlint:unchecked</arg>
                             <!--
                             https://issues.apache.org/jira/browse/MCOMPILER-368
                              -->
                             <arg>-Xpkginfo:always</arg>
+                            <arg>--enable-preview</arg>
                         </compilerArgs>
                     </configuration>
                     <dependencies>

diff --git a/webclient/api/pom.xml b/webclient/api/pom.xml
@@ -115,6 +115,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.helidon.common.features</groupId>

diff --git a/webserver/webserver/pom.xml b/webserver/webserver/pom.xml
@@ -167,6 +167,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.helidon.common.features</groupId>