This is an automated email from the ASF dual-hosted git repository.
iemejia pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new eeb1f02d3 AVRO-3852: Upgrade CI tests to Java 21 GA release (#2525)
eeb1f02d3 is described below
commit eeb1f02d3b8e8543384a425b2974c32f1e78f14b
Author: Ismaël Mejía <[email protected]>
AuthorDate: Mon Oct 23 08:36:25 2023 +0200
AVRO-3852: Upgrade CI tests to Java 21 GA release (#2525)
* AVRO-3852: Upgrade CI tests to Java 21 GA release
* AVRO-3852: Fix maven archetype generation for multiple Java versions
* AVRO-3852: Test with JDK 22 EA distribution
* AVRO-3852: Fix maven archetype integration test
---
.github/workflows/test-lang-java.yml | 6 ++++--
lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml | 6 ++----
.../{integration => resources}/projects/basic/archetype.properties | 0
.../src/test/{integration => resources}/projects/basic/goal.txt | 0
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/test-lang-java.yml
b/.github/workflows/test-lang-java.yml
index cb493ac00..7aaf1b9ce 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 399bbea94..2685648e7 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>
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
