From a2d0b0c5b876386124d190058f0d3ac669150d2a Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 7 Jul 2023 10:18:33 +0800
Subject: [PATCH] Minor fix to gradle test, pom.xml, build.gradle (#16026)

* fix publising to gradle portal

* v6.5.0 portal release

* add back docker publish

* trigger build

* Revert "trigger build"

This reverts commit f7ea8baf356db97d1e3eec68736be372e68a6543.

* Revert "add back docker publish"

This reverts commit a279145cc6d5338155ce4c965368cb12d59c7643.

* Revert "v6.5.0 portal release"

This reverts commit 8a91858df539ceffbbf088711516b04e752d6e67.

* minor fix to gradle test, pom.xml

* rollback to 1.0.0

* fix
---
 modules/openapi-generator-gradle-plugin/build.gradle       | 2 +-
 modules/openapi-generator-gradle-plugin/pom.xml            | 7 ++++++-
 .../samples/local-spec/build.gradle                        | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle
index fc3001856d..f660266e85 100644
--- a/modules/openapi-generator-gradle-plugin/build.gradle
+++ b/modules/openapi-generator-gradle-plugin/build.gradle
@@ -3,7 +3,7 @@ import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("com.gradle.plugin-publish") version "1.0.0"
+    id("com.gradle.plugin-publish") version "1.1.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("java-gradle-plugin")
     id("maven-publish")
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 10fe858ef8..188c7bae52 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -93,11 +93,16 @@
                     <gradleVersion>${gradleVersion}</gradleVersion>
                     <args>
                         <arg>-P openApiGeneratorVersion=${project.version}</arg>
+                        <!--
+                        <arg>-Psigning.keyId=${env.SIGNING_KEY}</arg>
+                        <arg>-Psigning.password=${env.SIGNING_PASSPHRASE}</arg>
+                        <arg>-Psigning.secretKeyRingFile=${env.TRAVIS_BUILD_DIR}/sec.gpg</arg>
+                        -->
                     </args>
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>install</phase>
                         <goals>
                             <!-- goal must be "invoke" -->
                             <goal>invoke</goal>
diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle
index 06e7ed8891..516328c203 100644
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle
@@ -86,13 +86,13 @@ task buildGoSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTas
 }
 
 task buildDotnetSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
-    generatorName = "csharp-netcore"
+    generatorName = "csharp"
     inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
     additionalProperties = [
             packageGuid: "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
             useCompareNetObjects: "true"
     ]
-    outputDir = "$buildDir/csharp-netcore".toString()
+    outputDir = "$buildDir/csharp".toString()
     globalProperties = [
             models: "",
             apis  : "",