Update dependencies

hexagontk · Aug 3, 2024 · b05b433 · b05b433
1 parent 41b353c
commit b05b433
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 26 deletions.
diff --git a/frameworks/Kotlin/hexagon/build.gradle b/frameworks/Kotlin/hexagon/build.gradle
@@ -1,21 +1,21 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.9.23" apply false
-    id "org.graalvm.buildtools.native" version "0.10.1" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.0.20-RC" apply false
+    id "org.graalvm.buildtools.native" version "0.10.2" apply false
 }
 
 version = "1.0.0"
 description = "TFB benchmark"
 group = "com.hexagonkt"
 
 ext {
-    hexagonVersion = "3.5.1"
-    jettyVersion = "12.0.7"
-    nettyVersion = "4.1.107.Final"
+    hexagonVersion = "3.6.1"
+    jettyVersion = "12.0.12"
+    nettyVersion = "4.1.112.Final"
 
     hikariVersion = "5.1.0"
     postgresqlVersion = "42.7.3"
-    vertxVersion = "4.5.5"
+    vertxVersion = "4.5.9"
     cache2kVersion = "2.6.1.Final"
 
     applicationClass = "com.hexagonkt.BenchmarkKt"
@@ -30,5 +30,5 @@ subprojects {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.6"
+    gradleVersion = "8.9"
 }
diff --git a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-helidon-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_helidon_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile b/frameworks/Kotlin/hexagon/hexagon-helidon.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_helidon_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_jetty_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_jetty_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_nettyepoll_pgclient
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_nettyepoll_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile b/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test war
 #
 # RUNTIME
 #
-FROM docker.io/tomcat:10-jre21-temurin-jammy
+FROM docker.io/tomcat:11.0.0-jre21-temurin-noble
 ARG MODULE=/hexagon/hexagon_tomcat_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon.dockerfile b/frameworks/Kotlin/hexagon/hexagon.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.6-jdk21-alpine AS build
+FROM docker.io/gradle:8.9-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:21-jre-alpine
+FROM docker.io/bellsoft/liberica-runtime-container:jre-21-musl
 ARG PROJECT=hexagon_jetty_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon_tomcat_postgresql/src/main/kotlin/WebListenerServer.kt b/frameworks/Kotlin/hexagon/hexagon_tomcat_postgresql/src/main/kotlin/WebListenerServer.kt
@@ -6,6 +6,7 @@ import com.hexagonkt.http.model.Header
 import com.hexagonkt.http.model.Headers
 import com.hexagonkt.http.handlers.HttpHandler
 import com.hexagonkt.http.handlers.OnHandler
+import com.hexagonkt.http.handlers.PathHandler
 import com.hexagonkt.http.server.servlet.ServletServer
 import com.hexagonkt.store.BenchmarkSqlStore
 import com.hexagonkt.templates.jte.JteAdapter
@@ -18,7 +19,7 @@ import jakarta.servlet.annotation.WebListener
     private companion object {
         val headers = Headers(Header("server", "Tomcat"))
 
-        fun createHandlers(settings: Settings): List<HttpHandler> {
+        fun createHandlers(settings: Settings): HttpHandler {
             val store = BenchmarkSqlStore("postgresql")
             val templateEngine = JteAdapter(TEXT_HTML, precompiled = true)
             val templateUrl = urlOf("classpath:fortunes.jte")
@@ -28,7 +29,7 @@ import jakarta.servlet.annotation.WebListener
                 send(headers = headers)
             }
 
-            return listOf(serverHeaderHandler, controllerPath)
+            return PathHandler(serverHeaderHandler, controllerPath)
         }
     }
 }