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

frameworks/Java/solon/README.md

@@ -4,13 +4,13 @@
 This is the solon portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
 
 ### JSON Encoding Test
-* [JSON test source](src/main/java/pmg/Main.java)
-* [Plaintext test source](src/main/java/pmg/Main.java)
+* [JSON test source](src/main/java/hello/Main.java)
+* [Plaintext test source](src/main/java/hello/Main.java)
 
 ## Versions
 
-* [Java OpenJDK 1.8](http://openjdk.java.net/)
-* [solon 2.0.0](https://github.com/noear/solon)
+* [Java OpenJDK 21](http://openjdk.java.net/)
+* [solon 2.9.1](https://github.com/noear/solon)
 
 ## Test URLs
 

frameworks/Java/solon/pom.xml

@@ -2,15 +2,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.noear.solon</groupId>
-    <artifactId>solon-benchmark</artifactId>
+    <parent>
+        <groupId>org.noear</groupId>
+        <artifactId>solon-parent</artifactId>
+        <version>2.9.1</version>
+    </parent>
+
+    <groupId>hello</groupId>
+    <artifactId>hello-solon</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.vertsion>11</java.vertsion>
-        <solon.version>2.9.1</solon.version>
+        <java.version>21</java.version>
     </properties>
 
     <dependencies>
@@ -19,6 +23,7 @@
             <artifactId>solon.boot.smarthttp</artifactId>
             <version>${solon.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon.serialization.snack3</artifactId>
@@ -26,66 +31,20 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </repository>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <finalName>${project.artifactId}</finalName>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
-                <configuration>
-                    <compilerArgument>-parameters</compilerArgument>
-                    <source>${java.vertsion}</source>
-                    <target>${java.vertsion}</target>
-                    <encoding>UTF-8</encoding>
-                    <debug>false</debug>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.6.0</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>pmg.Main</mainClass>
+                            <mainClass>hello.Main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

frameworks/Java/solon/solon.dockerfile

@@ -1,13 +1,13 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.9.7-amazoncorretto-21 as maven
 WORKDIR /solon
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile assembly:single -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:21-jdk-slim
 WORKDIR /solon
-COPY --from=maven /solon/target/solon-benchmark-jar-with-dependencies.jar app.jar
+COPY --from=maven /solon/target/hello-solon.jar app.jar
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-cp", "app.jar", "pmg.Main"]
+CMD ["java", "-server", "-cp", "app.jar", "hello.Main"]

frameworks/Java/solon/src/main/java/pmg/Main.java → frameworks/Java/solon/src/main/java/hello/Main.java

@@ -1,13 +1,13 @@
-package pmg;
-
-import org.noear.solon.Solon;
-
-/**
- * @author pmg1991
- * @version V1.0
- */
-public class Main {
-	public static void main(String[] args) {
-		Solon.start(Main.class, args);
-	}
-}
+package hello;
+
+import org.noear.solon.Solon;
+
+/**
+ * @author pmg1991
+ * @version V1.0
+ */
+public class Main {
+	public static void main(String[] args) {
+		Solon.start(Main.class, args);
+	}
+}

frameworks/Java/solon/src/main/java/pmg/controller/HelloController.java → frameworks/Java/solon/src/main/java/hello/controller/HelloController.java

@@ -1,9 +1,9 @@
-package pmg.controller;
+package hello.controller;
 
 import org.noear.solon.annotation.Controller;
 import org.noear.solon.annotation.Get;
 import org.noear.solon.annotation.Mapping;
-import pmg.model.Message;
+import hello.model.Message;
 
 /**
  * @author noear

frameworks/Java/solon/src/main/java/pmg/model/Message.java → frameworks/Java/solon/src/main/java/hello/model/Message.java

@@ -1,4 +1,4 @@
-package pmg.model;
+package hello.model;
 
 /**
  * @author pmg1991