From 39b5ff36dfedefed5f3990ba77becb352e875be7 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Thu, 21 Aug 2025 10:36:43 +0200 Subject: [PATCH] Harmonize swagger versions Squash commits of branch dependency/swagger: - Harmonize swagger versions --- build.gradle | 13 +++++++++++++ gradle/dependencies.gradle | 2 +- scm-webapp/build.gradle | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9335940710..7055a030e9 100644 --- a/build.gradle +++ b/build.gradle @@ -257,6 +257,19 @@ task printVersion { } } +allprojects { + configurations.all { + resolutionStrategy { + // Force all swagger-related libraries to the same, consistent version + force 'io.swagger.core.v3:swagger-core-jakarta:2.2.26' + force 'io.swagger.core.v3:swagger-models-jakarta:2.2.26' + force 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.26' + force 'io.swagger.core.v3:swagger-integration-jakarta:2.2.26' + force 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.26' + } + } +} + def setNewVersion(String newVersion) { File propertiesFile = new File(project.rootDir, 'gradle.properties') diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 57e7f826bc..ec5d1c2f54 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -75,7 +75,7 @@ ext { edison: 'de.otto.edison:edison-hal:2.1.1', // openapi - swaggerJaxRs: 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.35', + swaggerJaxRs: 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.26', // dto mapping mapstruct: "org.mapstruct:mapstruct:${mapstructVersion}", diff --git a/scm-webapp/build.gradle b/scm-webapp/build.gradle index 720eacad50..9cda76d5b0 100644 --- a/scm-webapp/build.gradle +++ b/scm-webapp/build.gradle @@ -19,7 +19,7 @@ plugins { id 'org.scm-manager.java' id 'org.scm-manager.run' id 'org.scm-manager.core-plugins' - id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.19' + id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.26' } configurations { @@ -33,7 +33,7 @@ configurations { dependencies.add(project.getDependencies().create("org.apache.commons:commons-lang3:3.12.0")) dependencies.add(project.getDependencies().create("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")) dependencies.add(project.getDependencies().create("jakarta.servlet:jakarta.servlet-api:6.0.0")) - dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.19")) + dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.26")) dependencies.add(project.getDependencies().create("com.fasterxml.jackson.core:jackson-core:2.18.2")) } })