From c223a9c3761f796468ccfdae9e177e764ab6a965 Mon Sep 17 00:00:00 2001
From: atu-sharm <131497429+atu-sharm@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:00:46 +0530
Subject: [PATCH] KAFKA-15521: Refactor build.gradle to align gradle swagger
 plugin with swagger dependencies (#14473)

Reviewers: Mickael Maison <mickael.maison@gmail.com>
---
 build.gradle               | 2 +-
 gradle.properties          | 3 +++
 gradle/dependencies.gradle | 7 ++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6d24f064958..eee62192200 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ plugins {
   id 'java-library'
   id 'org.owasp.dependencycheck' version '8.2.1'
   id 'org.nosphere.apache.rat' version "0.8.1"
-  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.8" // keep aligned with the swagger version used in gradle/dependencies.gradle
+  id "io.swagger.core.v3.swagger-gradle-plugin" version "${swaggerVersion}"
 
   id "com.github.spotbugs" version '5.1.3' apply false
   id 'org.scoverage' version '7.0.1' apply false
diff --git a/gradle.properties b/gradle.properties
index 06f12850326..1fc5ee38ee2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,9 @@ group=org.apache.kafka
 #  - streams/quickstart/java/pom.xml
 version=3.7.0-SNAPSHOT
 scalaVersion=2.13.12
+# Adding swaggerVersion in gradle.properties to have a single version in place for swagger
+# New version of Swagger 2.2.14 requires minimum JDK 11.
+swaggerVersion=2.2.8
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
 org.gradle.parallel=true
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 5174976967a..5ea6aac47cb 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -159,9 +159,6 @@ versions += [
   slf4j: "1.7.36",
   snappy: "1.1.10.5",
   spotbugs: "4.7.3",
-  // New version of Swagger 2.2.14 requires minimum JDK 11.
-  swaggerAnnotations: "2.2.8",
-  swaggerJaxrs2: "2.2.8",
   zinc: "1.9.2",
   zookeeper: "3.8.2",
   zstd: "1.5.5-6"
@@ -254,8 +251,8 @@ libs += [
   slf4jApi: "org.slf4j:slf4j-api:$versions.slf4j",
   slf4jlog4j: "org.slf4j:slf4j-log4j12:$versions.slf4j",
   snappy: "org.xerial.snappy:snappy-java:$versions.snappy",
-  swaggerAnnotations: "io.swagger.core.v3:swagger-annotations:$versions.swaggerAnnotations",
-  swaggerJaxrs2: "io.swagger.core.v3:swagger-jaxrs2:$versions.swaggerJaxrs2",
+  swaggerAnnotations: "io.swagger.core.v3:swagger-annotations:$swaggerVersion",
+  swaggerJaxrs2: "io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion",
   zookeeper: "org.apache.zookeeper:zookeeper:$versions.zookeeper",
   jfreechart: "jfreechart:jfreechart:$versions.jfreechart",
   mavenArtifact: "org.apache.maven:maven-artifact:$versions.mavenArtifact",