diff --git a/frameworks/Java/voovan/pom.xml b/frameworks/Java/voovan/pom.xml index fec86f88048..853624578a2 100644 --- a/frameworks/Java/voovan/pom.xml +++ b/frameworks/Java/voovan/pom.xml @@ -6,8 +6,8 @@ 0.1 UTF-8 - 11 - 11 + 17 + 17 org.voovan.VoovanTFB diff --git a/frameworks/Java/voovan/voovan.dockerfile b/frameworks/Java/voovan/voovan.dockerfile index 61160d45d63..2ffcb0dbcfc 100644 --- a/frameworks/Java/voovan/voovan.dockerfile +++ b/frameworks/Java/voovan/voovan.dockerfile @@ -1,11 +1,11 @@ -FROM maven:3.6.1-jdk-11-slim as maven +FROM maven:3-eclipse-temurin-24-alpine as maven WORKDIR /voovan COPY pom.xml pom.xml COPY src src COPY config/framework.properties config/framework.properties RUN mvn package -q -FROM openjdk:11.0.3-jdk-slim +FROM openjdk:25-ea-slim-bullseye WORKDIR /voovan COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar COPY --from=maven /voovan/config/framework.properties config/framework.properties @@ -24,5 +24,12 @@ CMD java -DCheckTimeout=false \ -XX:+AlwaysPreTouch \ -XX:-RestrictContended \ -XX:+UseParallelGC -XX:+UseNUMA \ - -XX:+AggressiveOpts -XX:+UseBiasedLocking \ + --add-opens java.base/java.lang=ALL-UNNAMED \ + --add-opens java.base/java.util=ALL-UNNAMED \ + --add-opens java.base/java.io=ALL-UNNAMED \ + --add-opens java.base/java.nio=ALL-UNNAMED \ + --add-opens java.base/sun.nio.ch=ALL-UNNAMED \ + --add-opens java.base/java.security=ALL-UNNAMED \ + --add-opens java.base/java.util.concurrent=ALL-UNNAMED \ + --add-opens java.base/java.net=ALL-UNNAMED \ -cp ./config:voovan.jar:app.jar org.voovan.VoovanTFB diff --git a/frameworks/Java/wicket/pom.xml b/frameworks/Java/wicket/pom.xml index b7f4576382c..a27fab91670 100644 --- a/frameworks/Java/wicket/pom.xml +++ b/frameworks/Java/wicket/pom.xml @@ -1,128 +1,128 @@ - 4.0.0 - hellowicket - hellowicket - war - 1.0 - Hello Wicket - Wicket project for the TechEmpower Benchmark - - TechEmpower - https://github.com/TechEmpower/FrameworkBenchmarks - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - UTF-8 - 11 - 11 - 2.13.0 - 1.7.25 - 9.19.0 - - - - - org.apache.wicket - wicket-core - ${wicket.version} - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + hellowicket + hellowicket + war + 1.0 + Hello Wicket + Wicket project for the TechEmpower Benchmark + + TechEmpower + https://github.com/TechEmpower/FrameworkBenchmarks + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + 17 + 17 + UTF-8 + 2.13.0 + 1.7.25 + 9.19.0 + + + + + org.apache.wicket + wicket-core + ${wicket.version} + - - - com.zaxxer - HikariCP - 5.0.0 - compile - + + + com.zaxxer + HikariCP + 5.0.0 + compile + - - - org.slf4j - slf4j-simple - ${slf4j.version} - + + + org.slf4j + slf4j-simple + ${slf4j.version} + - - com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} - + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + - - mysql - mysql-connector-java - 8.0.28 - - - - - - false - src/main/resources - - - false - src/main/java - - ** - - - **/*.java - - - - - - false - src/test/resources - - - false - src/test/java - - ** - - - **/*.java - - - - - - true - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - false - - - - + + mysql + mysql-connector-java + 8.0.28 + + + + + + false + src/main/resources + + + false + src/main/java + + ** + + + **/*.java + + + + + + false + src/test/resources + + + false + src/test/java + + ** + + + **/*.java + + + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + false + + + + - - - Apache Nexus - https://repository.apache.org/content/repositories/snapshots/ - - false - - - true - - - + + + Apache Nexus + https://repository.apache.org/content/repositories/snapshots/ + + false + + + true + + + diff --git a/frameworks/Java/wicket/resin.xml b/frameworks/Java/wicket/resin.xml index 5041ba51e4f..090bd3d200d 100755 --- a/frameworks/Java/wicket/resin.xml +++ b/frameworks/Java/wicket/resin.xml @@ -2,12 +2,12 @@ xmlns:resin="http://caucho.com/ns/resin/core"> - - - + + + - + diff --git a/frameworks/Java/wicket/wicket.dockerfile b/frameworks/Java/wicket/wicket.dockerfile index 0ab0578b1ea..3106bd3c480 100644 --- a/frameworks/Java/wicket/wicket.dockerfile +++ b/frameworks/Java/wicket/wicket.dockerfile @@ -1,16 +1,21 @@ -FROM maven:3.6.1-jdk-11-slim as maven +FROM maven:3-eclipse-temurin-24-alpine as maven WORKDIR /wicket COPY src src COPY pom.xml pom.xml RUN mvn compile war:war -q -FROM openjdk:11.0.3-jdk-stretch +FROM alpine/curl:8.1.2 as curl +WORKDIR /wicket +RUN curl -sL http://caucho.com/download/resin-4.0.61.tar.gz >resin.tar.gz + +FROM openjdk:25-ea-slim-bullseye WORKDIR /resin -RUN curl -sL http://caucho.com/download/resin-4.0.61.tar.gz | tar xz --strip-components=1 +COPY --from=curl /wicket/resin.tar.gz . +RUN tar xzf ./resin.tar.gz --strip-components=1 RUN rm -rf webapps/* COPY --from=maven /wicket/target/hellowicket-1.0.war webapps/ROOT.war COPY resin.xml conf/resin.xml EXPOSE 8080 -CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-jar", "lib/resin.jar", "console"] +CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseParallelGC", "-jar", "lib/resin.jar", "console"]