Skip to content

Commit 80e53b9

Browse files
inemtsevIlya Nemtsev
authored andcommitted
Upgrade versions 05 2025 (TechEmpower#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]>
1 parent 2d85834 commit 80e53b9

File tree

7 files changed

+22
-26
lines changed

7 files changed

+22
-26
lines changed

frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ RUN gradle --no-daemon shadowJar
77

88
EXPOSE 8080
99

10-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "-jar", "app/build/libs/app-all.jar", "Dsl"]
10+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app/build/libs/app-all.jar", "Dsl"]

frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
22
application
3-
kotlin("jvm") version "2.0.21"
4-
kotlin("plugin.serialization") version "2.0.0"
3+
kotlin("jvm") version "2.1.21"
4+
kotlin("plugin.serialization") version "2.1.21"
55
id("com.github.johnrengelman.shadow") version "8.1.0"
66
}
77

88
repositories {
99
mavenCentral()
1010
}
1111

12-
val ktorVersion = "3.1.2"
13-
val kotlinxSerializationVersion = "1.8.0"
14-
val exposedVersion = "0.59.0"
12+
val ktorVersion = "3.1.3"
13+
val kotlinxSerializationVersion = "1.8.1"
14+
val exposedVersion = "0.61.0"
1515

1616
dependencies {
1717
implementation("io.ktor:ktor-server-core:$ktorVersion")
@@ -25,7 +25,7 @@ dependencies {
2525
implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
2626
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
2727

28-
implementation("org.postgresql:postgresql:42.7.4")
28+
implementation("org.postgresql:postgresql:42.7.5")
2929
implementation("com.zaxxer:HikariCP:5.1.0")
3030
runtimeOnly("org.slf4j:slf4j-simple:1.7.36")
3131
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

frameworks/Kotlin/ktor/ktor-r2dbc.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ COPY --from=maven /ktor-r2dbc/target/tech-empower-framework-benchmark-1.0-SNAPSH
1010

1111
EXPOSE 9090
1212

13-
CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"]
13+
CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<name>org.jetbrains.ktor tech-empower-framework-benchmark</name>
1313

1414
<properties>
15-
<kotlin.version>2.1.20</kotlin.version>
15+
<kotlin.version>2.1.21</kotlin.version>
1616
<kotlin.coroutines.version>1.10.1</kotlin.coroutines.version>
17-
<ktor.version>3.1.2</ktor.version>
17+
<ktor.version>3.1.3</ktor.version>
1818
<serialization.version>1.8.1</serialization.version>
1919
<kotlinx.html.version>0.12.0</kotlinx.html.version>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<logback.version>1.5.12</logback.version>
21+
<logback.version>1.5.13</logback.version>
2222
<reactor.version>3.7.1</reactor.version>
23-
<postgresql.version>42.7.4</postgresql.version>
23+
<postgresql.version>42.7.5</postgresql.version>
2424
<r2dbc.version>1.0.7.RELEASE</r2dbc.version>
2525
<r2dbc.pool.version>1.0.2.RELEASE</r2dbc.pool.version>
2626

@@ -150,7 +150,7 @@
150150
</plugin>
151151
<plugin>
152152
<artifactId>maven-assembly-plugin</artifactId>
153-
<version>3.0.0</version>
153+
<version>3.7.1</version>
154154

155155
<executions>
156156
<execution>

frameworks/Kotlin/ktor/ktor.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-net
1010

1111
EXPOSE 9090
1212

13-
CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-XX:+UseStringDeduplication", "-jar", "app.jar"]
13+
CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseG1GC", "-XX:+AlwaysPreTouch", "-jar", "app.jar"]

frameworks/Kotlin/ktor/ktor/pom.xml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@
1212
<name>org.jetbrains.ktor tech-empower-framework-benchmark</name>
1313

1414
<properties>
15-
<kotlin.version>2.1.20</kotlin.version>
16-
<ktor.version>3.1.2</ktor.version>
15+
<kotlin.version>2.1.21</kotlin.version>
16+
<ktor.version>3.1.3</ktor.version>
1717
<serialization.version>1.8.1</serialization.version>
1818
<kotlinx.html.version>0.12.0</kotlinx.html.version>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<hikaricp.version>5.1.0</hikaricp.version>
21-
<logback.version>1.5.12</logback.version>
21+
<logback.version>1.5.13</logback.version>
2222
<mysql.version>8.0.33</mysql.version>
23-
<postgresql.version>42.7.4</postgresql.version>
23+
<postgresql.version>42.7.5</postgresql.version>
2424
</properties>
2525

2626
<dependencies>
2727
<dependency>
2828
<groupId>org.jetbrains.kotlin</groupId>
29-
<artifactId>kotlin-reflect</artifactId>
29+
<artifactId>kotlin-stdlib</artifactId>
3030
<version>${kotlin.version}</version>
3131
</dependency>
32+
3233
<dependency>
3334
<groupId>org.jetbrains.kotlinx</groupId>
3435
<artifactId>kotlinx-serialization-core</artifactId>
@@ -39,11 +40,6 @@
3940
<artifactId>kotlinx-serialization-json</artifactId>
4041
<version>${serialization.version}</version>
4142
</dependency>
42-
<dependency>
43-
<groupId>org.jetbrains.kotlinx</groupId>
44-
<artifactId>kotlinx-serialization-json-io</artifactId>
45-
<version>${serialization.version}</version>
46-
</dependency>
4743
<dependency>
4844
<groupId>org.jetbrains.kotlinx</groupId>
4945
<artifactId>kotlinx-html-jvm</artifactId>
@@ -150,7 +146,7 @@
150146
</plugin>
151147
<plugin>
152148
<artifactId>maven-assembly-plugin</artifactId>
153-
<version>3.0.0</version>
149+
<version>3.7.1</version>
154150

155151
<executions>
156152
<execution>

0 commit comments

Comments
 (0)