Skip to content

Commit ca2c258

Browse files
eastspireeastspire
committed
Merge remote-tracking branch 'upstream/master'
2 parents e1879d0 + 6629f7c commit ca2c258

37 files changed

+413
-198
lines changed

‎frameworks/Java/quarkus/pom.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
<packaging>pom</packaging>
99

1010
<properties>
11-
<compiler-plugin.version>3.11.0</compiler-plugin.version>
12-
<maven.compiler.release>17</maven.compiler.release>
11+
<compiler-plugin.version>3.14.0</compiler-plugin.version>
12+
<maven.compiler.release>21</maven.compiler.release>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1616
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
17-
<quarkus.platform.version>3.9.4</quarkus.platform.version>
17+
<quarkus.platform.version>3.21.2</quarkus.platform.version>
1818
<skipITs>true</skipITs>
19-
<surefire-plugin.version>3.0.0</surefire-plugin.version>
20-
<netty.io_uring.version>0.0.25.Final</netty.io_uring.version>
19+
<surefire-plugin.version>3.5.2</surefire-plugin.version>
20+
<!-- Check https://github.com/netty/netty-incubator-transport-io_uring/tags -->
21+
<netty.io_uring.version>0.0.26.Final</netty.io_uring.version>
2122
<rocker.version>1.3.0</rocker.version>
2223
</properties>
2324

‎frameworks/Java/quarkus/quarkus-hibernate-reactive.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-17:1.15 as maven
1+
FROM registry.access.redhat.com/ubi9/openjdk-21:1.22 as maven
22
ENV LANGUAGE='en_US:en'
33

44
WORKDIR /quarkus
@@ -29,7 +29,7 @@ WORKDIR /quarkus/$MODULE
2929
RUN mvn package -B -q
3030
WORKDIR /quarkus
3131

32-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15
32+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22
3333
ENV LANGUAGE='en_US:en'
3434
WORKDIR /quarkus
3535
ENV MODULE=resteasy-reactive-hibernate-reactive

‎frameworks/Java/quarkus/quarkus-reactive-routes-pgclient.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-17:1.15 as maven
1+
FROM registry.access.redhat.com/ubi9/openjdk-21:1.22 as maven
22
ENV LANGUAGE='en_US:en'
33

44
WORKDIR /quarkus
@@ -29,7 +29,7 @@ WORKDIR /quarkus/$MODULE
2929
RUN mvn package -B -q
3030
WORKDIR /quarkus
3131

32-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15
32+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22
3333
ENV LANGUAGE='en_US:en'
3434
WORKDIR /quarkus
3535
ENV MODULE=reactive-routes-pgclient

‎frameworks/Java/quarkus/quarkus-vertx.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-17:1.15 as maven
1+
FROM registry.access.redhat.com/ubi9/openjdk-21:1.22 as maven
22
ENV LANGUAGE='en_US:en'
33

44
WORKDIR /quarkus
@@ -29,7 +29,7 @@ WORKDIR /quarkus/$MODULE
2929
RUN mvn package -B -q
3030
WORKDIR /quarkus
3131

32-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15
32+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22
3333
ENV LANGUAGE='en_US:en'
3434
WORKDIR /quarkus
3535
ENV MODULE=vertx

‎frameworks/Java/quarkus/quarkus.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-17:1.15 as maven
1+
FROM registry.access.redhat.com/ubi9/openjdk-21:1.22 as maven
22
ENV LANGUAGE='en_US:en'
33

44
WORKDIR /quarkus
@@ -29,7 +29,7 @@ WORKDIR /quarkus/$MODULE
2929
RUN mvn package -B -q
3030
WORKDIR /quarkus
3131

32-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15
32+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22
3333
ENV LANGUAGE='en_US:en'
3434
WORKDIR /quarkus
3535
ENV MODULE=resteasy-reactive-hibernate

‎frameworks/Java/tio-boot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<java.version>1.8</java.version>
1212
<maven.compiler.source>${java.version}</maven.compiler.source>
1313
<maven.compiler.target>${java.version}</maven.compiler.target>
14-
<tio-boot.version>1.9.4</tio-boot.version>
14+
<tio-boot.version>1.9.5</tio-boot.version>
1515

1616

1717
<main.class>com.litongjava.tio.http.server.MainApp</main.class>

‎frameworks/Java/tio-http-server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<dependency>
1717
<groupId>com.litongjava</groupId>
1818
<artifactId>tio-http-server</artifactId>
19-
<version>3.7.3.v20250401-RELEASE</version>
19+
<version>3.7.3.v20250415-RELEASE</version>
2020
</dependency>
2121

2222
<dependency>
2323
<groupId>com.litongjava</groupId>
2424
<artifactId>tio-utils</artifactId>
25-
<version>3.7.3.v20250401-RELEASE</version>
25+
<version>3.7.3.v20250415-RELEASE</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>com.litongjava</groupId>

‎frameworks/Java/vertx/pom.xml‎

Lines changed: 90 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@
4141
<artifactId>jsonsergen</artifactId>
4242
<version>0.0.5</version>
4343
</dependency>
44-
<dependency>
45-
<groupId>io.netty</groupId>
46-
<artifactId>netty-transport-native-kqueue</artifactId>
47-
<version>${netty.version}</version>
48-
<classifier>osx-x86_64</classifier>
49-
</dependency>
50-
<dependency>
51-
<groupId>io.netty</groupId>
52-
<artifactId>netty-transport-native-epoll</artifactId>
53-
<version>${netty.version}</version>
54-
<classifier>linux-x86_64</classifier>
55-
</dependency>
5644
<dependency>
5745
<groupId>com.github.ben-manes.caffeine</groupId>
5846
<artifactId>caffeine</artifactId>
@@ -149,9 +137,30 @@
149137

