Skip to content

Commit 78d3c17

Browse files
committed
Update Java to v25. Upgrade spring boot to 3.5.6.
Also spotless to 3.0.0, immutables to 2.11.6. Fix JOOQ deprecated exception translator.
1 parent ac1eb4f commit 78d3c17

File tree

171 files changed

+183
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+183
-181
lines changed

.github/workflows/generate-jooq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
custom_docker_compose: ./docker/docker-compose.custom.yml
2424
start_jore3_importer: "true"
2525

26-
- name: Set up JDK 17
26+
- name: Set up JDK 25
2727
uses: actions/setup-java@v5
2828
with:
29-
java-version: "17"
29+
java-version: "25"
3030
java-package: jdk
3131
architecture: x64
3232
distribution: temurin

.github/workflows/java-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
custom_docker_compose: ./docker/docker-compose.custom.yml
2323
start_jore3_importer: "true"
2424

25-
- name: Set up JDK 17
25+
- name: Set up JDK 25
2626
uses: actions/setup-java@v5
2727
with:
28-
java-version: "17"
28+
java-version: "25"
2929
java-package: jdk
3030
architecture: x64
3131
distribution: temurin

.github/workflows/spotless.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v6
1717

18-
- name: Set up JDK 17
18+
- name: Set up JDK 25
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: "17"
21+
java-version: "25"
2222
java-package: jdk
2323
architecture: x64
2424
distribution: temurin

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# builder docker image
2-
FROM maven:3-eclipse-temurin-17 AS builder
2+
FROM maven:3-eclipse-temurin-25 AS builder
33

44
# set up workdir
55
WORKDIR /build
@@ -14,7 +14,9 @@ COPY ./profiles/prod /build/profiles/prod
1414
RUN mvn clean package spring-boot:repackage -Pprod
1515

1616
# distributed docker image
17-
FROM eclipse-temurin:17.0.8_7-jre
17+
FROM eclipse-temurin:25_36-jre
18+
19+
RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
1820

1921
RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
2022

@@ -31,7 +33,8 @@ COPY ./build-jdbc-urls.sh /tmp/
3133
COPY --from=builder /build/target/*.jar /usr/src/jore4-jore3-importer/importer.jar
3234

3335
# read docker secrets into environment variables, fetch digiroad data and run application
34-
CMD /bin/bash -c "source /tmp/read-secrets.sh && source /tmp/build-jdbc-urls.sh && java -jar /usr/src/jore4-jore3-importer/importer.jar"
36+
CMD ["/bin/bash", "-c", \
37+
"source /tmp/read-secrets.sh && source /tmp/build-jdbc-urls.sh && java -jar /usr/src/jore4-jore3-importer/importer.jar"]
3538

3639
HEALTHCHECK --interval=1m --timeout=5s \
3740
CMD curl --fail http://localhost:8080/actuator/health

pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.5</version>
8+
<version>3.5.6</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>fi.hsl.jore</groupId>
@@ -14,14 +14,14 @@
1414
<name>importer</name>
1515
<description>Import legacy data from Jore 3</description>
1616
<properties>
17-
<java.version>17</java.version>
17+
<java.version>25</java.version>
1818

1919
<!-- 3.6.3 is the last version of maven 3 that has been relased. Back in 2019 😬 -->
2020
<maven-enforcer.plugin.mvn-min-version>3.6.3</maven-enforcer.plugin.mvn-min-version>
2121

2222
<!-- Library versions -->
2323
<guava.version>33.1.0-jre</guava.version>
24-
<immutables.version>2.10.1</immutables.version>
24+
<immutables.version>2.11.6</immutables.version>
2525
<geotools.version>31.1</geotools.version>
2626
<geojson-jackson.version>1.14</geojson-jackson.version>
2727
<!-- Sticking to old 9.X version to avoid having to configure trusted certificates
@@ -41,7 +41,7 @@
4141
<maven-properties.plugin.version>1.2.1</maven-properties.plugin.version>
4242
<maven-enforcer.plugin.version>3.5.0</maven-enforcer.plugin.version>
4343
<maven-build-helper.plugin.version>3.6.0</maven-build-helper.plugin.version>
44-
<maven-spotless.plugin.version>2.43.0</maven-spotless.plugin.version>
44+
<maven-spotless.plugin.version>3.0.0</maven-spotless.plugin.version>
4545

4646
<!-- Packaging -->
4747
<build.profile.id>dev</build.profile.id>
@@ -705,7 +705,6 @@
705705
<!-- Format the code according to Palantir code style. -->
706706
<!-- Needs to be applied after <cleanthat>, as it can generate alternative code. -->
707707
<palantirJavaFormat>
708-
<version>2.47.0</version>
709708
<style>PALANTIR</style>
710709
<formatJavadoc>true</formatJavadoc>
711710
</palantirJavaFormat>

src/main/generated-sources/jooq/fi/hsl/jore/importer/jooq/DefaultCatalog.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/generated-sources/jooq/fi/hsl/jore/importer/jooq/infrastructure_network/InfrastructureNetwork.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/generated-sources/jooq/fi/hsl/jore/importer/jooq/infrastructure_network/Keys.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/generated-sources/jooq/fi/hsl/jore/importer/jooq/infrastructure_network/Tables.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/generated-sources/jooq/fi/hsl/jore/importer/jooq/infrastructure_network/tables/InfrastructureLinkShapes.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)