Skip to content

Commit af8ba4d

Browse files
authored
Update Dependencies (#404)
1 parent a8039cf commit af8ba4d

14 files changed

Lines changed: 109 additions & 212 deletions

File tree

.github/workflows/publish.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,5 @@ jobs:
6565
target_commitish: ${{ github.sha }}
6666
prerelease: ${{ steps.get_version.outputs.commit_count != '0' }}
6767
files: |
68-
transact/build/libs/*.jar
69-
transact-cli/build/libs/dbos.jar
68+
transact*/build/libs/*.jar
7069

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Test Summary
4545
uses: test-summary/action@v2
4646
with:
47-
paths: "transact/build/test-results/test/TEST-*.xml"
47+
paths: "transact*/build/test-results/test/TEST-*.xml"
4848
show: "fail, skip"
4949
if: always()
5050

@@ -54,5 +54,5 @@ jobs:
5454
with:
5555
name: test-results-${{ matrix.jdk-version }}-${{ matrix.jdk-distro }}
5656
path: |
57-
transact/build/reports/tests/
58-
transact/build/test-results/
57+
transact*/build/reports/tests/
58+
transact*/build/test-results/

.github/workflows/test_crdb.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Test Summary
3333
uses: test-summary/action@v2
3434
with:
35-
paths: "transact/build/test-results/test/TEST-*.xml"
35+
paths: "transact*/build/test-results/test/TEST-*.xml"
3636
show: "fail, skip"
3737
if: always()
3838

@@ -42,5 +42,5 @@ jobs:
4242
with:
4343
name: test-results-crdb-temurin-25
4444
path: |
45-
transact/build/reports/tests/
46-
transact/build/test-results/
45+
transact*/build/reports/tests/
46+
transact*/build/test-results/

build.gradle.kts

Lines changed: 61 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.vanniktech.maven.publish.DeploymentValidation
2+
13
plugins {
24
id("pmd")
35
alias(libs.plugins.spotless)
@@ -91,6 +93,10 @@ spotless {
9193
}
9294
}
9395

96+
val pmdVersion = libs.versions.pmd.get()
97+
98+
extensions.configure<org.gradle.api.plugins.quality.PmdExtension> { toolVersion = pmdVersion }
99+
94100
subprojects {
95101
apply(plugin = "java")
96102
apply(plugin = "pmd")
@@ -99,7 +105,7 @@ subprojects {
99105

100106
// PMD configuration
101107
extensions.configure<org.gradle.api.plugins.quality.PmdExtension> {
102-
toolVersion = "7.16.0"
108+
toolVersion = pmdVersion
103109
ruleSets = listOf() // disable defaults
104110
ruleSetFiles = files("${rootDir}/config/pmd/ruleset.xml")
105111
isConsoleOutput = true
@@ -133,17 +139,11 @@ subprojects {
133139

134140
tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
135141
rejectVersionIf {
136-
val isUnstable =
142+
fun isUnstable(version: String) =
137143
listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea").any { qualifier ->
138-
candidate.version.lowercase().contains(qualifier)
144+
version.lowercase().contains(qualifier)
139145
}
140-
141-
val isStable =
142-
listOf("release", "final", "ga").any { qualifier ->
143-
currentVersion.lowercase().contains(qualifier)
144-
}
145-
146-
isUnstable && !isStable
146+
isUnstable(candidate.version) && !isUnstable(currentVersion)
147147
}
148148
}
149149

@@ -154,9 +154,12 @@ subprojects {
154154
targetCompatibility = JavaVersion.VERSION_17
155155
}
156156

157-
// Allow the compiler to see higher-version APIs for reflection but keep the bytecode target at
158-
// 17.
159-
tasks.withType<JavaCompile> { options.release.set(17) }
157+
tasks.withType<JavaCompile> {
158+
options.release.set(17)
159+
options.compilerArgs.addAll(
160+
listOf("-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:rawtypes", "-Werror")
161+
)
162+
}
160163

161164
// use the environment's JDK instead of the toolchain's JDK for tests
162165
tasks.withType<Test> { javaLauncher.set(null as JavaLauncher?) }
@@ -213,4 +216,49 @@ subprojects {
213216
}
214217
}
215218
}
219+
220+
plugins.withId("com.vanniktech.maven.publish") {
221+
val publishingToMavenCentral =
222+
gradle.startParameter.taskNames.any { it.contains("publishToMavenCentral") }
223+
224+
tasks.withType<Javadoc> {
225+
(options as StandardJavadocDocletOptions).apply {
226+
addStringOption("Xdoclint:all,-missing", "-quiet")
227+
encoding = "UTF-8"
228+
}
229+
}
230+
231+
tasks.named("build") { dependsOn("javadoc") }
232+
233+
extensions.configure<com.vanniktech.maven.publish.MavenPublishBaseExtension> {
234+
publishToMavenCentral(automaticRelease = true, validateDeployment = DeploymentValidation.NONE)
235+
if (publishingToMavenCentral) signAllPublications()
236+
237+
pom {
238+
inceptionYear.set("2025")
239+
url.set("https://github.com/dbos-inc/dbos-transact-java")
240+
241+
licenses {
242+
license {
243+
name.set("MIT License")
244+
url.set("https://opensource.org/licenses/MIT")
245+
}
246+
}
247+
248+
developers {
249+
developer {
250+
id.set("dbos-inc")
251+
name.set("DBOS Inc")
252+
email.set("support@dbos.dev")
253+
}
254+
}
255+
256+
scm {
257+
connection.set("scm:git:git://github.com/dbos-inc/dbos-transact-java.git")
258+
developerConnection.set("scm:git:ssh://github.com:dbos-inc/dbos-transact-java.git")
259+
url.set("https://github.com/dbos-inc/dbos-transact-java/tree/main")
260+
}
261+
}
262+
}
263+
}
216264
}

