Skip to content

Commit 14a1d6f

Browse files
committed
Upgrade dependencies, enhance dataset parts handling, and update API documentation
- Updated dependencies across the project (e.g., `argoClientJavaVersion`, `springDocVersion`, `nettyVersion`, etc.) for compatibility and performance improvements. - Refined version constraints and forced resolutions for specific dependencies (e.g., Netty components). - Improved dataset parts handling in `RunArgoWorkflowService` by introducing placeholders for additional metadata null values. - Streamlined dependencies in `build.gradle.kts` by removing outdated resolution strategy for jmustache and consolidating various versions. - Updated OpenAPI generator version to 7.15.0 and synchronized related documentation and README files with consistent casing and format for API method names.
1 parent 4167db8 commit 14a1d6f

File tree

5 files changed

+145
-145
lines changed

5 files changed

+145
-145
lines changed

build.gradle.kts

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
3627
plugins {
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
}
@@ -58,31 +49,31 @@ version = scmVersion.version
5849

5950
// Dependencies version
6051
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"
6354
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"
6959
val kubernetesClientVersion = "22.0.0"
70-
val orgJsonVersion = "20240303"
60+
val orgJsonVersion = "20250517"
7161
val jacksonModuleKotlinVersion = "2.18.3"
72-
val testNgVersion = "7.8.0"
62+
val testNgVersion = "7.11.0"
7363
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"
7869

7970
// Checks
8071
val detektVersion = "1.23.8"
8172

8273
// 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"
8677
val springMockkVersion = "4.0.2"
8778

8879
val configBuildDir = "${layout.buildDirectory.get()}/config"
@@ -125,9 +116,18 @@ allprojects {
125116
sourceCompatibility = JavaVersion.VERSION_21
126117
toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) }
127118
}
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+
}
129128

130129
repositories {
130+
mavenLocal()
131131
maven {
132132
name = "GitHubPackages"
133133
url = uri("https://maven.pkg.github.com/Cosmo-Tech/cosmotech-api-common")
@@ -280,12 +280,7 @@ subprojects {
280280
implementation("org.springframework.boot:spring-boot-starter-web") {
281281
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
282282
}
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")
289284
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonModuleKotlinVersion")
290285
// https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api
291286
implementation("jakarta.validation:jakarta.validation-api:$apiValidationVersion")
@@ -294,9 +289,10 @@ subprojects {
294289
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}")
295290
implementation("io.swagger.parser.v3:swagger-parser-v3:${swaggerParserVersion}")
296291
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+
}
298295
implementation("org.springframework.security:spring-security-oauth2-resource-server")
299-
implementation("com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion}")
300296

301297
implementation("org.apache.commons:commons-csv:$commonsCsvVersion")
302298
implementation("com.redis.om:redis-om-spring:${redisOmSpringVersion}")

doc/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.13.0
1+
7.15.0

0 commit comments

Comments
 (0)