Skip to content

Commit 3f86dfc

Browse files
Merge pull request #5 from devgateway/upgrade-to-java-21
Upgrade to java 21
2 parents ed3c9da + 854c9b3 commit 3f86dfc

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

forms/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:17-jdk-slim
1+
FROM openjdk:21-jdk-slim
22
WORKDIR /opt/devgateway/tcdi/admin
33
COPY target/deps/BOOT-INF/lib lib
44
COPY target/deps/META-INF META-INF

forms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<java.version>17</java.version>
32+
<java.version>21</java.version>
3333
<wicket.version>10.2.0</wicket.version>
3434
<wicketstuff.version>10.0.0</wicketstuff.version>
3535
<wicket.bootstrap.version>5.0.4</wicket.bootstrap.version>

persistence/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<start-class>org.devgateway.toolkit.persistence.spring.PersistenceApplication</start-class>
21-
<java.version>17</java.version>
21+
<java.version>21</java.version>
2222
<ehcache.version>3.10.8</ehcache.version>
2323
<dozer.hibernate.model.version>0.3.8</dozer.hibernate.model.version>
2424
<commons.lang3.version>3.17.0</commons.lang3.version>

pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<java.version>17</java.version>
24+
<java.version>21</java.version>
2525
<liquibase.version>4.29.2</liquibase.version>
2626
<spring.boot.version>3.2.10</spring.boot.version>
2727
<derby.version>10.17.1.0</derby.version>
@@ -146,7 +146,6 @@
146146
<configuration>
147147
<configLocation>checkstyle.xml</configLocation>
148148
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
149-
<encoding>UTF-8</encoding>
150149
<consoleOutput>true</consoleOutput>
151150
<failsOnError>false</failsOnError>
152151
<failOnViolation>true</failOnViolation>
@@ -199,8 +198,8 @@
199198
<groupId>org.apache.maven.plugins</groupId>
200199
<artifactId>maven-compiler-plugin</artifactId>
201200
<configuration>
202-
<source>17</source>
203-
<target>17</target>
201+
<source>21</source>
202+
<target>21</target>
204203
</configuration>
205204
</plugin>
206205
</plugins>

web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<start-class>org.devgateway.toolkit.web.spring.WebApplication</start-class>
19-
<java.version>17</java.version>
19+
<java.version>21</java.version>
2020
<ooxml-schemas.version>5.3.0</ooxml-schemas.version>
2121
<swagger.version>3.0.0</swagger.version>
2222
</properties>

0 commit comments

Comments
 (0)