Skip to content

Commit 3aa401e

Browse files
rurorujj
ruroru
and
jj
authored
Upgrade jdk for voovan and wicket to 25 (#9954)
* update wicket to jdk 25 * Update voovan jdk to 25 --------- Co-authored-by: jj <[email protected]>
1 parent c70dc24 commit 3aa401e

File tree

5 files changed

+145
-133
lines changed

5 files changed

+145
-133
lines changed

‎frameworks/Java/voovan/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<version>0.1</version>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9-
<maven.compiler.source>11</maven.compiler.source>
10-
<maven.compiler.target>11</maven.compiler.target>
9+
<maven.compiler.source>17</maven.compiler.source>
10+
<maven.compiler.target>17</maven.compiler.target>
1111
<main.class>org.voovan.VoovanTFB</main.class>
1212
</properties>
1313
<dependencies>

‎frameworks/Java/voovan/voovan.dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3-eclipse-temurin-24-alpine as maven
22
WORKDIR /voovan
33
COPY pom.xml pom.xml
44
COPY src src
55
COPY config/framework.properties config/framework.properties
66
RUN mvn package -q
77

8-
FROM openjdk:11.0.3-jdk-slim
8+
FROM openjdk:25-ea-slim-bullseye
99
WORKDIR /voovan
1010
COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar
1111
COPY --from=maven /voovan/config/framework.properties config/framework.properties
@@ -24,5 +24,12 @@ CMD java -DCheckTimeout=false \
2424
-XX:+AlwaysPreTouch \
2525
-XX:-RestrictContended \
2626
-XX:+UseParallelGC -XX:+UseNUMA \
27-
-XX:+AggressiveOpts -XX:+UseBiasedLocking \
27+
--add-opens java.base/java.lang=ALL-UNNAMED \
28+
--add-opens java.base/java.util=ALL-UNNAMED \
29+
--add-opens java.base/java.io=ALL-UNNAMED \
30+
--add-opens java.base/java.nio=ALL-UNNAMED \
31+
--add-opens java.base/sun.nio.ch=ALL-UNNAMED \
32+
--add-opens java.base/java.security=ALL-UNNAMED \
33+
--add-opens java.base/java.util.concurrent=ALL-UNNAMED \
34+
--add-opens java.base/java.net=ALL-UNNAMED \
2835
-cp ./config:voovan.jar:app.jar org.voovan.VoovanTFB

‎frameworks/Java/wicket/pom.xml

Lines changed: 120 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,128 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>hellowicket</groupId>
5-
<artifactId>hellowicket</artifactId>
6-
<packaging>war</packaging>
7-
<version>1.0</version>
8-
<name>Hello Wicket</name>
9-
<description>Wicket project for the TechEmpower Benchmark</description>
10-
<organization>
11-
<name>TechEmpower</name>
12-
<url>https://github.com/TechEmpower/FrameworkBenchmarks</url>
13-
</organization>
14-
<licenses>
15-
<license>
16-
<name>The Apache Software License, Version 2.0</name>
17-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18-
<distribution>repo</distribution>
19-
</license>
20-
</licenses>
21-
<properties>
22-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<maven.compiler.source>11</maven.compiler.source>
24-
<maven.compiler.target>11</maven.compiler.target>
25-
<jackson.version>2.13.0</jackson.version>
26-
<slf4j.version>1.7.25</slf4j.version>
27-
<wicket.version>9.19.0</wicket.version>
28-
</properties>
29-
<dependencies>
30-
<!-- WICKET DEPENDENCIES -->
31-
<dependency>
32-
<groupId>org.apache.wicket</groupId>
33-
<artifactId>wicket-core</artifactId>
34-
<version>${wicket.version}</version>
35-
</dependency>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>hellowicket</groupId>
5+
<artifactId>hellowicket</artifactId>
6+
<packaging>war</packaging>
7+
<version>1.0</version>
8+
<name>Hello Wicket</name>
9+
<description>Wicket project for the TechEmpower Benchmark</description>
10+
<organization>
11+
<name>TechEmpower</name>
12+
<url>https://github.com/TechEmpower/FrameworkBenchmarks</url>
13+
</organization>
14+
<licenses>
15+
<license>
16+
<name>The Apache Software License, Version 2.0</name>
17+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18+
<distribution>repo</distribution>
19+
</license>
20+
</licenses>
21+
<properties>
22+
<maven.compiler.source>17</maven.compiler.source>
23+
<maven.compiler.target>17</maven.compiler.target>
24+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
<jackson.version>2.13.0</jackson.version>
26+
<slf4j.version>1.7.25</slf4j.version>
27+
<wicket.version>9.19.0</wicket.version>
28+
</properties>
29+
<dependencies>
30+
<!-- WICKET DEPENDENCIES -->
31+
<dependency>
32+
<groupId>org.apache.wicket</groupId>
33+
<artifactId>wicket-core</artifactId>
34+
<version>${wicket.version}</version>
35+
</dependency>
3636

37-
<!-- a faster DataSource -->
38-
<dependency>
39-
<groupId>com.zaxxer</groupId>
40-
<artifactId>HikariCP</artifactId>
41-
<version>5.0.0</version>
42-
<scope>compile</scope>
43-
</dependency>
37+
<!-- a faster DataSource -->
38+
<dependency>
39+
<groupId>com.zaxxer</groupId>
40+
<artifactId>HikariCP</artifactId>
41+
<version>5.0.0</version>
42+
<scope>compile</scope>
43+
</dependency>
4444

45-
<!-- LOGGING DEPENDENCIES - LOG4J -->
46-
<dependency>
47-
<groupId>org.slf4j</groupId>
48-
<artifactId>slf4j-simple</artifactId>
49-
<version>${slf4j.version}</version>
50-
</dependency>
45+
<!-- LOGGING DEPENDENCIES - LOG4J -->
46+
<dependency>
47+
<groupId>org.slf4j</groupId>
48+
<artifactId>slf4j-simple</artifactId>
49+
<version>${slf4j.version}</version>
50+
</dependency>
5151

52-
<dependency>
53-
<groupId>com.fasterxml.jackson.module</groupId>
54-
<artifactId>jackson-module-afterburner</artifactId>
55-
<version>${jackson.version}</version>
56-
</dependency>
52+
<dependency>
53+
<groupId>com.fasterxml.jackson.module</groupId>
54+
<artifactId>jackson-module-afterburner</artifactId>
55+
<version>${jackson.version}</version>
56+
</dependency>
5757

58-
<dependency>
59-
<groupId>com.fasterxml.jackson.core</groupId>
60-
<artifactId>jackson-annotations</artifactId>
61-
<version>${jackson.version}</version>
62-
</dependency>
58+
<dependency>
59+
<groupId>com.fasterxml.jackson.core</groupId>
60+
<artifactId>jackson-annotations</artifactId>
61+
<version>${jackson.version}</version>
62+
</dependency>
6363

64-
<dependency>
65-
<groupId>mysql</groupId>
66-
<artifactId>mysql-connector-java</artifactId>
67-
<version>8.0.28</version>
68-
</dependency>
69-
</dependencies>
70-
<build>
71-
<resources>
72-
<resource>
73-
<filtering>false</filtering>
74-
<directory>src/main/resources</directory>
75-
</resource>
76-
<resource>
77-
<filtering>false</filtering>
78-
<directory>src/main/java</directory>
79-
<includes>
80-
<include>**</include>
81-
</includes>
82-
<excludes>
83-
<exclude>**/*.java</exclude>
84-
</excludes>
85-
</resource>
86-
</resources>
87-
<testResources>
88-
<testResource>
89-
<filtering>false</filtering>
90-
<directory>src/test/resources</directory>
91-
</testResource>
92-
<testResource>
93-
<filtering>false</filtering>
94-
<directory>src/test/java</directory>
95-
<includes>
96-
<include>**</include>
97-
</includes>
98-
<excludes>
99-
<exclude>**/*.java</exclude>
100-
</excludes>
101-
</testResource>
102-
</testResources>
103-
<plugins>
104-
<plugin>
105-
<inherited>true</inherited>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-compiler-plugin</artifactId>
108-
<version>3.8.1</version>
109-
<configuration>
110-
<debug>false</debug>
111-
</configuration>
112-
</plugin>
113-
</plugins>
114-
</build>
64+
<dependency>
65+
<groupId>mysql</groupId>
66+
<artifactId>mysql-connector-java</artifactId>
67+
<version>8.0.28</version>
68+
</dependency>
69+
</dependencies>
70+
<build>
71+
<resources>
72+
<resource>
73+
<filtering>false</filtering>
74+
<directory>src/main/resources</directory>
75+
</resource>
76+
<resource>
77+
<filtering>false</filtering>
78+
<directory>src/main/java</directory>
79+
<includes>
80+
<include>**</include>
81+
</includes>
82+
<excludes>
83+
<exclude>**/*.java</exclude>
84+
</excludes>
85+
</resource>
86+
</resources>
87+
<testResources>
88+
<testResource>
89+
<filtering>false</filtering>
90+
<directory>src/test/resources</directory>
91+
</testResource>
92+
<testResource>
93+
<filtering>false</filtering>
94+
<directory>src/test/java</directory>
95+
<includes>
96+
<include>**</include>
97+
</includes>
98+
<excludes>
99+
<exclude>**/*.java</exclude>
100+
</excludes>
101+
</testResource>
102+
</testResources>
103+
<plugins>
104+
<plugin>
105+
<inherited>true</inherited>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-compiler-plugin</artifactId>
108+
<version>3.8.1</version>
109+
<configuration>
110+
<debug>false</debug>
111+
</configuration>
112+
</plugin>
113+
</plugins>
114+
</build>
115115

116-
<repositories>
117-
<repository>
118-
<id>Apache Nexus</id>
119-
<url>https://repository.apache.org/content/repositories/snapshots/</url>
120-
<releases>
121-
<enabled>false</enabled>
122-
</releases>
123-
<snapshots>
124-
<enabled>true</enabled>
125-
</snapshots>
126-
</repository>
127-
</repositories>
116+
<repositories>
117+
<repository>
118+
<id>Apache Nexus</id>
119+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
120+
<releases>
121+
<enabled>false</enabled>
122+
</releases>
123+
<snapshots>
124+
<enabled>true</enabled>
125+
</snapshots>
126+
</repository>
127+
</repositories>
128128
</project>

‎frameworks/Java/wicket/resin.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
xmlns:resin="http://caucho.com/ns/resin/core">
33

44
<cluster id="">
5-
<resin:import path="/resin/conf/app-default.xml" />
6-
7-
<log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
5+
<resin:import path="/resin/conf/app-default.xml"/>
6+
7+
<log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] "/>
88

