This is an automated email from the ASF dual-hosted git repository. juhan pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-async.git
commit 69b79fd5faf4ce6d856d8542184b0ffe319dc453 Author: Juhan Aasaru <[email protected]> AuthorDate: Tue Oct 1 09:10:35 2019 +0300 FINCN-179 gradle to 4.10.3, FINCN-178 make Travis build forks --- build.gradle | 10 ++++------ gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- travis.sh | 16 ++++++++++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index ccd2fe4..7e64872 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { jcenter() } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE' } } @@ -28,6 +28,9 @@ plugins { id 'com.github.hierynomus.license' version '0.13.1' id("org.nosphere.apache.rat") version "0.3.1" id "com.jfrog.artifactory" version "4.9.5" + id 'maven-publish' + id 'idea' + id 'java' } group 'org.apache.fineract.cn' @@ -42,11 +45,6 @@ ext.versions = [ findbugs : '3.0.1', ] -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'maven' -apply plugin: 'maven-publish' -apply plugin: 'license' apply plugin: 'io.spring.dependency-management' tasks.withType(JavaCompile) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 01143ae..af7a4fe 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c2a52f..aeea1f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 13 18:40:21 CET 2017 +#Tue Oct 01 09:00:23 EEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip diff --git a/travis.sh b/travis.sh index 03a75ee..d54330d 100755 --- a/travis.sh +++ b/travis.sh @@ -36,6 +36,12 @@ function build_pullrequest() { ./gradlew publishToMavenLocal rat || EXIT_STATUS=$? } +# Builds Forked (non-apache) Repository +function build_fork() { + echo -e "Building branch $TRAVIS_BRANCH of fork $TRAVIS_REPO_SLUG. Won't publish anything to Artifactory." + ./gradlew publishToMavenLocal rat || EXIT_STATUS=$? +} + # For other branches we need to add branch name as prefix function build_otherbranch() { echo -e "Building a snapshot out of branch [$TRAVIS_BRANCH] and publishing it with prefix '${TRAVIS_BRANCH}-SNAPSHOT'" @@ -49,17 +55,19 @@ function build_tag() { } +echo -e "TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG" echo -e "TRAVIS_BRANCH=$TRAVIS_BRANCH" echo -e "TRAVIS_TAG=$TRAVIS_TAG" echo -e "TRAVIS_COMMIT=${TRAVIS_COMMIT::7}" echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST" -# Build Logic -if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then +if [[ $TRAVIS_REPO_SLUG != apache* ]]; then + build_fork +elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then build_pullrequest -elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" != "$BUILD_SNAPSHOTS_BRANCH" ] && [ "$TRAVIS_TAG" == "" ] ; then +elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" != "$BUILD_SNAPSHOTS_BRANCH" ] && [ "$TRAVIS_TAG" == "" ]; then build_otherbranch -elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "$BUILD_SNAPSHOTS_BRANCH" ] && [ "$TRAVIS_TAG" == "" ] ; then +elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "$BUILD_SNAPSHOTS_BRANCH" ] && [ "$TRAVIS_TAG" == "" ]; then build_snapshot elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then build_tag
