Browse Source

Upgrade versions 05 2025 (#9914)

* Update logback.xml

* Update logback.xml

* Update logback.xml

* Update logback.xml

* Update logback.xml

* bumped versions all around

* updated gradle version, made java settings idential between ktor tests for consistency

* removed string cleanup setting, seems to slow down rps

---------

Co-authored-by: Ilya Nemtsev <[email protected]>
Ilya Nemtsev 2 months ago
parent
commit
65fe945622

+ 1 - 1
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"]

+ 6 - 6
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")
 }

+ 1 - 1
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

+ 1 - 1
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"]

+ 5 - 5
frameworks/Kotlin/ktor/ktor-r2dbc/pom.xml

@@ -12,15 +12,15 @@
     <name>org.jetbrains.ktor tech-empower-framework-benchmark</name>
 
     <properties>
-        <kotlin.version>2.1.20</kotlin.version>
+        <kotlin.version>2.1.21</kotlin.version>
         <kotlin.coroutines.version>1.10.1</kotlin.coroutines.version>
-        <ktor.version>3.1.2</ktor.version>
+        <ktor.version>3.1.3</ktor.version>
         <serialization.version>1.8.1</serialization.version>
         <kotlinx.html.version>0.12.0</kotlinx.html.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <logback.version>1.5.12</logback.version>
+        <logback.version>1.5.13</logback.version>
         <reactor.version>3.7.1</reactor.version>
-        <postgresql.version>42.7.4</postgresql.version>
+        <postgresql.version>42.7.5</postgresql.version>
         <r2dbc.version>1.0.7.RELEASE</r2dbc.version>
         <r2dbc.pool.version>1.0.2.RELEASE</r2dbc.pool.version>
 
@@ -150,7 +150,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.7.1</version>
 
                 <executions>
                     <execution>

+ 1 - 1
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"]

+ 7 - 11
frameworks/Kotlin/ktor/ktor/pom.xml

@@ -12,23 +12,24 @@
     <name>org.jetbrains.ktor tech-empower-framework-benchmark</name>
 
     <properties>
-        <kotlin.version>2.1.20</kotlin.version>
-        <ktor.version>3.1.2</ktor.version>
+        <kotlin.version>2.1.21</kotlin.version>
+        <ktor.version>3.1.3</ktor.version>
         <serialization.version>1.8.1</serialization.version>
         <kotlinx.html.version>0.12.0</kotlinx.html.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hikaricp.version>5.1.0</hikaricp.version>
-        <logback.version>1.5.12</logback.version>
+        <logback.version>1.5.13</logback.version>
         <mysql.version>8.0.33</mysql.version>
-        <postgresql.version>42.7.4</postgresql.version>
+        <postgresql.version>42.7.5</postgresql.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-serialization-core</artifactId>
@@ -39,11 +40,6 @@
             <artifactId>kotlinx-serialization-json</artifactId>
             <version>${serialization.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-serialization-json-io</artifactId>
-            <version>${serialization.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-html-jvm</artifactId>
@@ -150,7 +146,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.7.1</version>
 
                 <executions>
                     <execution>