diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index cb493ac00cd..7aaf1b9ce77 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -43,7 +43,8 @@ jobs:
- '8'
- '11'
- '17'
- - '21-ea'
+ - '21'
+ - '22-ea'
steps:
- uses: actions/checkout@v4
@@ -76,7 +77,8 @@ jobs:
- '8'
- '11'
- '17'
- - '21-ea'
+ - '21'
+ - '22-ea'
steps:
- uses: actions/checkout@v4
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}
${project.build.sourceEncoding}
${project.version}
- ${maven.compiler.source}
- ${maven.compiler.target}
${jackson-bom.version}
${junit5.version}
1.2.3
@@ -143,8 +141,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- \${maven.compiler.source}
- \${maven.compiler.target}
+
+ \${maven.compiler.target}
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