99
<server id="">
10-
<http port="8080" />
10+
<http port="8080"/>
1111
</server>
1212

1313
<host>

‎frameworks/Java/wicket/wicket.dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3-eclipse-temurin-24-alpine as maven
22
WORKDIR /wicket
33
COPY src src
44
COPY pom.xml pom.xml
55
RUN mvn compile war:war -q
66

7-
FROM openjdk:11.0.3-jdk-stretch
7+
FROM alpine/curl:8.1.2 as curl
8+
WORKDIR /wicket
9+
RUN curl -sL http://caucho.com/download/resin-4.0.61.tar.gz >resin.tar.gz
10+
11+
FROM openjdk:25-ea-slim-bullseye
812
WORKDIR /resin
9-
RUN curl -sL http://caucho.com/download/resin-4.0.61.tar.gz | tar xz --strip-components=1
13+
COPY --from=curl /wicket/resin.tar.gz .
14+
RUN tar xzf ./resin.tar.gz --strip-components=1
1015
RUN rm -rf webapps/*
1116
COPY --from=maven /wicket/target/hellowicket-1.0.war webapps/ROOT.war
1217
COPY resin.xml conf/resin.xml
1318

1419
EXPOSE 8080
1520

16-
CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-jar", "lib/resin.jar", "console"]
21+
CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseParallelGC", "-jar", "lib/resin.jar", "console"]

0 commit comments

Comments
 (0)