From 955f3212faa47bf2e9bcb8084c9a5b30bfd420dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 8 Sep 2023 11:44:13 +0200
Subject: [PATCH] AVRO-3852: Support Java 21

---
 .github/workflows/test-lang-java.yml          | 12 ++-------
 .../src/main/pom/pom.xml                      |  6 +++++
 lang/java/pom.xml                             | 26 +++++++++----------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index 00baf8a556a..1b1e304e202 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -43,7 +43,7 @@ jobs:
         - '8'
         - '11'
         - '17'
-        - '19'
+        - '21-ea'
     steps:
       - uses: actions/checkout@v3
 
@@ -56,20 +56,11 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Setup Temurin JDK
-        if: matrix.java == '8' || matrix.java == '11' || matrix.java == '17'
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - name: Setup Oracle JDK
-        if: matrix.java == '18' || matrix.java == '19'
-        uses: oracle-actions/setup-java@v1
-        with:
-          website: jdk.java.net
-          release: ${{ matrix.java }}
-          version: latest
-
       - name: Lint
         run: ./build.sh lint
 
@@ -85,6 +76,7 @@ jobs:
         - '8'
         - '11'
         - '17'
+        - '21-ea'
     steps:
       - uses: actions/checkout@v3
 
diff --git a/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
index d8d6d7685f2..69063eb2919 100644
--- a/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
+++ b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
@@ -34,6 +34,8 @@
 
   <properties>
     <avro.version>${project.version}</avro.version>
+    <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+    <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
     <jackson-bom.version>${jackson-bom.version}</jackson-bom.version>
     <junit5.version>${junit5.version}</junit5.version>
     <logback.version>1.2.3</logback.version>
@@ -137,6 +139,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <maven.compiler.source>\${maven.compiler.source}</maven.compiler.source>
+          <maven.compiler.target>\${maven.compiler.target}</maven.compiler.target>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index e83897b368d..daf3167ab75 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -37,37 +37,37 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 
     <!-- version properties for dependencies -->
+    <ant.version>1.10.13</ant.version>
+    <commons-cli.version>1.5.0</commons-cli.version>
+    <commons-compress.version>1.22</commons-compress.version>
+    <commons-text.version>1.10.0</commons-text.version>
+    <grpc.version>1.57.1</grpc.version>
     <hadoop.version>3.3.5</hadoop.version>
+    <hamcrest.version>2.2</hamcrest.version>
     <jackson-bom.version>2.15.2</jackson-bom.version>
-    <servlet-api.version>4.0.1</servlet-api.version>
     <jetty.version>9.4.51.v20230217</jetty.version>
     <jopt-simple.version>5.0.4</jopt-simple.version>
     <junit5.version>5.10.0</junit5.version>
+    <maven-core.version>3.3.9</maven-core.version>
+    <mockito.version>4.11.0</mockito.version>
     <netty.version>4.1.96.Final</netty.version>
     <protobuf.version>3.24.0</protobuf.version>
-    <thrift.version>0.16.0</thrift.version>
-    <slf4j.version>1.7.36</slf4j.version>
     <reload4j.version>1.2.25</reload4j.version>
+    <servlet-api.version>4.0.1</servlet-api.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <snappy.version>1.1.10.3</snappy.version>
-    <velocity.version>2.3</velocity.version>
-    <maven-core.version>3.3.9</maven-core.version>
-    <ant.version>1.10.13</ant.version>
-    <commons-cli.version>1.5.0</commons-cli.version>
-    <commons-compress.version>1.22</commons-compress.version>
-    <commons-text.version>1.10.0</commons-text.version>
+    <thrift.version>0.16.0</thrift.version>
     <tukaani.version>1.9</tukaani.version>
-    <mockito.version>4.11.0</mockito.version>
-    <hamcrest.version>2.2</hamcrest.version>
-    <grpc.version>1.57.1</grpc.version>
+    <velocity.version>2.3</velocity.version>
     <zstd-jni.version>1.5.5-5</zstd-jni.version>
     <!-- version properties for plugins -->
     <archetype-plugin.version>3.2.1</archetype-plugin.version>
     <bundle-plugin-version>5.1.8</bundle-plugin-version>
+    <cyclonedx-maven-plugin.version>2.7.9</cyclonedx-maven-plugin.version>
     <exec-plugin.version>3.1.0</exec-plugin.version>
     <file-management.version>3.1.0</file-management.version>
     <javacc-plugin.version>3.0.3</javacc-plugin.version>
     <javacc.version>7.0.12</javacc.version>
-    <cyclonedx-maven-plugin.version>2.7.9</cyclonedx-maven-plugin.version>
   </properties>
 
   <modules>