150138
<profiles>
151139
<profile>
152-
<id>Linux</id>
140+
<id>linux-x86_64</id>
141+
<activation>
142+
<os>
143+
<family>linux</family>
144+
<arch>x86_64</arch>
145+
</os>
146+
</activation>
147+
<dependencies>
148+
<dependency>
149+
<groupId>io.netty</groupId>
150+
<artifactId>netty-transport-native-io_uring</artifactId>
151+
<version>${netty.version}</version>
152+
<classifier>linux-x86_64</classifier>
153+
</dependency>
154+
</dependencies>
155+
</profile>
156+
157+
<profile>
158+
<id>linux-amd64</id>
153159
<activation>
154-
<activeByDefault>false</activeByDefault>
160+
<os>
161+
<family>linux</family>
162+
<arch>amd64</arch>
163+
</os>
155164
</activation>
156165
<dependencies>
157166
<dependency>
@@ -162,6 +171,73 @@
162171
</dependency>
163172
</dependencies>
164173
</profile>
174+
175+
<profile>
176+
<id>linux-aarch64</id>
177+
<activation>
178+
<os>
179+
<family>linux</family>
180+
<arch>aarch64</arch>
181+
</os>
182+
</activation>
183+
<dependencies>
184+
<dependency>
185+
<groupId>io.netty</groupId>
186+
<artifactId>netty-transport-native-io_uring</artifactId>
187+
<version>${netty.version}</version>
188+
<classifier>linux-aarch_64</classifier>
189+
</dependency>
190+
</dependencies>
191+
</profile>
192+
193+
<profile>
194+
<id>osx-x86_64</id>
195+
<activation>
196+
<os>
197+
<family>mac</family>
198+
<arch>x86_64</arch>
199+
</os>
200+
</activation>
201+
<dependencies>
202+
<dependency>
203+
<groupId>io.netty</groupId>
204+
<artifactId>netty-resolver-dns-native-macos</artifactId>
205+
<version>${netty.version}</version>
206+
<classifier>osx-x86_64</classifier>
207+
</dependency>
208+
<dependency>
209+
<groupId>io.netty</groupId>
210+
<artifactId>netty-transport-native-kqueue</artifactId>
211+
<version>${netty.version}</version>
212+
<classifier>osx-x86_64</classifier>
213+
</dependency>
214+
</dependencies>
215+
</profile>
216+
217+
<profile>
218+
<id>osx-aarch64</id>
219+
<activation>
220+
<os>
221+
<family>mac</family>
222+
<arch>aarch64</arch>
223+
</os>
224+
</activation>
225+
<dependencies>
226+
<dependency>
227+
<groupId>io.netty</groupId>
228+
<artifactId>netty-resolver-dns-native-macos</artifactId>
229+
<version>${netty.version}</version>
230+
<classifier>osx-aarch_64</classifier>
231+
</dependency>
232+
<dependency>
233+
<groupId>io.netty</groupId>
234+
<artifactId>netty-transport-native-kqueue</artifactId>
235+
<version>${netty.version}</version>
236+
<classifier>osx-aarch_64</classifier>
237+
</dependency>
238+
</dependencies>
239+
</profile>
240+
165241
</profiles>
166242

167243
</project>

‎frameworks/Java/vertx/src/main/java/vertx/App.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void start(Promise<Void> startPromise) throws Exception {
171171
options.setPassword(config.getString("password", "benchmarkdbpass"));
172172
options.setCachePreparedStatements(true);
173173
options.setPreparedStatementCacheMaxSize(1024);
174-
options.setPipeliningLimit(100_000); // Large pipelining means less flushing and we use a single connection anyway
174+
options.setPipeliningLimit(256); // Large pipelining means less flushing and we use a single connection anyway
175175
Future<?> clientsInit = initClients(options);
176176
clientsInit
177177
.transform(ar -> {

‎frameworks/Java/vertx/vertx-postgres.dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.9.0-eclipse-temurin-17 as maven
1+
FROM maven:3.9.9-eclipse-temurin-24-noble as maven
22
WORKDIR /vertx
33
COPY src src
44
COPY pom.xml pom.xml
@@ -9,6 +9,9 @@ EXPOSE 8080
99
CMD export DBIP=`getent hosts tfb-database | awk '{ print $1 }'` && \
1010
sed -i "s|tfb-database|$DBIP|g" /vertx/src/main/conf/config.json && \
1111
java \
12+
--enable-native-access=ALL-UNNAMED \
13+
--sun-misc-unsafe-memory-access=allow \
14+
--add-opens=java.base/java.lang=ALL-UNNAMED \
1215
-Xms2G \
1316
-Xmx2G \
1417
-server \
@@ -22,7 +25,8 @@ CMD export DBIP=`getent hosts tfb-database | awk '{ print $1 }'` && \
2225
-Dvertx.cacheImmutableHttpResponseHeaders=true \
2326
-Dvertx.internCommonHttpRequestHeadersToLowerCase=true \
2427
-Dvertx.eventLoopPoolSize=$((`grep --count ^processor /proc/cpuinfo`)) \
25-
-Dio.netty.buffer.checkBounds=false \
28+
-Dio.netty.noUnsafe=false \
29+
-Dio.netty.buffer.checkBounds=false \
2630
-Dio.netty.buffer.checkAccessible=false \
2731
-jar \
2832
target/vertx.benchmark-0.0.1-SNAPSHOT-fat.jar \

0 commit comments

Comments
 (0)