Upgrade HTTP4k to new version and introduce jetty 11 variants

http4k · Dec 27, 2023 · 45c5031 · 45c5031
1 parent bf9797e
commit 45c5031
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/frameworks/Kotlin/http4k/README.md b/frameworks/Kotlin/http4k/README.md
@@ -16,13 +16,14 @@ The tests were run with:
 - Plaintext: http://localhost:9000/plaintext
 
 ## Supported backends (w/ Postgres client)
-- SunHttp/SunHttpLoom (default - bundled with core module - zero dependencies)  (+ SunHttpLoom w/GraalVM)
+- SunHttp/SunHttpLoom (default - bundled with core module - zero dependencies) (+ SunHttpLoom w/GraalVM)
 - Apache (5)
 - Apache4 (+ w/GraalVM)
 - Helidon (+ w/GraalVM)
 - KtorCIO
 - KtorNetty
 - Jetty/JettyLoom
+- Jetty/JettyLoom (v11)
 - Netty
 - Ratpack
 - Undertow

diff --git a/frameworks/Kotlin/http4k/build.gradle.kts b/frameworks/Kotlin/http4k/build.gradle.kts
@@ -1,9 +1,10 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.JavaVersion.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.js.translate.context.Namer.kotlin
 
 plugins {
-    kotlin("jvm") version "1.9.20"
+    kotlin("jvm") version "1.9.22"
     application
 }
 

diff --git a/frameworks/Kotlin/http4k/core/build.gradle.kts b/frameworks/Kotlin/http4k/core/build.gradle.kts
@@ -4,16 +4,16 @@ plugins {
 }
 
 dependencies {
-    api(platform("org.http4k:http4k-bom:5.10.2.0"))
-    api("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
-    api("org.jetbrains.kotlin:kotlin-reflect:1.9.20")
+    api(platform("org.http4k:http4k-bom:5.12.0.0"))
+    api("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
+    api("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
     api("org.http4k:http4k-core")
     api("org.http4k:http4k-format-argo")
     api("org.http4k:http4k-template-rocker")
     api("org.apache.commons:commons-lang3:3.12.0")
     api("org.cache2k:cache2k-core:2.6.1.Final")
 
-    compileOnly("com.fizzed:rocker-compiler:1.3.0")
+    compileOnly("com.fizzed:rocker-compiler:1.4.0")
 }
 
 rocker {

diff --git a/frameworks/Kotlin/http4k/jetty11/build.gradle.kts b/frameworks/Kotlin/http4k/jetty11/build.gradle.kts
@@ -2,5 +2,5 @@ application.mainClass.set("Http4kJettyServerKt")
 
 dependencies {
     api(project(":core-jdbc"))
-    api("org.http4k:http4k-server-jetty")
+    api("org.http4k:http4k-server-jetty11")
 }
diff --git a/frameworks/Kotlin/http4k/jetty11loom-jdbc/build.gradle.kts b/frameworks/Kotlin/http4k/jetty11loom-jdbc/build.gradle.kts
@@ -2,5 +2,5 @@ application.mainClass.set("Http4kJettyLoomServerKt")
 
 dependencies {
     api(project(":core-jdbc"))
-    api("org.http4k:http4k-server-jetty")
+    api("org.http4k:http4k-server-jetty11")
 }
diff --git a/frameworks/Kotlin/http4k/jetty11loom-pgclient/build.gradle.kts b/frameworks/Kotlin/http4k/jetty11loom-pgclient/build.gradle.kts
@@ -2,5 +2,5 @@ application.mainClass.set("Http4kJettyLoomServerKt")
 
 dependencies {
     api(project(":core-pgclient"))
-    api("org.http4k:http4k-server-jetty")
+    api("org.http4k:http4k-server-jetty11")
 }