From fc6fa072c986f0983af161244b3c713f07170481 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 06:48:28 +0000 Subject: [PATCH 1/3] Update dependency org.openapi.generator to v7.14.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0408be5..345d50b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -openapiGenerator = "7.13.0" +openapiGenerator = "7.14.0" [plugins] openapi-generator = { id = "org.openapi.generator", version.ref = "openapiGenerator" } From 52be2b1373cdd6b1554c3e8e3e954cc169bee145 Mon Sep 17 00:00:00 2001 From: Kunitsyn Oleg Date: Mon, 11 Aug 2025 09:03:50 +0200 Subject: [PATCH 2/3] [ODM-12752] Improve dependencies in tasks --- build.gradle.kts | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1eced74f..a120dcbd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,21 @@ val sourceFileList = KotlinPath(sourceDirectory) .map { layout.projectDirectory.file("${sourceDirectory}/${it.name}") } tasks { + val downloadSpec by registering(DownloadSpecification::class) { + version.set(processorsControllerVersion) + registryUsername.set(System.getenv("NEXUS_USER")) + registryPassword.set(System.getenv("NEXUS_PASSWORD")) + releaseRegistryUrl.set(System.getenv("RAW_REGISTRY_RELEASES")) + snapshotRegistryUrl.set(System.getenv("RAW_REGISTRY_SNAPSHOTS")) + outputFile.set(layout.projectDirectory.file(processorsControllerFilePath)) + } + val mergeSpecifications by registering(MergeSpecifications::class) { + dependsOn(downloadSpec) + inputFiles = sourceFileList + outputFile = layout.projectDirectory.file(mergedFilePath) + } val generateOdmApiPython by registering(GenerateTask::class) { + dependsOn(mergeSpecifications) generatorName.set("python") inputSpec.set(mergedFilePath) outputDir.set("$rootDir/generated/python") @@ -47,6 +61,7 @@ tasks { ) } val generateOdmApiR by registering(GenerateTask::class) { + dependsOn(mergeSpecifications) generatorName.set("r") inputSpec.set(mergedFilePath) outputDir.set("$rootDir/generated/r") @@ -60,6 +75,7 @@ tasks { ) } val generateOdmApiPostmanCollection by registering(GenerateTask::class) { + dependsOn(mergeSpecifications) generatorName.set("postman-collection") inputSpec.set(mergedFilePath) outputDir.set("$rootDir/generated/postman-collection") @@ -72,22 +88,7 @@ tasks { // "disallowAdditionalPropertiesIfNotPresent" to "true" ) } - val downloadSpec by registering(DownloadSpecification::class) { - version.set(processorsControllerVersion) - registryUsername.set(System.getenv("NEXUS_USER")) - registryPassword.set(System.getenv("NEXUS_PASSWORD")) - releaseRegistryUrl.set(System.getenv("RAW_REGISTRY_RELEASES")) - snapshotRegistryUrl.set(System.getenv("RAW_REGISTRY_SNAPSHOTS")) - outputFile.set(layout.projectDirectory.file(processorsControllerFilePath)) - } - val mergeSpecifications by registering(MergeSpecifications::class) { - dependsOn(downloadSpec) - inputFiles = sourceFileList - outputFile = layout.projectDirectory.file(mergedFilePath) - } - val generateAll by registering(GradleBuild::class) { - dependsOn(mergeSpecifications) file("$rootDir/generated").deleteRecursively() tasks = listOf( generateOdmApiPython.name, From 12713da0610c5c9b5870a93d4e810e56bea3a824 Mon Sep 17 00:00:00 2001 From: Kunitsyn Oleg Date: Mon, 11 Aug 2025 09:40:45 +0200 Subject: [PATCH 3/3] [ODM-12752] Add workaround for library bump --- build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a120dcbd..80d225e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,11 @@ tasks { gitRepoId.set("openapi") nameMappings.set(mapOf("genestack:accession" to "genestackaccession")) configOptions = mapOf( - "packageVersion" to openApiVersion + "packageVersion" to openApiVersion, + // Workaround for https://github.com/OpenAPITools/openapi-generator/issues/21619 + // The second version asks for license, which we can't provide due to unavailability of + // "licenseName" and "licenseUrl" fields in the specification for python generator. + "poetry1" to "true" // "disallowAdditionalPropertiesIfNotPresent" to "true" ) }