Skip to content

Commit 99b1494

Browse files
author
jj
committed
Uplift t-io to jdk 25
1 parent d0fee16 commit 99b1494

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

frameworks/Java/t-io/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<artifactId>tio-http-server</artifactId>
2626
</dependency>
2727

28-
<!-- slf4j-logback绑定 -->
2928
<dependency>
3029
<groupId>ch.qos.logback</groupId>
3130
<artifactId>logback-classic</artifactId>
@@ -83,8 +82,8 @@
8382
<artifactId>maven-assembly-plugin</artifactId>
8483
<executions>
8584
<execution>
86-
<id>make-assembly</id> <!--名字任意 -->
87-
<phase>package</phase> <!-- 绑定到package生命周期阶段上 -->
85+
<id>make-assembly</id>
86+
<phase>package</phase>
8887
<goals>
8988
<goal>single</goal>
9089
</goals>

frameworks/Java/t-io/script/pkg.xml

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

1919
<fileSet>
2020
<directory>${project.basedir}</directory>
21-
<outputDirectory></outputDirectory>
21+
<outputDirectory/>
2222
<includes>
2323
<include>startup.*</include>
2424
<include>debug.*</include>
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3-eclipse-temurin-24-alpine as maven
22
WORKDIR /t-io
33
COPY pom.xml pom.xml
44
COPY src src
55
COPY script script
6-
RUN mvn package -q
6+
RUN mvn compile assembly:single -q
77

8-
#TODO use separate JDK/JRE for the RUN (as the other builds)
9-
WORKDIR /t-io/target/tio-http-server-benchmark
8+
FROM openjdk:25-jdk-slim
9+
WORKDIR /t-io
10+
COPY --from=maven /t-io/target/tio-http-server-benchmark/config /t-io/config
11+
COPY --from=maven /t-io/target/tio-http-server-benchmark/lib /t-io/lib
12+
13+
WORKDIR /t-io
1014

1115
EXPOSE 8080
1216

13-
CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-cp", "/t-io/target/tio-http-server-benchmark/config:/t-io/target/tio-http-server-benchmark/lib/*", "org.tio.http.server.benchmark.TioBenchmarkStarter"]
17+
CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-cp", "/t-io/config:/t-io/lib/*", "org.tio.http.server.benchmark.TioBenchmarkStarter"]

0 commit comments

Comments
 (0)