From 6a22ac8a0274a52a545615f8b90bce0d123f1420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Tue, 26 Sep 2023 09:05:12 +0200
Subject: [PATCH 1/4] AVRO-3852: Upgrade CI tests to Java 21 GA release

---
 .github/workflows/test-lang-java.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index cb493ac00cd..0c235e62f0f 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -43,7 +43,7 @@ jobs:
         - '8'
         - '11'
         - '17'
-        - '21-ea'
+        - '21'
     steps:
       - uses: actions/checkout@v4
 
@@ -76,7 +76,7 @@ jobs:
         - '8'
         - '11'
         - '17'
-        - '21-ea'
+        - '21'
     steps:
       - uses: actions/checkout@v4
 

From fbe04ef8abd21233a103359d0e278a59f897b048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Tue, 26 Sep 2023 09:47:56 +0200
Subject: [PATCH 2/4] AVRO-3852: Fix maven archetype generation for multiple
 Java versions

---
 .../archetypes/avro-service-archetype/src/main/pom/pom.xml  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 399bbea940b..2685648e776 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
@@ -37,8 +37,6 @@
     <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
     <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
     <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>
@@ -143,8 +141,8 @@
         <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>
+          <source>\${maven.compiler.source}</source>
+          <target>\${maven.compiler.target}</target>
         </configuration>
       </plugin>
     </plugins>

From a554156a716336ee59d70f8f4f465f90cd9178e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 20 Oct 2023 22:29:03 +0200
Subject: [PATCH 3/4] AVRO-3852: Test with JDK 22 EA distribution

---
 .github/workflows/test-lang-java.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index 0c235e62f0f..7aaf1b9ce77 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -44,6 +44,7 @@ jobs:
         - '11'
         - '17'
         - '21'
+        - '22-ea'
     steps:
       - uses: actions/checkout@v4
 
@@ -77,6 +78,7 @@ jobs:
         - '11'
         - '17'
         - '21'
+        - '22-ea'
     steps:
       - uses: actions/checkout@v4
 

From 752fa23a2c75e3773e7cb203ce8b5274576ac534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 20 Oct 2023 22:59:02 +0200
Subject: [PATCH 4/4] AVRO-3852: Fix maven archetype integration test

---
 .../projects/basic/archetype.properties                           | 0
 .../src/test/{integration => resources}/projects/basic/goal.txt   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename lang/java/archetypes/avro-service-archetype/src/test/{integration => resources}/projects/basic/archetype.properties (100%)
 rename lang/java/archetypes/avro-service-archetype/src/test/{integration => resources}/projects/basic/goal.txt (100%)

diff --git a/lang/java/archetypes/avro-service-archetype/src/test/integration/projects/basic/archetype.properties b/lang/java/archetypes/avro-service-archetype/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from lang/java/archetypes/avro-service-archetype/src/test/integration/projects/basic/archetype.properties
rename to lang/java/archetypes/avro-service-archetype/src/test/resources/projects/basic/archetype.properties
diff --git a/lang/java/archetypes/avro-service-archetype/src/test/integration/projects/basic/goal.txt b/lang/java/archetypes/avro-service-archetype/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from lang/java/archetypes/avro-service-archetype/src/test/integration/projects/basic/goal.txt
rename to lang/java/archetypes/avro-service-archetype/src/test/resources/projects/basic/goal.txt