diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 5bfe8171199d..941c16879c9d 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -1,14 +1,5 @@ -import io.github.gradlenexus.publishplugin.CloseNexusStagingRepository -import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { - 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") - id("org.gradle.kotlin.kotlin-dsl") version "2.4.1" - id("org.jetbrains.kotlin.jvm") version "1.9.0" + id("com.gradle.plugin-publish") version "1.3.1" id("signing") } @@ -33,10 +24,6 @@ java { repositories { mavenLocal() mavenCentral() - maven { - name = "Sonatype Snapshots" - url "https://oss.sonatype.org/content/repositories/snapshots/" - } } dependencies { @@ -61,26 +48,12 @@ tasks.named("test", Test).configure { } } -tasks.withType(KotlinCompile).configureEach { - kotlinOptions { - jvmTarget = "11" - } -} - tasks.withType(Javadoc).configureEach { if (JavaVersion.current().isJava9Compatible()) { options.addBooleanOption("html5", true) } } -tasks.withType(CloseNexusStagingRepository).configureEach { - onlyIf { nexusPublishing.useStaging.get() } -} - -tasks.withType(ReleaseNexusStagingRepository).configureEach { - onlyIf { nexusPublishing.useStaging.get() } -} - tasks.named("validatePlugins").configure { enableStricterValidation = true } @@ -94,76 +67,7 @@ gradlePlugin { description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)." displayName = "OpenAPI Generator Gradle Plugin" implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin" - tags.addAll("openapi-3.0", "openapi-2.0", "openapi", "swagger", "codegen", "sdk") + tags.addAll("openapi-3.1", "openapi-3.0", "openapi-2.0", "openapi", "swagger", "codegen", "sdk") } } -} - -nexusPublishing { - repositories { - sonatype { - username = project.properties["ossrhUsername"] - password = project.properties["ossrhPassword"] - - // To retrieve: ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="$SIGNING_SECRET" getStagingProfile - stagingProfileId = "456297f829bbbe" - } - } -} - -// Signing requires three keys to be defined: signing.keyId, signing.password, and signing.secretKeyRingFile. -// These can be passed to the Gradle command: -// ./gradlew -Psigning.keyId=yourid -// or stored as key=value pairs in ~/.gradle/gradle.properties -// You can also apply them in CI via environment variables. See Gradle's docs for details. -signing { - required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") } - sign(publishing.publications) -} - -// afterEvaluate is necessary because java-gradle-plugin -// creates its publications in an afterEvaluate callback -afterEvaluate { - tasks.named("publishToSonatype").configure { - dependsOn("check") - } - - publishing { - publications { - pluginMaven { - pom { - name = "OpenAPI-Generator Contributors" - description = project.description - url = "https://openapi-generator.tech" - organization { - name = "org.openapitools" - url = "https://github.com/OpenAPITools" - } - licenses { - license { - name = "The Apache Software License, Version 2.0" - url = "https://www.apache.org/licenses/LICENSE-2.0.txt" - distribution = "repo" - } - } - developers { - developer { - id = "openapitools" - name = "OpenAPI-Generator Contributors" - email = "team@openapitools.org" - } - } - scm { - url = "https://github.com/OpenAPITools/openapi-generator" - connection = "scm:git:git://github.com/OpenAPITools/openapi-generator.git" - developerConnection = "scm:git:ssh://git@github.com:OpenAPITools/openapi-generator.git" - } - issueManagement { - system = "GitHub" - url = "https://github.com/OpenAPITools/openapi-generator/issues" - } - } - } - } - } -} +} \ No newline at end of file