@@ -24,28 +24,19 @@ import org.springframework.boot.gradle.tasks.run.BootRun
2424// implementations/configurations in a 'buildSrc' included build.
2525// See https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#sec:build_sources
2626
27- buildscript {
28- configurations.all {
29- // Due to bug OpenAPITools/openapi-generator#20375 when we use another
30- // plugin that also depends on jmustache the newer version ends up being
31- // used and it breaks the generation of the python client.
32- resolutionStrategy.force(" com.samskivert:jmustache:1.15" )
33- }
34- }
35-
3627plugins {
3728 val kotlinVersion = " 2.0.21"
3829 kotlin(" jvm" ) version kotlinVersion
3930 kotlin(" plugin.spring" ) version kotlinVersion apply false
40- id(" pl.allegro.tech.build.axion-release" ) version " 1.18.18 "
41- id(" com.diffplug.spotless" ) version " 7.0.3 "
42- id(" org.springframework.boot" ) version " 3.4.4 " apply false
31+ id(" pl.allegro.tech.build.axion-release" ) version " 1.20.1 "
32+ id(" com.diffplug.spotless" ) version " 7.2.1 "
33+ id(" org.springframework.boot" ) version " 3.5.5 " apply false
4334 id(" project-report" )
44- id(" org.owasp.dependencycheck" ) version " 12.1.0 "
35+ id(" org.owasp.dependencycheck" ) version " 12.1.3 "
4536 id(" com.github.jk1.dependency-license-report" ) version " 2.9"
4637 id(" org.jetbrains.kotlinx.kover" ) version " 0.9.1"
4738 id(" io.gitlab.arturbosch.detekt" ) version " 1.23.8"
48- id(" org.openapi.generator" ) version " 7.13 .0" apply false
39+ id(" org.openapi.generator" ) version " 7.15 .0" apply false
4940 id(" com.google.cloud.tools.jib" ) version " 3.4.5" apply false
5041 id(" org.cyclonedx.bom" ) version " 2.3.1"
5142}
@@ -64,31 +55,30 @@ val springBootVersion = "3.4.4"
6455val springSecurityJwtVersion = " 1.1.1.RELEASE"
6556val springOauthAutoConfigureVersion = " 2.6.8"
6657val kotlinJvmTarget = 21
67- val cosmotechApiCommonVersion = " 2.1.1-SNAPSHOT"
68- val redisOmSpringVersion = " 0.9.7"
58+ val redisOmSpringVersion = " 0.9.10"
6959val kotlinCoroutinesVersion = " 1.10.2"
70- val oktaSpringBootVersion = " 3.0.7"
71- val springDocVersion = " 2.8.8"
72- val swaggerParserVersion = " 2.1.31"
73- val commonsCsvVersion = " 1.14.0"
74- val apiValidationVersion = " 3.0.2"
60+ val springDocVersion = " 2.8.12"
61+ val swaggerParserVersion = " 2.1.33"
62+ val commonsCsvVersion = " 1.14.1"
63+ val apiValidationVersion = " 3.1.1"
7564val kubernetesClientVersion = " 22.0.0"
76- val orgJsonVersion = " 20240303 "
65+ val orgJsonVersion = " 20250517 "
7766val jacksonModuleKotlinVersion = " 2.18.3"
78- val testNgVersion = " 7.8 .0"
67+ val testNgVersion = " 7.11 .0"
7968val testContainersRedisVersion = " 1.6.4"
80- val testContainersPostgreSQLVersion = " 1.20.6"
81- val testContainersLocalStackVersion = " 1.20.6"
82- val commonCompressVersion = " 1.27.1"
83- val awsSpringVersion = " 3.3.0"
69+ val testContainersPostgreSQLVersion = " 1.21.3"
70+ val testContainersLocalStackVersion = " 1.21.3"
71+ val commonCompressVersion = " 1.28.0"
72+ val awsSpringVersion = " 3.4.0"
73+ val nettyVersion = " 4.2.5.Final"
8474
8575// Checks
8676val detektVersion = " 1.23.8"
8777
8878// Tests
89- val jUnitBomVersion = " 5.12.2 "
90- val mockkVersion = " 1.14.0 "
91- val awaitilityKVersion = " 4.2 .0"
79+ val jUnitBomVersion = " 5.13.4 "
80+ val mockkVersion = " 1.14.5 "
81+ val awaitilityKVersion = " 4.3 .0"
9282val springMockkVersion = " 4.0.2"
9383
9484val configBuildDir = " ${layout.buildDirectory.get()} /config"
@@ -131,7 +121,15 @@ allprojects {
131121 sourceCompatibility = JavaVersion .VERSION_21
132122 toolchain { languageVersion.set(JavaLanguageVersion .of(kotlinJvmTarget)) }
133123 }
134- configurations { all { resolutionStrategy { force(" com.redis.om:redis-om-spring:0.9.10" ) } } }
124+ configurations {
125+ all {
126+ resolutionStrategy {
127+ force(" io.netty:netty-codec:$nettyVersion " )
128+ force(" io.netty:netty-handler:$nettyVersion " )
129+ force(" io.netty:netty-codec-http:$nettyVersion " )
130+ }
131+ }
132+ }
135133
136134 repositories {
137135 maven {
@@ -278,12 +276,7 @@ subprojects {
278276 implementation(" org.springframework.boot:spring-boot-starter-web" ) {
279277 exclude(group = " org.springframework.boot" , module = " spring-boot-starter-tomcat" )
280278 }
281- implementation(" org.springframework.boot:spring-boot-starter-undertow" ) {
282- constraints {
283- implementation(" org.jboss.xnio:xnio-api:3.8.16.Final" )
284- implementation(" io.undertow:undertow-core:2.3.18.Final" )
285- }
286- }
279+ implementation(" org.springframework.boot:spring-boot-starter-undertow" )
287280 implementation(" com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonModuleKotlinVersion " )
288281 // https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api
289282 implementation(" jakarta.validation:jakarta.validation-api:$apiValidationVersion " )
@@ -308,9 +301,10 @@ subprojects {
308301 }
309302 }
310303 }
311- implementation(" org.springframework.security:spring-security-oauth2-jose" )
304+ implementation(" org.springframework.security:spring-security-oauth2-jose" ) {
305+ constraints { implementation(" com.nimbusds:nimbus-jose-jwt:10.4.2" ) }
306+ }
312307 implementation(" org.springframework.security:spring-security-oauth2-resource-server" )
313- implementation(" com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion} " )
314308
315309 implementation(" org.apache.commons:commons-csv:$commonsCsvVersion " )
316310 implementation(" com.redis.om:redis-om-spring:${redisOmSpringVersion} " )
0 commit comments