Skip to content

Commit f2c71bb

Browse files
committed
feat: upgrade to Java 21 LTS and Hibernate 6.6.18
- Compiler source/target 17 -> 21 (current LTS) - Hibernate ORM 6.3.1.Final -> 6.6.18.Final - Remove --add-opens JVM flags (no longer needed with Hibernate 6.6) - Update Dockerfile and CI to use JDK 21
1 parent 8aa998c commit f2c71bb

3 files changed

Lines changed: 10 additions & 20 deletions

File tree

‎.github/workflows/build-deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919

20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:
23-
java-version: "17"
23+
java-version: "21"
2424
distribution: "temurin"
2525
cache: maven
2626

@@ -37,10 +37,10 @@ jobs:
3737
steps:
3838
- uses: actions/checkout@v4
3939

40-
- name: Set up JDK 17
40+
- name: Set up JDK 21
4141
uses: actions/setup-java@v4
4242
with:
43-
java-version: "17"
43+
java-version: "21"
4444
distribution: "temurin"
4545
cache: maven
4646

‎Dockerfile‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@ ENV DEBIAN_FRONTEND=noninteractive
44

55
ENV LANG=C.UTF-8
66
ENV LC_ALL=C.UTF-8
7-
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
8-
ENV JAVA_OPTIONS="-Dfile.encoding=UTF-8 -Xms512m -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=200 \
9-
--add-opens java.base/java.lang=ALL-UNNAMED \
10-
--add-opens java.base/java.util=ALL-UNNAMED \
11-
--add-opens java.base/java.io=ALL-UNNAMED \
12-
--add-opens java.base/java.nio=ALL-UNNAMED"
7+
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64/
8+
ENV JAVA_OPTIONS="-Dfile.encoding=UTF-8 -Xms512m -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=200"
139
ENV JETTY_VERSION=12.0.21
1410
ENV JETTY_HOME=/opt/jetty
1511

1612
# Install packages
1713
RUN apt-get update && \
1814
apt-get upgrade -y -q libgnutls30 && \
1915
apt-get -y -q --no-install-recommends install \
20-
vim less procps curl unzip wget tzdata openjdk-17-jdk \
16+
vim less procps curl unzip wget tzdata openjdk-21-jdk \
2117
ffmpeg \
2218
mediainfo \
2319
tesseract-ocr \

‎pom.xml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<name>Docs Parent</name>
1212

1313
<properties>
14-
<maven.compiler.source>17</maven.compiler.source>
15-
<maven.compiler.target>17</maven.compiler.target>
14+
<maven.compiler.source>21</maven.compiler.source>
15+
<maven.compiler.target>21</maven.compiler.target>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717

1818
<!-- Dependencies version (external) -->
@@ -36,7 +36,7 @@
3636
<org.apache.pdfbox.pdfbox.version>2.0.29</org.apache.pdfbox.pdfbox.version>
3737
<org.bouncycastle.bcprov-jdk18on.version>1.83</org.bouncycastle.bcprov-jdk18on.version>
3838
<joda-time.joda-time.version>2.12.2</joda-time.joda-time.version>
39-
<org.hibernate.hibernate.version>6.3.1.Final</org.hibernate.hibernate.version>
39+
<org.hibernate.hibernate.version>6.6.18.Final</org.hibernate.hibernate.version>
4040
<fr.opensagres.xdocreport.version>2.0.4</fr.opensagres.xdocreport.version>
4141
<xerces.xercesImpl.version>2.12.2</xerces.xercesImpl.version>
4242
<net.java.dev.jna.jna.version>5.13.0</net.java.dev.jna.jna.version>
@@ -97,12 +97,6 @@
9797
<configuration>
9898
<forkCount>1</forkCount>
9999
<reuseForks>false</reuseForks>
100-
<argLine>
101-
--add-opens java.base/java.lang=ALL-UNNAMED
102-
--add-opens java.base/java.util=ALL-UNNAMED
103-
--add-opens java.base/java.io=ALL-UNNAMED
104-
--add-opens java.base/java.nio=ALL-UNNAMED
105-
</argLine>
106100
</configuration>
107101
</plugin>
108102

0 commit comments

Comments
 (0)