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

upgrade to JKD21. Also upgrades groovy deps, as those would no longer build. #3643

Merged
merged 5 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
overwrite-settings: false

# Initializes the CodeQL tools for scanning.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
overwrite-settings: false
- name: Cache local Maven repository
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_autodoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21
- name: Build Backend
run: mvn install -T 1C -DskipTests -pl '!executable'
- name: Run AutoDoc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
overwrite-settings: false
- name: Build Backend
run: mvn -T 1C install -pl backend -DskipTests -am
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
overwrite-settings: false

- name: Build Backend
Expand Down
2 changes: 1 addition & 1 deletion backend.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY .git .
RUN git describe --tags | sed 's/^v//' > git_describe.txt

# Builder
FROM maven:3.8-openjdk-17-slim AS builder
FROM maven:3.9-eclipse-temurin-21 AS builder

WORKDIR /app

Expand Down
5 changes: 2 additions & 3 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,9 @@
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.13</version>
<classifier>indy</classifier>
<version>4.0.24</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
</parent>

<properties>
<java.required>17</java.required>
<lombok.version>1.18.24</lombok.version>
<java.required>21</java.required>
<lombok.version>1.18.36</lombok.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>${java.required}</maven.compiler.source>
<maven.compiler.target>${java.required}</maven.compiler.target>
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssXXX</maven.build.timestamp.format>
<build.time>${maven.build.timestamp}</build.time>
<revision>0.0.0-SNAPSHOT</revision>
Expand Down
Loading