@@ -24,28 +24,19 @@ import org.springframework.boot.gradle.tasks.run.BootRun
24
24
// implementations/configurations in a 'buildSrc' included build.
25
25
// See https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#sec:build_sources
26
26
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
-
36
27
plugins {
37
28
val kotlinVersion = " 2.0.21"
38
29
kotlin(" jvm" ) version kotlinVersion
39
30
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
43
34
id(" project-report" )
44
- id(" org.owasp.dependencycheck" ) version " 12.1.0 "
35
+ id(" org.owasp.dependencycheck" ) version " 12.1.3 "
45
36
id(" com.github.jk1.dependency-license-report" ) version " 2.9"
46
37
id(" org.jetbrains.kotlinx.kover" ) version " 0.9.1"
47
38
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
49
40
id(" com.google.cloud.tools.jib" ) version " 3.4.5" apply false
50
41
id(" org.cyclonedx.bom" ) version " 2.3.1"
51
42
}
@@ -58,31 +49,31 @@ version = scmVersion.version
58
49
59
50
// Dependencies version
60
51
val kotlinJvmTarget = 21
61
- val cosmotechApiCommonVersion = " 2.1.1 -SNAPSHOT"
62
- val redisOmSpringVersion = " 0.9.7 "
52
+ val cosmotechApiCommonVersion = " 2.1.2-upgrades -SNAPSHOT"
53
+ val redisOmSpringVersion = " 0.9.10 "
63
54
val kotlinCoroutinesVersion = " 1.10.2"
64
- val oktaSpringBootVersion = " 3.0.7"
65
- val springDocVersion = " 2.8.8"
66
- val swaggerParserVersion = " 2.1.31"
67
- val commonsCsvVersion = " 1.14.0"
68
- val apiValidationVersion = " 3.0.2"
55
+ val springDocVersion = " 2.8.12"
56
+ val swaggerParserVersion = " 2.1.33"
57
+ val commonsCsvVersion = " 1.14.1"
58
+ val apiValidationVersion = " 3.1.1"
69
59
val kubernetesClientVersion = " 22.0.0"
70
- val orgJsonVersion = " 20240303 "
60
+ val orgJsonVersion = " 20250517 "
71
61
val jacksonModuleKotlinVersion = " 2.18.3"
72
- val testNgVersion = " 7.8 .0"
62
+ val testNgVersion = " 7.11 .0"
73
63
val testContainersRedisVersion = " 1.6.4"
74
- val testContainersPostgreSQLVersion = " 1.20.6"
75
- val testContainersLocalStackVersion = " 1.20.6"
76
- val commonCompressVersion = " 1.27.1"
77
- val awsSpringVersion = " 3.3.0"
64
+ val testContainersPostgreSQLVersion = " 1.21.3"
65
+ val testContainersLocalStackVersion = " 1.21.3"
66
+ val commonCompressVersion = " 1.28.0"
67
+ val awsSpringVersion = " 3.4.0"
68
+ val nettyVersion = " 4.2.5.Final"
78
69
79
70
// Checks
80
71
val detektVersion = " 1.23.8"
81
72
82
73
// Tests
83
- val jUnitBomVersion = " 5.12.2 "
84
- val mockkVersion = " 1.14.0 "
85
- val awaitilityKVersion = " 4.2 .0"
74
+ val jUnitBomVersion = " 5.13.4 "
75
+ val mockkVersion = " 1.14.5 "
76
+ val awaitilityKVersion = " 4.3 .0"
86
77
val springMockkVersion = " 4.0.2"
87
78
88
79
val configBuildDir = " ${layout.buildDirectory.get()} /config"
@@ -125,9 +116,18 @@ allprojects {
125
116
sourceCompatibility = JavaVersion .VERSION_21
126
117
toolchain { languageVersion.set(JavaLanguageVersion .of(kotlinJvmTarget)) }
127
118
}
128
- configurations { all { resolutionStrategy { force(" com.redis.om:redis-om-spring:0.9.10" ) } } }
119
+ configurations {
120
+ all {
121
+ resolutionStrategy {
122
+ force(" io.netty:netty-codec:$nettyVersion " )
123
+ force(" io.netty:netty-handler:$nettyVersion " )
124
+ force(" io.netty:netty-codec-http:$nettyVersion " )
125
+ }
126
+ }
127
+ }
129
128
130
129
repositories {
130
+ mavenLocal()
131
131
maven {
132
132
name = " GitHubPackages"
133
133
url = uri(" https://maven.pkg.github.com/Cosmo-Tech/cosmotech-api-common" )
@@ -280,12 +280,7 @@ subprojects {
280
280
implementation(" org.springframework.boot:spring-boot-starter-web" ) {
281
281
exclude(group = " org.springframework.boot" , module = " spring-boot-starter-tomcat" )
282
282
}
283
- implementation(" org.springframework.boot:spring-boot-starter-undertow" ) {
284
- constraints {
285
- implementation(" org.jboss.xnio:xnio-api:3.8.16.Final" )
286
- implementation(" io.undertow:undertow-core:2.3.18.Final" )
287
- }
288
- }
283
+ implementation(" org.springframework.boot:spring-boot-starter-undertow" )
289
284
implementation(" com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonModuleKotlinVersion " )
290
285
// https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api
291
286
implementation(" jakarta.validation:jakarta.validation-api:$apiValidationVersion " )
@@ -294,9 +289,10 @@ subprojects {
294
289
implementation(" org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion} " )
295
290
implementation(" io.swagger.parser.v3:swagger-parser-v3:${swaggerParserVersion} " )
296
291
implementation(" org.springframework.boot:spring-boot-starter-security" )
297
- implementation(" org.springframework.security:spring-security-oauth2-jose" )
292
+ implementation(" org.springframework.security:spring-security-oauth2-jose" ) {
293
+ constraints { implementation(" com.nimbusds:nimbus-jose-jwt:10.4.2" ) }
294
+ }
298
295
implementation(" org.springframework.security:spring-security-oauth2-resource-server" )
299
- implementation(" com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion} " )
300
296
301
297
implementation(" org.apache.commons:commons-csv:$commonsCsvVersion " )
302
298
implementation(" com.redis.om:redis-om-spring:${redisOmSpringVersion} " )
0 commit comments