Skip to content
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.

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

[bugfix] Make build compatible with Java18 and beyond. #5376

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
jvm: ['17', '21']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{ env.DEV_JDK }}
java-version: ${{ matrix.jvm }}
cache: 'maven'
- name: Install Maven Daemon
id: install-mvnd
Expand Down Expand Up @@ -77,7 +78,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-build-logs
name: ${{ runner.os }}-${{ matrix.jvm }}-build-logs
retention-days: 5
path: |
**/*.jfr
Expand Down
4 changes: 2 additions & 2 deletions exist-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1067,9 +1067,9 @@ The BaseX Team. The original license statement is also included below.]]></pream
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.omnifaces</groupId>
<artifactId>antlr-maven-plugin</artifactId>
<version>2.2</version>
<version>2.3</version>
<configuration>
<grammars>
org/exist/xquery/parser/XQuery.g,org/exist/xquery/parser/XQueryTree.g,org/exist/xquery/parser/DeclScanner.g,org/exist/xquery/xqdoc/parser/XQDocParser.g
Expand Down
4 changes: 2 additions & 2 deletions extensions/modules/simpleql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.omnifaces</groupId>
<artifactId>antlr-maven-plugin</artifactId>
<version>2.2</version>
<version>2.3</version>
<configuration>
<grammars>org/exist/xquery/modules/simpleql/SimpleQLParser.g</grammars>
</configuration>
Expand Down
Loading