Skip to content

Commit d62e690

Browse files
noearnoear
authored
Update Solon Jdk To 21 (#9245)
* Update Solon Version To 2.9.1 * Update Solon Version To 2.9.1 * Update Solon Jdk To 21 * Update Solon Jdk To 21 * Update Solon Jdk To 21 * Update Solon Jdk To 21 * Update Solon Jdk To 21
1 parent 902efb7 commit d62e690

File tree

6 files changed

+35
-76
lines changed

6 files changed

+35
-76
lines changed

‎frameworks/Java/solon/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
This is the solon portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
55

66
### JSON Encoding Test
7-
* [JSON test source](src/main/java/pmg/Main.java)
8-
* [Plaintext test source](src/main/java/pmg/Main.java)
7+
* [JSON test source](src/main/java/hello/Main.java)
8+
* [Plaintext test source](src/main/java/hello/Main.java)
99

1010
## Versions
1111

12-
* [Java OpenJDK 1.8](http://openjdk.java.net/)
13-
* [solon 2.0.0](https://github.com/noear/solon)
12+
* [Java OpenJDK 21](http://openjdk.java.net/)
13+
* [solon 2.9.1](https://github.com/noear/solon)
1414

1515
## Test URLs
1616

‎frameworks/Java/solon/pom.xml

Lines changed: 11 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>org.noear.solon</groupId>
6-
<artifactId>solon-benchmark</artifactId>
5+
<parent>
6+
<groupId>org.noear</groupId>
7+
<artifactId>solon-parent</artifactId>
8+
<version>2.9.1</version>
9+
</parent>
10+
11+
<groupId>hello</groupId>
12+
<artifactId>hello-solon</artifactId>
713
<version>1.0</version>
814
<packaging>jar</packaging>
915

1016
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<java.vertsion>11</java.vertsion>
13-
<solon.version>2.9.1</solon.version>
17+
<java.version>21</java.version>
1418
</properties>
1519

1620
<dependencies>
@@ -19,73 +23,28 @@
1923
<artifactId>solon.boot.smarthttp</artifactId>
2024
<version>${solon.version}</version>
2125
</dependency>
26+
2227
<dependency>
2328
<groupId>org.noear</groupId>
2429
<artifactId>solon.serialization.snack3</artifactId>
2530
<version>${solon.version}</version>
2631
</dependency>
2732
</dependencies>
2833

29-
<repositories>
30-
<repository>
31-
<id>central</id>
32-
<name>Central Repository</name>
33-
<url>https://repo.maven.apache.org/maven2</url>
34-
</repository>
35-
<repository>
36-
<id>sonatype-nexus-snapshots</id>
37-
<name>Sonatype Nexus Snapshots</name>
38-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
39-
</repository>
40-
</repositories>
41-
42-
<pluginRepositories>
43-
<pluginRepository>
44-
<id>central</id>
45-
<name>Central Repository</name>
46-
<url>https://repo.maven.apache.org/maven2</url>
47-
</pluginRepository>
48-
<pluginRepository>
49-
<id>sonatype-nexus-snapshots</id>
50-
<name>Sonatype Nexus Snapshots</name>
51-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
52-
<releases>
53-
<enabled>false</enabled>
54-
</releases>
55-
<snapshots>
56-
<enabled>true</enabled>
57-
</snapshots>
58-
</pluginRepository>
59-
</pluginRepositories>
60-
6134
<build>
6235
<finalName>${project.artifactId}</finalName>
6336

6437
<plugins>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-compiler-plugin</artifactId>
68-
<version>3.11.0</version>
69-
<configuration>
70-
<compilerArgument>-parameters</compilerArgument>
71-
<source>${java.vertsion}</source>
72-
<target>${java.vertsion}</target>
73-
<encoding>UTF-8</encoding>
74-
<debug>false</debug>
75-
</configuration>
76-
</plugin>
77-
7838
<plugin>
7939
<groupId>org.apache.maven.plugins</groupId>
8040
<artifactId>maven-assembly-plugin</artifactId>
81-
<version>3.6.0</version>
8241
<configuration>
8342
<descriptorRefs>
8443
<descriptorRef>jar-with-dependencies</descriptorRef>
8544
</descriptorRefs>
8645
<archive>
8746
<manifest>
88-
<mainClass>pmg.Main</mainClass>
47+
<mainClass>hello.Main</mainClass>
8948
</manifest>
9049
</archive>
9150
</configuration>

‎frameworks/Java/solon/solon.dockerfile

Lines changed: 4 additions & 4 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.9.7-amazoncorretto-21 as maven
22
WORKDIR /solon
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:21-jdk-slim
88
WORKDIR /solon
9-
COPY --from=maven /solon/target/solon-benchmark-jar-with-dependencies.jar app.jar
9+
COPY --from=maven /solon/target/hello-solon.jar app.jar
1010

1111
EXPOSE 8080
1212

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

‎frameworks/Java/solon/src/main/java/pmg/Main.java renamed to ‎frameworks/Java/solon/src/main/java/hello/Main.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package pmg;
2-
3-
import org.noear.solon.Solon;
4-
5-
/**
6-
* @author pmg1991
7-
* @version V1.0
8-
*/
9-
public class Main {
10-
public static void main(String[] args) {
11-
Solon.start(Main.class, args);
12-
}
13-
}
1+
package hello;
2+
3+
import org.noear.solon.Solon;
4+
5+
/**
6+
* @author pmg1991
7+
* @version V1.0
8+
*/
9+
public class Main {
10+
public static void main(String[] args) {
11+
Solon.start(Main.class, args);
12+
}
13+
}

‎frameworks/Java/solon/src/main/java/pmg/controller/HelloController.java renamed to ‎frameworks/Java/solon/src/main/java/hello/controller/HelloController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package pmg.controller;
1+
package hello.controller;
22

33
import org.noear.solon.annotation.Controller;
44
import org.noear.solon.annotation.Get;
55
import org.noear.solon.annotation.Mapping;
6-
import pmg.model.Message;
6+
import hello.model.Message;
77

88
/**
99
* @author noear

‎frameworks/Java/solon/src/main/java/pmg/model/Message.java renamed to ‎frameworks/Java/solon/src/main/java/hello/model/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package pmg.model;
1+
package hello.model;
22

33
/**
44
* @author pmg1991

0 commit comments

Comments
 (0)