Fix some of the broken java base images (#10262)

* fix broken java base images

* Update Hikari CP settings in httpserver and ring-http-exchange

* Add semeru to ring-http-exchange

---------

Co-authored-by: jj <[email protected]>

Author: ruroru

frameworks/Clojure/ring-http-exchange/benchmark_config.json

@@ -81,6 +81,26 @@
         "display_name": "ring-http-exchange-robaho-graalvm",
         "notes": "",
         "versus": "ring-http-exchange-robaho"
+      },
+      "robaho-semeru": {
+        "json_url": "/json",
+        "plaintext_url": "/plaintext",
+        "fortune_url": "/fortunes",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Platform",
+        "database": "postgres",
+        "framework": "None",
+        "language": "Clojure",
+        "flavor": "None",
+        "orm": "Raw",
+        "platform": "None",
+        "webserver": "None",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "ring-http-exchange-robaho-semeru",
+        "notes": "",
+        "versus": "ring-http-exchange-robaho"
       }
     }
   ]

frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-semeru.dockerfile

@@ -0,0 +1,14 @@
+FROM clojure:lein as lein
+WORKDIR /ring-http-exchange
+COPY project.clj project.clj
+COPY resources resources
+COPY src src
+RUN lein with-profile robaho uberjar
+
+FROM ibm-semeru-runtimes:open-25-jre-jammy
+WORKDIR /ring-http-exchange
+COPY --from=lein /ring-http-exchange/target/ring-http-server-1.0.0-standalone.jar app.jar
+
+EXPOSE 8080
+
+CMD ["java", "-server", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj

@@ -15,14 +15,13 @@
 (def query-fortunes (boa/execute (boa/->NextJdbcAdapter) "fortune.sql"))
 
 (def db-spec {:auto-commit        true
-              :read-only          false
-              :connection-timeout 30000
+              :read-only          true
+              :connection-timeout 10000
               :validation-timeout 5000
               :idle-timeout       600000
               :max-lifetime       1800000
-              :minimum-idle       10
-              :maximum-pool-size  520
-              :minimum-pool-size  512
+              :minimum-idle       16
+              :maximum-pool-size  64
               :register-mbeans    false
               :jdbcUrl            "jdbc:postgresql://tfb-database/hello_world?user=benchmarkdbuser&password=benchmarkdbpass"})
 

frameworks/Java/activej/activej.dockerfile

@@ -1,11 +1,11 @@
-FROM maven:3.6.1-jdk-11-slim as maven
-
+FROM maven:3.9.0-eclipse-temurin-17 as maven
 WORKDIR /activej
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile assembly:single -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM amazoncorretto:25
 WORKDIR /activej
 COPY --from=maven /activej/target/activej-server-benchmark-0.0.1-SNAPSHOT-jar-with-dependencies.jar app.jar
-CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-DHttpServerConnection.initialWriteBufferSize=4096", "-DHttpHeadersMultimap.initialSize=16", "-jar", "app.jar"]
+EXPOSE 8080
+CMD ["java", "-server", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile

@@ -4,7 +4,7 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P postgres,jdbi
 
-FROM openjdk:11.0.3-jdk-slim
+FROM amazoncorretto:25
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-jdbi-postgres.yml hello-world-jdbi-postgres.yml

frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile

@@ -4,7 +4,7 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mongo
 
-FROM openjdk:11.0.3-jdk-slim
+FROM amazoncorretto:25
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-mongo.yml hello-world-mongo.yml

frameworks/Java/dropwizard/dropwizard-postgres.dockerfile

@@ -4,7 +4,7 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P postgres
 
-FROM openjdk:11.0.3-jdk-slim
+FROM amazoncorretto:25
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-postgres.yml hello-world-postgres.yml

frameworks/Java/dropwizard/dropwizard.dockerfile

@@ -4,7 +4,7 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mysql
 
-FROM openjdk:11.0.3-jdk-slim
+FROM amazoncorretto:25
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-mysql.yml hello-world-mysql.yml

frameworks/Java/httpserver/pom.xml

@@ -30,23 +30,21 @@
             <artifactId>postgresql</artifactId>
             <version>42.7.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-
         <dependency>
             <groupId>com.github.httl</groupId>
             <artifactId>httl</artifactId>
             <version>1.0.11</version>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.8.0-beta4</version>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>7.0.2</version>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

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

@@ -52,12 +52,23 @@ private static List<Fortune> queryFortunes(DataSource ds) throws SQLException {
     }
 
     private static DataSource createPostgresDataSource() throws ClassNotFoundException {
-        Class.forName("org.postgresql.Driver");
         HikariConfig config = new HikariConfig();
+
         config.setJdbcUrl("jdbc:postgresql://tfb-database:5432/hello_world");
         config.setUsername("benchmarkdbuser");
         config.setPassword("benchmarkdbpass");
-        config.setMaximumPoolSize(512);
+
+        config.setMaximumPoolSize(64);
+        config.setMinimumIdle(16);
+
+        config.setConnectionTimeout(10000);
+        config.setIdleTimeout(600000);
+        config.setMaxLifetime(1800000);
+
+        config.setAutoCommit(true);
+
+        config.setPoolName("PostgreSQL-HikariCP-Pool");
+
         return new HikariDataSource(config);
     }
 
@@ -145,4 +156,4 @@ static void main(String[] args) throws Exception {
         // start server
         server.start();
     }
-}
+}