Skip to content

Commit 29b8d90

Browse files
authored
Merge pull request #49 from TechEmpower/master
aa
2 parents aac0647 + 4db9e4f commit 29b8d90

File tree

29 files changed

+793
-151
lines changed

29 files changed

+793
-151
lines changed

frameworks/Java/activeweb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>com.fasterxml.jackson.core</groupId>
117117
<artifactId>jackson-core</artifactId>
118-
<version>2.9.9</version>
118+
<version>2.13.0</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>com.fasterxml.jackson.core</groupId>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3-eclipse-temurin-24-alpine as maven
22
WORKDIR /httpserver
33
COPY pom.xml pom.xml
44
COPY src src
55
RUN mvn compile assembly:single -q
66

7-
FROM openjdk:11.0.3-jdk-slim
7+
FROM openjdk:25-jdk-slim
88
WORKDIR /httpserver
99
COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
1010

1111
EXPOSE 8080
1212

13-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-jar", "app.jar", "postgres"]
13+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar", "postgres"]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3-eclipse-temurin-24-alpine as maven
22
WORKDIR /httpserver
33
COPY pom.xml pom.xml
44
COPY src src
55
RUN mvn compile assembly:single -q
66

7-
FROM openjdk:11.0.3-jdk-slim
7+
FROM openjdk:25-jdk-slim
88
WORKDIR /httpserver
99
COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
1010

1111
EXPOSE 8080
1212

13-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-jar", "app.jar"]
13+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/httpserver/src/main/java/benchmarks/Server.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static void main(String[] args) throws Exception {
132132
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "DEBUG");
133133
// create server
134134
HttpServer server = HttpServer.create(new InetSocketAddress(port), 1024 * 8);
135-
server.setExecutor(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()));
135+
server.setExecutor(Executors.newVirtualThreadPerTaskExecutor());
136136
// add context handlers
137137
server.createContext("/plaintext", createPlaintextHandler());
138138
server.createContext("/json", createJSONHandler());

frameworks/Java/jooby/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<jooby.version>3.4.0</jooby.version>
1515
<netty.version>4.1.113.Final</netty.version>
1616
<dsl-json.version>2.0.2</dsl-json.version>
17-
<postgresql.version>42.7.4</postgresql.version>
17+
<postgresql.version>42.7.7</postgresql.version>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<maven.compiler.source>22</maven.compiler.source>
2020
<maven.compiler.target>22</maven.compiler.target>

frameworks/Java/ninja-standalone/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-core</artifactId>
54-
<version>2.9.9</version>
54+
<version>2.13.0</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.module</groupId>

frameworks/Java/solon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>org.postgresql</groupId>
6464
<artifactId>postgresql</artifactId>
65-
<version>42.7.4</version>
65+
<version>42.7.7</version>
6666
</dependency>
6767
</dependencies>
6868

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.7</tio-boot.version>
14+
<tio-boot.version>1.9.8</tio-boot.version>
1515

1616

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

frameworks/Java/tio-boot/src/main/java/com/litongjava/tio/http/server/MainAppConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.litongjava.tio.http.server.config.EhCachePluginConfig;
66
import com.litongjava.tio.http.server.config.EnjoyEngineConfig;
77
import com.litongjava.tio.http.server.config.MysqlDbConfig;
8-
import com.litongjava.tio.http.server.controller.CacheHandler;
9-
import com.litongjava.tio.http.server.controller.DbHandler;
10-
import com.litongjava.tio.http.server.controller.IndexHandler;
8+
import com.litongjava.tio.http.server.handler.CacheHandler;
9+
import com.litongjava.tio.http.server.handler.DbHandler;
10+
import com.litongjava.tio.http.server.handler.IndexHandler;
1111
import com.litongjava.tio.http.server.router.HttpRequestRouter;
1212
import com.litongjava.tio.utils.environment.EnvUtils;
1313

@@ -38,7 +38,6 @@ public void config() throws Exception {
3838
TioBootServer server = TioBootServer.me();
3939
HttpRequestRouter requestRouter = server.getRequestRouter();
4040
if (requestRouter != null) {
41-
requestRouter.add("/", controller::index);
4241
requestRouter.add("/plaintext", controller::plaintext);
4342
requestRouter.add("/json", controller::json);
4443

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.litongjava.tio.http.server.controller;
1+
package com.litongjava.tio.http.server.handler;
22

33
import java.util.ArrayList;
44
import java.util.List;

0 commit comments

Comments
 (0)