gradle/libs.versions.toml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
[versions]
2-
asm = "9.9.1"
3-
aspectj = "1.9.22.1"
2+
asm = "9.10.1"
3+
aspectj = "1.9.25.1"
44
assertj = "3.27.7"
55
cron-utils = "9.2.1"
6-
hibernate = "6.6.15.Final"
6+
hibernate = "7.4.0.Final"
77
hikaricp = "7.0.2"
88
jackson = "2.21.3"
99
java-websocket = "1.6.0"
1010
jaxb-api = "4.0.5"
1111
jdbi = "3.53.0"
12-
# jOOQ pinned to 3.19.x for JDK 17 compatibility
12+
# jOOQ pinned to 3.19.x for JDK 17 compat https://www.jooq.org/download/support-matrix-jdk
1313
jooq = "3.19.34"
1414
jspecify = "1.0.0"
15-
junit = "6.0.3"
15+
junit = "6.1.0"
1616
junit-pioneer = "2.3.0"
1717
kotlin = "2.3.21"
1818
kryo = "5.6.2"
19-
logback = "1.5.32"
20-
maven-artifact = "3.9.15"
19+
logback = "1.5.33"
20+
maven-artifact = "3.9.16"
2121
maven-publish = "0.36.0"
2222
mockito = "5.23.0"
2323
picocli = "4.7.7"
24+
pmd = "7.24.0"
2425
postgresql = "42.7.11"
2526
rest-assured = "6.0.0"
26-
shadow = "9.4.1"
27+
shadow = "9.4.2"
2728
slf4j = "2.0.18"
28-
spotless = "8.4.0"
29-
# Spring Boot pinned to 3.5.x. Enterprise support for 3.5 lasts until 2032
29+
spotless = "8.6.0"
30+
# Spring Boot pinned to 3.5.x for LTS https://spring.io/projects/spring-boot#support
3031
spring-boot = "3.5.14"
3132
# Spring Boot 4.0.x binaries for test purposes
3233
spring-boot4 = "4.0.6"
34+
# Spring Framework pinned to 6.2.x for LTS https://spring.io/projects/spring-framework#support
3335
spring-framework = "6.2.18"
3436
sqlite-jdbc = "3.53.1.0"
3537
system-stubs = "2.1.8"
3638
testcontainers = "2.0.5"
37-
versions = "0.53.0"
39+
versions = "0.54.0"
3840

3941
[libraries]
4042
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

transact-cli/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,3 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
2222
archiveVersion.set("")
2323
archiveClassifier.set("")
2424
}
25-
26-
tasks.withType<JavaCompile> {
27-
options.compilerArgs.add("-Xlint:unchecked") // warn about unchecked operations
28-
options.compilerArgs.add("-Xlint:deprecation") // warn about deprecated APIs
29-
options.compilerArgs.add("-Xlint:rawtypes") // warn about raw types
30-
options.compilerArgs.add("-Werror") // treat all warnings as errors
31-
}

transact-jdbi-step-factory/build.gradle.kts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
plugins { id("java-library") }
1+
plugins {
2+
id("java-library")
3+
alias(libs.plugins.maven.publish)
4+
}
25

3-
tasks.withType<JavaCompile> {
4-
options.compilerArgs.add("-Xlint:unchecked")
5-
options.compilerArgs.add("-Xlint:deprecation")
6-
options.compilerArgs.add("-Xlint:rawtypes")
7-
options.compilerArgs.add("-Werror")
6+
mavenPublishing {
7+
pom {
8+
name.set("DBOS Transact JDBI Step Factory")
9+
description.set("JDBI step factory for DBOS Transact Java SDK")
10+
}
811
}
912

1013
dependencies {

0 commit comments

Comments
 (0)