diff --git a/.travis.yml b/.travis.yml index b38c669c1b52..2b8742d71db8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,6 +122,8 @@ before_install: - cat /etc/hosts # show java version - java -version + - export TRAVIS_BRANCH=master + - export TRAVIS_TAG=v7.15.0 - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then openssl aes-256-cbc -K $encrypted_6e2c8bba47c6_key -iv $encrypted_6e2c8bba47c6_iv -in sec.gpg.enc -out sec.gpg -d ; gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ; @@ -141,25 +143,6 @@ script: after_success: # push to maven repo - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then - echo "Publishing from branch $TRAVIS_BRANCH"; - ./mvnw clean deploy --quiet -DskipTests=true -B -U -P release --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error; - 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}" publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository; - echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository"; - popd; - elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then - echo "Publishing from branch $TRAVIS_BRANCH"; - ./mvnw clean deploy --quiet --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error; - echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; - pushd .; - cd modules/openapi-generator-gradle-plugin; - ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository; - echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository"; - popd; - fi; if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)"; pushd .; diff --git a/README.md b/README.md index c4c0e95a0429..23e5fca1ac8e 100644 --- a/README.md +++ b/README.md @@ -1361,3 +1361,4 @@ See the License for the specific language governing permissions and limitations under the License. --- + diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 5aea76322463..ddc4a8f4e894 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -93,11 +93,9 @@ ${gradleVersion} -P openApiGeneratorVersion=${project.version} -