From a42b5abcbb1bea0b20374500a2a294f31de1927a Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Tue, 22 Aug 2023 09:58:20 +0000
Subject: Migrate away from legacy gradle buildscript syntax

- replace the buildscript way of declaring plugins with the plugins {} block
- have duplicate openapi client declarations since programmatic way of registering openapiGenerate task does not seem to be working

Issue-ID: PORTALNG-47
Change-Id: I9e007127726e558363409d1b224dc7b2b9e52719
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 openapi/client-portal-keycloak/build.gradle | 56 +++++++++++++++++------------
 1 file changed, 34 insertions(+), 22 deletions(-)

(limited to 'openapi/client-portal-keycloak/build.gradle')

diff --git a/openapi/client-portal-keycloak/build.gradle b/openapi/client-portal-keycloak/build.gradle
index 525fa18..d7984db 100644
--- a/openapi/client-portal-keycloak/build.gradle
+++ b/openapi/client-portal-keycloak/build.gradle
@@ -1,35 +1,21 @@
 plugins {
+  id 'java'
+  id 'idea'
+  id 'org.springframework.boot'
+  id 'io.spring.dependency-management'
   id 'org.openapi.generator'
 }
 
 dependencies {
-    implementation "org.springframework.boot:spring-boot-starter-webflux"
-    implementation "org.openapitools:openapi-generator:$openapiVersion"
+  implementation 'org.springframework.boot:spring-boot-starter-webflux'
+  implementation "org.openapitools:openapi-generator:$openapiVersion"
 }
 
-compileJava {
-    dependsOn = ['openApiGenerate_keycloak']
-}
-
-sourceSets {
-    main {
-        java {
-            srcDirs += file("$buildDir/openapi/src/main/java")
-        }
-    }
-}
-
-idea {
-    module {
-        generatedSourceDirs += file("$buildDir/openapi/src/main/java")
-    }
-}
-
-tasks.register('openApiGenerate_keycloak', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
+openApiGenerate {
     generatorName = "java"
     library = "webclient"
     inputSpec = "${project.projectDir}/src/portal_keycloak_openapi.yaml"
-    outputDir = "${buildDir}/openapi"
+    outputDir = "${project.buildDir}/openapi"
     configOptions = [
       openApiNullable     : "false",
       dateLibrary         : "java8",
@@ -46,4 +32,30 @@ tasks.register('openApiGenerate_keycloak', org.openapitools.generator.gradle.plu
     apiPackage = "org.onap.portalng.bff.openapi.client_portal_keycloak.api"
     modelPackage = "org.onap.portalng.bff.openapi.client_portal_keycloak.model"
     modelNameSuffix = "KeycloakDto"
+}
+
+compileJava {
+  dependsOn tasks.openApiGenerate
+}
+
+sourceSets {
+  main {
+    java {
+      srcDirs += file("$buildDir/openapi/src/main/java")
+    }
+  }
+}
+
+idea {
+  module {
+    generatedSourceDirs += file("$buildDir/openapi/src/main/java")
+  }
+}
+
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg