From f667effa762c8af08a8d9f2d0f3f1ba241cec2a1 Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Sat, 1 Jun 2019 23:36:17 -0400 Subject: [PATCH] [gradle plugin] Release 4.0.1 fixes (#3051) Fixes issues found during the 4.0.1 release --- .travis.yml | 2 +- .../openapi-generator-gradle-plugin/build.gradle | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79f2114100b..5d790284751 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,7 +140,7 @@ after_success: echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; pushd .; cd modules/openapi-generator-gradle-plugin; - ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository --no-daemon; + ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon; echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository"; popd; elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 405456bfe1b..cac4261ea74 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -97,6 +97,10 @@ task sourcesJar(type: Jar) { classifier = 'sources' } +artifacts { + archives javadocJar, sourcesJar +} + publishing { publications { mavenJava(MavenPublication) { @@ -139,11 +143,14 @@ publishing { } } +nexusStaging { + username = project.properties["ossrhUsername"] + password = project.properties["ossrhPassword"] +} + nexusPublishing { - username = ossrhUsername - password = ossrhPassword - stagingProfileId = "org.openapitools" - packageGroup = "org.openapitools" + // To retrieve: ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="$SIGNING_SECRET" getStagingProfile --no-daemon + stagingProfileId = "456297f829bbbe" } gradlePlugin {