Update dependencies

hexagontk · Oct 20, 2023 · 7bada45 · 7bada45
1 parent d10bbce
commit 7bada45
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 38 deletions.
diff --git a/frameworks/Kotlin/hexagon/build.gradle b/frameworks/Kotlin/hexagon/build.gradle
@@ -1,26 +1,25 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.9.10" apply false
-    id "org.graalvm.buildtools.native" version "0.9.27" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.9.20-RC" apply false
+    id "org.graalvm.buildtools.native" version "0.9.28" apply false
 }
 
 version = "1.0.0"
 description = "TFB benchmark"
 group = "com.hexagonkt"
 
 ext {
-    hexagonVersion = "3.2.0"
-    jettyVersion = "12.0.0"
-    nettyVersion = "4.1.97.Final"
+    hexagonVersion = "3.3.1"
+    jettyVersion = "12.0.2"
+    nettyVersion = "4.1.100.Final"
 
     hikariVersion = "5.0.1"
     postgresqlVersion = "42.6.0"
-    vertxVersion = "4.4.5"
+    vertxVersion = "4.4.6"
     cache2kVersion = "2.6.1.Final"
 
     applicationClass = "com.hexagonkt.BenchmarkKt"
     modules = "java.naming,java.sql,java.management"
-    options = "--enable-preview"
     gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/$hexagonVersion/gradle"
 }
 
@@ -29,3 +28,7 @@ subprojects {
 
     apply(from: "$gradleScripts/kotlin.gradle")
 }
+
+tasks.wrapper {
+    gradleVersion = "8.4"
+}
diff --git a/frameworks/Kotlin/hexagon/core/build.gradle b/frameworks/Kotlin/hexagon/core/build.gradle
@@ -1,6 +1,7 @@
 
 plugins {
-    id("nu.studer.rocker") version("3.0.4")
+//    id("nu.studer.rocker") version("3.0.4")
+    id("com.fizzed.rocker") version("1.4.0")
 }
 
 dependencies {
@@ -23,10 +24,11 @@ tasks.register("minimizeTemplate") {
 jar.dependsOn("minimizeTemplate")
 
 rocker {
-    configurations {
-        create("main") {
-            templateDir.set(file("src/main/resources"))
-            optimize.set(true)
-        }
-    }
+    classBaseDirectory = file("build")
+//    configurations {
+//        create("main") {
+//            templateDir.set(file("src/main/resources"))
+//            optimize.set(true)
+//        }
+//    }
 }
diff --git a/...main/resources/META-INF/native-image/com.hexagonkt.benchmark/core/native-image.properties b/...main/resources/META-INF/native-image/com.hexagonkt.benchmark/core/native-image.properties
@@ -1,7 +1,6 @@
 Args= \
   -H:IncludeResources=.*\\.(html|class) \
   -march=native \
-  --enable-preview \
   --static \
   --libc=musl \
   --initialize-at-build-time=org.slf4j.jul.JDK14LoggerAdapter \

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/frameworks/Kotlin/hexagon/gradlew b/frameworks/Kotlin/hexagon/gradlew
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:20-jre-alpine
+FROM docker.io/eclipse-temurin:21-jre-alpine
 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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:20-jre-alpine
+FROM docker.io/eclipse-temurin:21-jre-alpine
 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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:17-jre-alpine
+FROM docker.io/eclipse-temurin:21-jre-alpine
 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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:17-jre-alpine
+FROM docker.io/eclipse-temurin:21-jre-alpine
 ARG PROJECT=hexagon_nettyepoll_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/hexagon-nima-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nima-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 

diff --git a/frameworks/Kotlin/hexagon/hexagon-nima.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nima.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 

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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test war
 #
 # RUNTIME
 #
-FROM docker.io/tomcat:10-jre17-temurin-jammy
+FROM docker.io/tomcat:10-jre21-temurin-jammy
 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.3-jdk17-alpine AS build
+FROM docker.io/gradle:8.4-jdk21-alpine AS build
 USER root
 WORKDIR /hexagon
 
@@ -12,7 +12,7 @@ RUN gradle --quiet -x test installDist
 #
 # RUNTIME
 #
-FROM docker.io/eclipse-temurin:17-jre-alpine
+FROM docker.io/eclipse-temurin:21-jre-alpine
 ARG PROJECT=hexagon_jetty_postgresql
 
 ENV POSTGRESQL_DB_HOST tfb-database

diff --git a/frameworks/Kotlin/hexagon/store_pgclient/build.gradle b/frameworks/Kotlin/hexagon/store_pgclient/build.gradle
@@ -2,5 +2,5 @@
 dependencies {
     api(project(":core"))
     implementation("io.vertx:vertx-pg-client:$vertxVersion")
-    implementation("com.ongres.scram:client:2.1")
+//    implementation("com.ongres.scram:client:2.1")
 }