Skip to content

AVRO-3852: Support Java 21 #2485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iemejia merged 1 commit into from
Sep 8, 2023
Merged

AVRO-3852: Support Java 21 #2485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/workflows/test-lang-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- '8'
- '11'
- '17'
- '19'
- '21-ea'
steps:
- uses: actions/checkout@v3

Expand All @@ -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

Expand All @@ -85,6 +76,7 @@ jobs:
- '8'
- '11'
- '17'
- '21-ea'
steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 6 additions & 0 deletions lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Member

@martin-g martin-g Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<maven.compiler.source>\${maven.compiler.source}</maven.compiler.source>
<source>\${maven.compiler.source}</source>

?

<maven.compiler.target>\${maven.compiler.target}</maven.compiler.target>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
26 changes: 13 additions & 13 deletions lang/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down