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.

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

Upgrade to Java 21 #1

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+21 −17
Open

Upgrade to Java 21 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
97f9b2d
Upgrade to Java 21
bgprudhomme Aug 1, 2024
cbe147c
Update pr-verify.yml
bgprudhomme Aug 1, 2024
3453e25
Update develop-status.yml
bgprudhomme Aug 1, 2024
b7fda51
Update main-status.yml
bgprudhomme Aug 1, 2024
ea5da63
Update pr-verify.yml
bgprudhomme Aug 1, 2024
a88a13e
Update pr-verify.yml
bgprudhomme Aug 2, 2024
18c9ffb
Update develop-status.yml
bgprudhomme Aug 2, 2024
f7d1852
Update main-status.yml
bgprudhomme Aug 2, 2024
2e11c90
Update develop-status.yml
bgprudhomme Aug 2, 2024
59c722c
Update main-status.yml
bgprudhomme Aug 2, 2024
6523266
Update Dockerfile
bgprudhomme Aug 2, 2024
5875eb5
Update pr-verify.yml
bgprudhomme Aug 2, 2024
14411bc
Update pom.xml
bgprudhomme Aug 3, 2024
f258bf5
Revert "Update pom.xml"
bgprudhomme Aug 3, 2024
462c8f1
Update Dockerfile
bgprudhomme Aug 4, 2024
74b8f37
Add Java 21.
khatchad Dec 11, 2024
d888890
Revert "Add Java 21."
khatchad Dec 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/develop-status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk: [11, 17]
jdk: [21]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk: [11, 17]
jdk: [21]

steps:
- uses: actions/checkout@v2
Expand Down
29 changes: 16 additions & 13 deletions .github/workflows/pr-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk: [11, 21]
jdk: [21]
steps:
- uses: actions/checkout@v2
- name: Set up JDK
Expand Down Expand Up @@ -46,14 +46,14 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 21
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-jdk21-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-jdk11-maven-
${{ runner.os }}-jdk21-maven-
- name: Check formatting
run: mvn -B formatter:validate impsort:check xml-format:xml-check
- name: Build
Expand All @@ -79,14 +79,14 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 21
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-jdk21-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-jdk11-maven-
${{ runner.os }}-jdk21-maven-
- name: Check formatting
run: mvn -B formatter:validate impsort:check xml-format:xml-check
- name: Build
Expand All @@ -105,14 +105,14 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 21
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-jdk21-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-jdk11-maven-
${{ runner.os }}-jdk21-maven-
- name: Run install
run: mvn -B install -DskipTests
- name: Package assembly
Expand All @@ -131,14 +131,14 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 21
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-jdk21-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-jdk11-maven-
${{ runner.os }}-jdk21-maven-
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libxml2-utils
- name: Install Node.js
Expand All @@ -148,6 +148,9 @@ jobs:
- name: Run end-to-end tests of RDF4J Server and Workbench
working-directory: ./e2e
run: ./run.sh
- name: Print Docker logs on failure
if: failure()
run: docker compose logs
- name: Cancel workflow on failure
uses: vishnudxb/[email protected]
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WORKDIR /tmp
RUN unzip -q /tmp/rdf4j.zip

# Final workbench
FROM tomcat:8.5-jre11-temurin
FROM tomcat:8.5.100-jdk21-temurin
MAINTAINER Bart Hanssens ([email protected])

RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get clean
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.11.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -352,7 +353,7 @@
</profile>
</profiles>
<properties>
<java.version>11</java.version>
<java.version>21</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.source>${java.version}</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Loading