Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("pmd")
id("com.diffplug.spotless") version "8.1.0"
id("com.diffplug.spotless") version "8.3.0"
id("com.github.ben-manes.versions") version "0.53.0"
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = "transact"
rootProject.name = "dbos-transact-java"
include("transact", "transact-cli")

plugins {
Expand Down
24 changes: 15 additions & 9 deletions transact-cli/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
application
id("com.gradleup.shadow") version "9.3.1"
id("com.gradleup.shadow") version "9.3.2"
}

application {
Expand All @@ -9,32 +9,38 @@ application {

dependencies {
implementation(project(":transact"))
implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1")
implementation("com.fasterxml.jackson.core:jackson-databind:2.21.1")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.1")
implementation("info.picocli:picocli:4.7.7")
runtimeOnly("org.slf4j:slf4j-simple:2.0.17")

testImplementation(platform("org.junit:junit-bom:6.0.2"))
testImplementation(platform("org.junit:junit-bom:6.0.3"))
testImplementation("org.junit.jupiter:junit-jupiter")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.3")
}

tasks.test {
useJUnitPlatform()
testLogging {
events("passed", "skipped", "failed")
showStandardStreams = true

afterSuite(KotlinClosure2({ desc: TestDescriptor, result: TestResult ->
if (desc.parent == null) {
}

addTestListener(object : TestListener {
override fun beforeSuite(suite: TestDescriptor) {}
override fun beforeTest(testDescriptor: TestDescriptor) {}
override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
if (suite.parent == null) {
println("\nTest Results:")
println(" Tests run: ${result.testCount}")
println(" Passed: ${result.successfulTestCount}")
println(" Failed: ${result.failedTestCount}")
println(" Skipped: ${result.skippedTestCount}")
}
}))
}
}
})
}

tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
Expand Down
34 changes: 20 additions & 14 deletions transact/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.vanniktech.maven.publish.DeploymentValidation
plugins {
id("java")
id("java-library")
kotlin("jvm") version "2.3.0"
kotlin("jvm") version "2.3.10"
id("com.vanniktech.maven.publish") version "0.36.0"
}

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

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

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

testImplementation(platform("org.junit:junit-bom:6.0.2"))
testImplementation(platform("org.junit:junit-bom:6.0.3"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit-pioneer:junit-pioneer:2.3.0")
testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.8")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

testImplementation("org.java-websocket:Java-WebSocket:1.6.0")
testImplementation("ch.qos.logback:logback-classic:1.5.24")
testImplementation("org.mockito:mockito-core:5.21.0")
testImplementation("ch.qos.logback:logback-classic:1.5.32")
testImplementation("org.mockito:mockito-core:5.22.0")
testImplementation("io.rest-assured:rest-assured:6.0.0")
testImplementation("io.rest-assured:json-path:6.0.0")
testImplementation("io.rest-assured:xml-path:6.0.0")
testImplementation("org.apache.maven:maven-artifact:3.9.12")
testImplementation("org.apache.maven:maven-artifact:3.9.13")
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.3")
}

val projectVersion = project.version.toString()
Expand All @@ -69,17 +70,22 @@ tasks.test {
testLogging {
events("passed", "skipped", "failed")
showStandardStreams = true

afterSuite(KotlinClosure2({ desc: TestDescriptor, result: TestResult ->
if (desc.parent == null) {
}

addTestListener(object : TestListener {
override fun beforeSuite(suite: TestDescriptor) {}
override fun beforeTest(testDescriptor: TestDescriptor) {}
override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
if (suite.parent == null) {
println("\nTest Results:")
println(" Tests run: ${result.testCount}")
println(" Passed: ${result.successfulTestCount}")
println(" Failed: ${result.failedTestCount}")
println(" Skipped: ${result.skippedTestCount}")
}
}))
}
}
})
}

tasks.withType<KotlinCompile>().configureEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.MessageToMessageDecoder;
Expand Down Expand Up @@ -612,7 +613,7 @@ void connectWebSocket() {
sslCtx = null;
}

group = new NioEventLoopGroup();
group = new MultiThreadIoEventLoopGroup(0, NioIoHandler.newFactory());
handler = new NettyWebSocketHandler();

Bootstrap b = new Bootstrap();
Expand Down
Loading