From 0eec6ac8b4f113df62a365cf861d9f34911a1dc5 Mon Sep 17 00:00:00 2001
From: Robert Stupp <snazy@snazy.de>
Date: Tue, 11 Apr 2023 18:00:02 +0200
Subject: [PATCH] Build: use Smallrye-OpenAPI-Plugin from Gradle plugins
 (#6525)

---
 api/model/build.gradle.kts | 6 +-----
 gradle/libs.versions.toml  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/api/model/build.gradle.kts b/api/model/build.gradle.kts
index 3c54b069e74..2765bb1f729 100644
--- a/api/model/build.gradle.kts
+++ b/api/model/build.gradle.kts
@@ -16,12 +16,9 @@
 
 import io.smallrye.openapi.api.OpenApiConfig.OperationIdStrategy
 import io.smallrye.openapi.gradleplugin.SmallryeOpenApiExtension
-import io.smallrye.openapi.gradleplugin.SmallryeOpenApiPlugin
 import io.smallrye.openapi.gradleplugin.SmallryeOpenApiTask
 import org.apache.tools.ant.filters.ReplaceTokens
 
-buildscript { dependencies { classpath(libs.smallrye.openapi.plugin) } }
-
 plugins {
   `java-library`
   jacoco
@@ -29,10 +26,9 @@ plugins {
   signing
   `nessie-conventions`
   alias(libs.plugins.annotations.stripper)
+  alias(libs.plugins.smallrye.openapi)
 }
 
-apply<SmallryeOpenApiPlugin>()
-
 dependencies {
   implementation(platform(libs.jackson.bom))
   implementation(libs.jackson.databind)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d4407060951..f6f3f4919b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -203,7 +203,6 @@ scala-library-v213 = { module = "org.scala-lang:scala-library", version = { stri
 slf4j-api = {  module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
 slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j" }
-smallrye-openapi-plugin = { module = "io.smallrye:smallrye-open-api-gradle-plugin", version = "3.3.2" }
 spark-sql-v31-v212 = { module = "org.apache.spark:spark-sql_2_12", version = { strictly = "[3.1, 3.2[", prefer = "3.1.3"}}
 spark-sql-v32-v212 = { module = "org.apache.spark:spark-sql_2_12", version = { strictly = "[3.2, 3.3[", prefer = "3.2.3"}}
 spark-sql-v32-v213 = { module = "org.apache.spark:spark-sql_2_13", version = { strictly = "[3.2, 3.3[", prefer = "3.2.3"}}
@@ -229,3 +228,4 @@ nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version =
 node-gradle = { id = "com.github.node-gradle.node", version = "3.5.1" }
 protobuf = { id = "com.google.protobuf", version = "0.9.2" }
 quarkus = { id = "io.quarkus", version.ref = "quarkus" }
+smallrye-openapi = { id = "io.smallrye.openapi", version = "3.3.2" }