Skip to content

Commit f797601

Browse files
authored
update dependencies (#307)
1 parent 2f7642b commit f797601

7 files changed

Lines changed: 41 additions & 28 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("pmd")
3-
id("com.diffplug.spotless") version "8.1.0"
3+
id("com.diffplug.spotless") version "8.3.0"
44
id("com.github.ben-manes.versions") version "0.53.0"
55
}
66

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = "transact"
1+
rootProject.name = "dbos-transact-java"
22
include("transact", "transact-cli")
33

44
plugins {

transact-cli/build.gradle.kts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
application
3-
id("com.gradleup.shadow") version "9.3.1"
3+
id("com.gradleup.shadow") version "9.3.2"
44
}
55

66
application {
@@ -9,32 +9,38 @@ application {
99

1010
dependencies {
1111
implementation(project(":transact"))
12-
implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
13-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1")
12+
implementation("com.fasterxml.jackson.core:jackson-databind:2.21.1")
13+
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.1")
1414
implementation("info.picocli:picocli:4.7.7")
1515
runtimeOnly("org.slf4j:slf4j-simple:2.0.17")
1616

17-
testImplementation(platform("org.junit:junit-bom:6.0.2"))
17+
testImplementation(platform("org.junit:junit-bom:6.0.3"))
1818
testImplementation("org.junit.jupiter:junit-jupiter")
1919
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
20+
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.3")
2021
}
2122

2223
tasks.test {
2324
useJUnitPlatform()
2425
testLogging {
2526
events("passed", "skipped", "failed")
2627
showStandardStreams = true
27-
28-
afterSuite(KotlinClosure2({ desc: TestDescriptor, result: TestResult ->
29-
if (desc.parent == null) {
28+
}
29+
30+
addTestListener(object : TestListener {
31+
override fun beforeSuite(suite: TestDescriptor) {}
32+
override fun beforeTest(testDescriptor: TestDescriptor) {}
33+
override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
34+
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
35+
if (suite.parent == null) {
3036
println("\nTest Results:")
3137
println(" Tests run: ${result.testCount}")
3238
println(" Passed: ${result.successfulTestCount}")
3339
println(" Failed: ${result.failedTestCount}")
3440
println(" Skipped: ${result.skippedTestCount}")
3541
}
36-
}))
37-
}
42+
}
43+
})
3844
}
3945

4046
tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {

transact/build.gradle.kts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.vanniktech.maven.publish.DeploymentValidation
55
plugins {
66
id("java")
77
id("java-library")
8-
kotlin("jvm") version "2.3.0"
8+
kotlin("jvm") version "2.3.10"
99
id("com.vanniktech.maven.publish") version "0.36.0"
1010
}
1111

@@ -30,28 +30,29 @@ tasks.named("build") {
3030
dependencies {
3131
api("org.slf4j:slf4j-api:2.0.17") // logging api
3232

33-
implementation("org.postgresql:postgresql:42.7.9")
33+
implementation("org.postgresql:postgresql:42.7.10")
3434
implementation("com.zaxxer:HikariCP:7.0.2") // Connection pool
35-
implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1") // json
36-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1")
35+
implementation("com.fasterxml.jackson.core:jackson-databind:2.21.1") // json
36+
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.1")
3737
implementation("com.cronutils:cron-utils:9.2.1") // cron for scheduled wf
38-
implementation("io.netty:netty-all:4.1.130.Final") // netty for websocket
38+
implementation("io.netty:netty-all:4.2.10.Final") // netty for websocket
3939

4040
compileOnly("org.jspecify:jspecify:1.0.0")
4141

42-
testImplementation(platform("org.junit:junit-bom:6.0.2"))
42+
testImplementation(platform("org.junit:junit-bom:6.0.3"))
4343
testImplementation("org.junit.jupiter:junit-jupiter")
4444
testImplementation("org.junit-pioneer:junit-pioneer:2.3.0")
4545
testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.8")
4646
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
4747

4848
testImplementation("org.java-websocket:Java-WebSocket:1.6.0")
49-
testImplementation("ch.qos.logback:logback-classic:1.5.24")
50-
testImplementation("org.mockito:mockito-core:5.21.0")
49+
testImplementation("ch.qos.logback:logback-classic:1.5.32")
50+
testImplementation("org.mockito:mockito-core:5.22.0")
5151
testImplementation("io.rest-assured:rest-assured:6.0.0")
5252
testImplementation("io.rest-assured:json-path:6.0.0")
5353
testImplementation("io.rest-assured:xml-path:6.0.0")
54-
testImplementation("org.apache.maven:maven-artifact:3.9.12")
54+
testImplementation("org.apache.maven:maven-artifact:3.9.13")
55+
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.3")
5556
}
5657

5758
val projectVersion = project.version.toString()
@@ -69,17 +70,22 @@ tasks.test {
6970
testLogging {
7071
events("passed", "skipped", "failed")
7172
showStandardStreams = true
72-
73-
afterSuite(KotlinClosure2({ desc: TestDescriptor, result: TestResult ->
74-
if (desc.parent == null) {
73+
}
74+
75+
addTestListener(object : TestListener {
76+
override fun beforeSuite(suite: TestDescriptor) {}
77+
override fun beforeTest(testDescriptor: TestDescriptor) {}
78+
override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
79+
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
80+
if (suite.parent == null) {
7581
println("\nTest Results:")
7682
println(" Tests run: ${result.testCount}")
7783
println(" Passed: ${result.successfulTestCount}")
7884
println(" Failed: ${result.failedTestCount}")
7985
println(" Skipped: ${result.skippedTestCount}")
8086
}
81-
}))
82-
}
87+
}
88+
})
8389
}
8490

8591
tasks.withType<KotlinCompile>().configureEach {

transact/src/main/java/dev/dbos/transact/conductor/Conductor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@
7272
import io.netty.channel.ChannelHandlerContext;
7373
import io.netty.channel.ChannelInitializer;
7474
import io.netty.channel.EventLoopGroup;
75+
import io.netty.channel.MultiThreadIoEventLoopGroup;
7576
import io.netty.channel.SimpleChannelInboundHandler;
76-
import io.netty.channel.nio.NioEventLoopGroup;
77+
import io.netty.channel.nio.NioIoHandler;
7778
import io.netty.channel.socket.SocketChannel;
7879
import io.netty.channel.socket.nio.NioSocketChannel;
7980
import io.netty.handler.codec.MessageToMessageDecoder;
@@ -612,7 +613,7 @@ void connectWebSocket() {
612613
sslCtx = null;
613614
}
614615

615-
group = new NioEventLoopGroup();
616+
group = new MultiThreadIoEventLoopGroup(0, NioIoHandler.newFactory());
616617
handler = new NettyWebSocketHandler();
617618

618619
Bootstrap b = new Bootstrap();

0 commit comments

Comments
 (0)