Skip to content
Open
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
10 changes: 5 additions & 5 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ repositories {
// historical versions so applying the conventions does not silently upgrade
// compiler output.
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
implementation("org.jetbrains.kotlin:kotlin-allopen:2.3.21")
implementation("org.jetbrains.kotlin:kotlin-noarg:2.3.21")
implementation("org.springframework.boot:spring-boot-gradle-plugin:4.0.6")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.10")
implementation("org.jetbrains.kotlin:kotlin-allopen:2.4.10")
implementation("org.jetbrains.kotlin:kotlin-noarg:2.4.10")
implementation("org.springframework.boot:spring-boot-gradle-plugin:4.1.0")
implementation("io.spring.dependency-management:io.spring.dependency-management.gradle.plugin:1.1.7")
// detekt + ktlint are available as convention plugins but not applied
// anywhere in this PR — they are opt-in per service to avoid a wall of
// style failures on the existing tree. Introduce per service later.
implementation("dev.detekt:detekt-gradle-plugin:2.0.0-alpha.5")
implementation("org.jlleitschuh.gradle:ktlint-gradle:14.2.0")
implementation("org.openapitools:openapi-generator-gradle-plugin:7.22.0")
implementation("org.openapitools:openapi-generator-gradle-plugin:7.24.0")
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

164 changes: 82 additions & 82 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions libs/kotlin-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ version = "0.0.1-SNAPSHOT"

// Shared Kotlin helpers for services (Vault/OIDC/JWT/forward-auth).
dependencies {
compileOnly(platform("org.springframework.boot:spring-boot-dependencies:4.0.6"))
compileOnly(platform("org.springframework.boot:spring-boot-dependencies:4.1.0"))
compileOnly("org.springframework.security:spring-security-oauth2-jose")
compileOnly("org.springframework.boot:spring-boot-starter-web")
compileOnly("org.springframework.vault:spring-vault-core:4.0.2")
compileOnly("org.springframework.vault:spring-vault-core:4.1.0")
}
40 changes: 20 additions & 20 deletions services/api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import org.springframework.boot.gradle.tasks.run.BootRun
plugins {
id("spring-conventions")
id("testing-conventions")
id("org.graalvm.buildtools.native") version "1.1.1"
id("org.graalvm.buildtools.native") version "1.1.7"
`java-test-fixtures`

val kotlinVersion = "2.3.21"
val kotlinVersion = "2.4.10"
kotlin("plugin.jpa") version kotlinVersion
kotlin("plugin.allopen") version kotlinVersion
kotlin("plugin.noarg") version kotlinVersion
Expand Down Expand Up @@ -67,26 +67,26 @@ dependencies {
// is the default client pulled in by spring-boot-starter-data-redis.
implementation("org.springframework.boot:spring-boot-starter-data-redis")
implementation("org.springframework.session:spring-session-data-redis")
implementation(platform("org.springframework.modulith:spring-modulith-bom:2.0.6"))
implementation(platform("org.springframework.modulith:spring-modulith-bom:2.1.0"))
implementation("org.springframework.modulith:spring-modulith-starter-jdbc")
implementation("org.springframework.cloud:spring-cloud-starter-vault-config:5.0.1")
implementation("org.springframework.cloud:spring-cloud-starter-vault-config:5.0.2")
implementation(project(":libs:kotlin-common"))
implementation("org.springframework.boot:spring-boot-starter-flyway")
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
implementation("org.springframework.boot:spring-boot-starter-mail")
implementation(kotlin("stdlib"))
developmentOnly("org.springframework.boot:spring-boot-devtools")

implementation("com.nimbusds:nimbus-jose-jwt:10.9")
implementation("com.nimbusds:nimbus-jose-jwt:10.9.1")
// Nimbus RSAKey.parseFromPEMEncodedObjects needs JcaPEMKeyConverter (bcpkix); bcprov alone is insufficient.
runtimeOnly("org.bouncycastle:bcpkix-jdk18on:1.84")
runtimeOnly("org.bouncycastle:bcpkix-jdk18on:1.85")
implementation("io.jsonwebtoken:jjwt-api:0.13.0")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.13.0")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.13.0")

implementation("com.google.apis:google-api-services-calendar:v3-rev20251207-2.0.0")
implementation("com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0")
implementation("com.google.auth:google-auth-library-oauth2-http:1.47.0")
implementation("com.google.auth:google-auth-library-oauth2-http:1.50.0")

compileOnly("jakarta.servlet:jakarta.servlet-api:6.1.0")
implementation("jakarta.validation:jakarta.validation-api")
Expand All @@ -96,31 +96,31 @@ dependencies {
implementation("jakarta.persistence:jakarta.persistence-api")

implementation("com.vladsch.flexmark:flexmark-all:0.64.8")
implementation("org.apache.tika:tika-core:3.3.1")
implementation("com.googlecode.libphonenumber:libphonenumber:9.0.31")
implementation("org.apache.tika:tika-core:3.3.2")
implementation("com.googlecode.libphonenumber:libphonenumber:9.0.36")
implementation("com.github.scribejava:scribejava-apis:8.3.3")
implementation("org.springframework.retry:spring-retry:2.0.12")
implementation("org.springframework.retry:spring-retry:2.0.13")
implementation("org.springframework:spring-aop")
implementation("org.aspectj:aspectjweaver")

implementation("org.flywaydb:flyway-mysql:12.6.2")
implementation("org.mariadb.jdbc:mariadb-java-client:3.5.8")
implementation("org.mariadb.jdbc:mariadb-java-client:3.5.10")

implementation("com.fasterxml.jackson.core:jackson-annotations")
implementation("tools.jackson.module:jackson-module-kotlin")
// Jackson 2.x Kotlin module — required for SpringDoc/swagger-core schema
// generation, which uses its own com.fasterxml.jackson ObjectMapper
// independently of our tools.jackson mapper.
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.21.3")
implementation("org.openapitools:jackson-databind-nullable:0.2.10")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.22.1")
implementation("org.openapitools:jackson-databind-nullable:0.2.11")

implementation(project(":services:api:clients:brevo"))
implementation(project(":services:api:clients:discord"))

implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2")
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0")

implementation("org.commonmark:commonmark:0.28.0")
implementation("org.commonmark:commonmark-ext-gfm-tables:0.28.0")
implementation("org.commonmark:commonmark:0.29.0")
implementation("org.commonmark:commonmark-ext-gfm-tables:0.29.0")
implementation(files("libs/snakeyaml-2.5.jar"))

testImplementation("org.springframework.boot:spring-boot-starter-test")
Expand All @@ -129,12 +129,12 @@ dependencies {
testImplementation("com.github.javafaker:javafaker:1.0.2")
testImplementation("org.springframework.boot:spring-boot-testcontainers")
testImplementation("org.testcontainers:testcontainers-mariadb:2.0.5")
testImplementation("io.rest-assured:spring-mock-mvc:6.0.0")
testImplementation("io.rest-assured:spring-mock-mvc:6.0.1")
testImplementation("com.tngtech.archunit:archunit-junit5:1.4.2")
testImplementation("io.github.classgraph:classgraph:4.8.184")
testImplementation("io.mockk:mockk:1.14.9")
testImplementation("io.github.classgraph:classgraph:4.8.186")
testImplementation("io.mockk:mockk:1.14.11")
// H2 in-memory database for OpenAPI spec generation (test-scoped only).
testImplementation("com.h2database:h2:2.3.232")
testImplementation("com.h2database:h2:2.4.240")

// Shared test-fixture consumers expose main starter deps so factories
// and support classes compile against Spring / JPA / Jackson / Security.
Expand Down
12 changes: 6 additions & 6 deletions services/system-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ dependencies {
// through localhost:8080. So no project(":services:api") dep, no
// Spring Boot starters; just an HTTP client, JDBC, Playwright, and
// IMAP/JSON helpers for assertions.
testImplementation("org.springframework.security:spring-security-crypto:7.0.5")
testImplementation("org.mariadb.jdbc:mariadb-java-client:3.5.8")
testImplementation("tools.jackson.module:jackson-module-kotlin:3.1.3")
testImplementation("org.springframework.security:spring-security-crypto:7.1.0")
testImplementation("org.mariadb.jdbc:mariadb-java-client:3.5.10")
testImplementation("tools.jackson.module:jackson-module-kotlin:3.2.1")

testImplementation("io.rest-assured:rest-assured:6.0.0")
testImplementation("com.microsoft.playwright:playwright:1.60.0")
testImplementation("io.rest-assured:rest-assured:6.0.1")
testImplementation("com.microsoft.playwright:playwright:1.61.0")

testImplementation("org.junit.jupiter:junit-jupiter:6.1.0")
testImplementation("org.junit.jupiter:junit-jupiter:6.1.2")
testImplementation("org.assertj:assertj-core:3.27.7")

// IMAP access for StalwartMailClient — used by tests that need to
Expand Down
Loading