diff --git a/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile b/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile index 495b8b6c0e6..d89f899a9d1 100644 --- a/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile +++ b/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile @@ -7,4 +7,4 @@ RUN gradle --no-daemon shadowJar EXPOSE 8080 -CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "-jar", "app/build/libs/app-all.jar", "Dsl"] +CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app/build/libs/app-all.jar", "Dsl"] diff --git a/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts b/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts index 56398c64112..1ce1ba7f1fb 100644 --- a/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts +++ b/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts @@ -1,7 +1,7 @@ plugins { application - kotlin("jvm") version "2.0.21" - kotlin("plugin.serialization") version "2.0.0" + kotlin("jvm") version "2.1.21" + kotlin("plugin.serialization") version "2.1.21" id("com.github.johnrengelman.shadow") version "8.1.0" } @@ -9,9 +9,9 @@ repositories { mavenCentral() } -val ktorVersion = "3.1.2" -val kotlinxSerializationVersion = "1.8.0" -val exposedVersion = "0.59.0" +val ktorVersion = "3.1.3" +val kotlinxSerializationVersion = "1.8.1" +val exposedVersion = "0.61.0" dependencies { implementation("io.ktor:ktor-server-core:$ktorVersion") @@ -25,7 +25,7 @@ dependencies { implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion") implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion") - implementation("org.postgresql:postgresql:42.7.4") + implementation("org.postgresql:postgresql:42.7.5") implementation("com.zaxxer:HikariCP:5.1.0") runtimeOnly("org.slf4j:slf4j-simple:1.7.36") } diff --git a/frameworks/Kotlin/ktor/ktor-exposed/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/ktor/ktor-exposed/gradle/wrapper/gradle-wrapper.properties index 4eaec467050..18362b78bde 100644 --- a/frameworks/Kotlin/ktor/ktor-exposed/gradle/wrapper/gradle-wrapper.properties +++ b/frameworks/Kotlin/ktor/ktor-exposed/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/frameworks/Kotlin/ktor/ktor-r2dbc.dockerfile b/frameworks/Kotlin/ktor/ktor-r2dbc.dockerfile index 9281f4974ac..0c7fc7c2e15 100644 --- a/frameworks/Kotlin/ktor/ktor-r2dbc.dockerfile +++ b/frameworks/Kotlin/ktor/ktor-r2dbc.dockerfile @@ -10,4 +10,4 @@ COPY --from=maven /ktor-r2dbc/target/tech-empower-framework-benchmark-1.0-SNAPSH EXPOSE 9090 -CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"] +CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"] diff --git a/frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml b/frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml index cffd5da8488..9f0754b9512 100644 --- a/frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml +++ b/frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml @@ -12,15 +12,15 @@ org.jetbrains.ktor tech-empower-framework-benchmark - 2.1.20 + 2.1.21 1.10.1 - 3.1.2 + 3.1.3 1.8.1 0.12.0 UTF-8 - 1.5.12 + 1.5.13 3.7.1 - 42.7.4 + 42.7.5 1.0.7.RELEASE 1.0.2.RELEASE @@ -150,7 +150,7 @@ maven-assembly-plugin - 3.0.0 + 3.7.1 diff --git a/frameworks/Kotlin/ktor/ktor.dockerfile b/frameworks/Kotlin/ktor/ktor.dockerfile index 522fa558851..c2624695540 100644 --- a/frameworks/Kotlin/ktor/ktor.dockerfile +++ b/frameworks/Kotlin/ktor/ktor.dockerfile @@ -10,4 +10,4 @@ COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-net EXPOSE 9090 -CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-XX:+UseStringDeduplication", "-jar", "app.jar"] +CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"] diff --git a/frameworks/Kotlin/ktor/ktor/pom.xml b/frameworks/Kotlin/ktor/ktor/pom.xml index 1ae4aa0b3d5..a6adb0a651b 100644 --- a/frameworks/Kotlin/ktor/ktor/pom.xml +++ b/frameworks/Kotlin/ktor/ktor/pom.xml @@ -12,23 +12,24 @@ org.jetbrains.ktor tech-empower-framework-benchmark - 2.1.20 - 3.1.2 + 2.1.21 + 3.1.3 1.8.1 0.12.0 UTF-8 5.1.0 - 1.5.12 + 1.5.13 8.0.33 - 42.7.4 + 42.7.5 org.jetbrains.kotlin - kotlin-reflect + kotlin-stdlib ${kotlin.version} + org.jetbrains.kotlinx kotlinx-serialization-core @@ -39,11 +40,6 @@ kotlinx-serialization-json ${serialization.version} - - org.jetbrains.kotlinx - kotlinx-serialization-json-io - ${serialization.version} - org.jetbrains.kotlinx kotlinx-html-jvm @@ -150,7 +146,7 @@ maven-assembly-plugin - 3.0.0 + 3.7.1