Skip to content

Commit f8e14a5

Browse files
committed
Upgrades ongoing:
Upgrades: - com.fasterxml.jackson.core:jackson-annotations from 2.18.3 to 2.20 - org.springframework:spring-web from 6.2.9 to 6.2.14 - org.bouncycastle:bcpkix-jdk18on from 1.81 to 1.83 - org.springframework.boot:spring-boot-autoconfigure from 3.4.4 to 3.5.8 - org.apache.commons:commons-csv from 1.14.0 to 1.14.1 - jakarta.validation:jakarta.validation-api from 3.0.2 to 3.1.1 - org.json:json from 20240303 to 20250517 - com.fasterxml.jackson.core:jackson-databind from 2.18.3 to 2.20.1 - org.apache.commons:commons-compress from 1.27.1 to 1.28.0 Constraints: org.springframework.boot:spring-boot-starter-undertow: - org.jboss.xnio:xnio-api from 3.8.16.Final to 3.8.17.Final - io.undertow:undertow-core from 2.3.18.Final to 2.3.20.Final org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure: - com.fasterxml.jackson.core:jackson-annotations from 2.18.3 to 2.20.1 - com.fasterxml.jackson.core:jackson-databind from 2.3.18.Final to 2.20 Removed: - com.okta.spring:okta-spring-boot-starter Misc: - clean useless variables in build.gradle.kts - set docker image version of postgres and localstack to latest for tests (integration/controller)
1 parent 881b2ce commit f8e14a5

File tree

3 files changed

+18
-22
lines changed

3 files changed

+18
-22
lines changed

api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestBase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ abstract class ControllerTestBase : AbstractTestcontainersRedisTestBase() {
109109

110110
companion object {
111111
private const val DEFAULT_REDIS_PORT = 6379
112-
private const val LOCALSTACK_FULL_IMAGE_NAME = "localstack/localstack:3.5.0"
112+
private const val LOCALSTACK_FULL_IMAGE_NAME = "localstack/localstack:latest"
113113

114114
var postgres: PostgreSQLContainer<*> =
115-
PostgreSQLContainer("postgres:alpine3.19")
115+
PostgreSQLContainer("postgres:latest")
116116
.withCopyFileToContainer(
117117
MountableFile.forClasspathResource("init-db.sql"),
118118
"/docker-entrypoint-initdb.d/",

build.gradle.kts

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,28 @@ group = "com.cosmotech"
5757
version = scmVersion.version
5858

5959
// Dependencies version
60-
val jacksonVersion = "2.18.3"
61-
val springWebVersion = "6.2.9"
62-
val bouncyCastleJdk18Version = "1.81"
63-
val springBootVersion = "3.4.4"
60+
val jacksonAnnotationVersion = "2.20"
61+
val jacksonDatabindVersion = "2.20.1"
62+
val jacksonModuleKotlinVersion = "2.20.1"
63+
val springWebVersion = "6.2.14"
64+
val bouncyCastleJdk18Version = "1.83"
65+
val springBootVersion = "3.5.8"
6466
val springSecurityJwtVersion = "1.1.1.RELEASE"
6567
val springOauthAutoConfigureVersion = "2.6.8"
6668
val kotlinJvmTarget = 21
67-
val cosmotechApiCommonVersion = "2.1.1-SNAPSHOT"
6869
val redisOmSpringVersion = "1.1.1"
6970
val kotlinCoroutinesVersion = "1.10.2"
70-
val oktaSpringBootVersion = "3.0.7"
7171
val springDocVersion = "2.8.14"
7272
val swaggerParserVersion = "2.1.36"
73-
val commonsCsvVersion = "1.14.0"
74-
val apiValidationVersion = "3.0.2"
73+
val commonsCsvVersion = "1.14.1"
74+
val apiValidationVersion = "3.1.1"
7575
val kubernetesClientVersion = "22.0.0"
76-
val orgJsonVersion = "20240303"
77-
val jacksonModuleKotlinVersion = "2.18.3"
76+
val orgJsonVersion = "20250517"
7877
val testNgVersion = "7.8.0"
7978
val testContainersRedisVersion = "1.6.4"
8079
val testContainersPostgreSQLVersion = "1.21.3"
8180
val testContainersLocalStackVersion = "1.21.3"
82-
val commonCompressVersion = "1.27.1"
81+
val commonCompressVersion = "1.28.0"
8382
val awsSpringVersion = "3.4.2"
8483

8584
// Checks
@@ -288,8 +287,8 @@ subprojects {
288287
}
289288
implementation("org.springframework.boot:spring-boot-starter-undertow") {
290289
constraints {
291-
implementation("org.jboss.xnio:xnio-api:3.8.16.Final")
292-
implementation("io.undertow:undertow-core:2.3.18.Final")
290+
implementation("org.jboss.xnio:xnio-api:3.8.17.Final")
291+
implementation("io.undertow:undertow-core:2.3.20.Final")
293292
}
294293
}
295294
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonModuleKotlinVersion")
@@ -304,8 +303,8 @@ subprojects {
304303
"org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:${springOauthAutoConfigureVersion}"
305304
) {
306305
constraints {
307-
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
308-
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
306+
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonAnnotationVersion")
307+
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion")
309308
implementation("org.springframework:spring-web:$springWebVersion")
310309
implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
311310
implementation(
@@ -320,8 +319,6 @@ subprojects {
320319
}
321320
implementation("org.springframework.security:spring-security-oauth2-jose")
322321
implementation("org.springframework.security:spring-security-oauth2-resource-server")
323-
implementation("com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion}")
324-
325322
implementation("org.apache.commons:commons-csv:$commonsCsvVersion")
326323
implementation("com.redis.om:redis-om-spring:${redisOmSpringVersion}")
327324
implementation("org.springframework.data:spring-data-redis")
@@ -354,7 +351,6 @@ subprojects {
354351
exclude(module = "mockito-core")
355352
}
356353
integrationTestImplementation("com.ninja-squad:springmockk:$springMockkVersion")
357-
// developmentOnly("org.springframework.boot:spring-boot-devtools")
358354
integrationTestImplementation(
359355
"org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion"
360356
)

common/src/main/kotlin/com/cosmotech/common/tests/CsmTestBase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ open class CsmTestBase : AbstractTestcontainersRedisTestBase() {
2121

2222
companion object {
2323
private const val DEFAULT_REDIS_PORT = 6379
24-
private const val LOCALSTACK_FULL_IMAGE_NAME = "localstack/localstack:3.5.0"
24+
private const val LOCALSTACK_FULL_IMAGE_NAME = "localstack/localstack:latest"
2525

2626
var postgres: PostgreSQLContainer<*> =
27-
PostgreSQLContainer("postgres:alpine3.19")
27+
PostgreSQLContainer("postgres:latest")
2828
.withCopyFileToContainer(
2929
MountableFile.forClasspathResource("init-db.sql"),
3030
"/docker-entrypoint-initdb.d/",

0 commit comments

Comments
 (0)