From 000fc080bdb2d02b7f8854cb7675916aa724c612 Mon Sep 17 00:00:00 2001
From: Jeremie Bresson <dev@jmini.fr>
Date: Mon, 27 Aug 2018 05:45:47 +0200
Subject: [PATCH] [CI] Change the way gradle uploadArchives works
---
.travis.yml | 20 +++++++++++--------
.../build.gradle | 7 +------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 51d8c4a6b7f..b481fb642e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,21 +118,25 @@ after_success:
# push to maven repo
- if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
if [ "$TRAVIS_BRANCH" = "master" ]; then
- mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
- echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
+ mvn clean install -DskipTests=true -U;
+ echo "Finished mvn clean install 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}" uploadArchives --no-daemon;
- echo "Finished ./gradlew uploadArchives";
+ ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" uploadArchives --no-daemon;
+ echo "Finished ./gradlew uploadArchives for $TRAVIS_BRANCH";
popd;
+ mvn deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
+ echo "Finished mvn deploy for $TRAVIS_BRANCH";
elif ([[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]) ; then
- mvn clean deploy --settings CI/settings.xml;
- echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
+ mvn clean install -DskipTests=true;
+ echo "Finished mvn clean install for $TRAVIS_BRANCH";
pushd .;
cd modules/openapi-generator-gradle-plugin;
- ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
- echo "Finished ./gradlew uploadArchives";
+ ./gradlew uploadArchives --no-daemon;
+ echo "Finished ./gradlew uploadArchives for $TRAVIS_BRANCH";
popd;
+ mvn deploy -DskipTests=true --settings CI/settings.xml;
+ echo "Finished mvn deploy for $TRAVIS_BRANCH";
fi;
fi;
## docker: build and push openapi-generator-online to DockerHub
diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle
index c639b67a162..7ac79fafa0e 100644
--- a/modules/openapi-generator-gradle-plugin/build.gradle
+++ b/modules/openapi-generator-gradle-plugin/build.gradle
@@ -155,12 +155,7 @@ uploadArchives {
// or stored in ~/.gradle/gradle.properties as key=value pairs
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
- repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
- snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
+ repository(url: "file:../../target/nexus-staging/deferred/")
pom.withXml {
def root = asNode()
--
GitLab