This is an automated email from the ASF dual-hosted git repository. juhan pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/fineract-cn-permitted-feign-client.git
commit 605339ff519ceaf0659d1cf6769720b52e776cd7 Author: Juhan Aasaru <[email protected]> AuthorDate: Tue Oct 1 14:40:32 2019 +0300 FINCN-179 gradle to 4.10.3, FINCN-178 make Travis build forks --- another-for-test/build.gradle | 24 ++++++++++++------------ api/build.gradle | 7 ++++--- build.gradle | 8 ++++++++ component-test/build.gradle | 12 +++++++----- gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 3 +-- gradlew | 6 +++--- library/build.gradle | 9 +++++---- shared.gradle | 8 +------- travis.sh | 16 ++++++++++++---- 10 files changed, 53 insertions(+), 40 deletions(-) diff --git a/another-for-test/build.gradle b/another-for-test/build.gradle index 3c983bb..feaeb72 100644 --- a/another-for-test/build.gradle +++ b/another-for-test/build.gradle @@ -19,28 +19,25 @@ buildscript { ext { springBootVersion = '1.4.1.RELEASE' } - repositories { jcenter() } - - dependencies { - classpath ("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } } 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 "org.springframework.boot" version "1.4.3.RELEASE" + id 'maven-publish' + id 'java' + id 'idea' } apply from: '../shared.gradle' -apply plugin: 'spring-boot' - -springBoot { - executable = true +bootRepackage { + enabled = true classifier = 'boot' } @@ -55,11 +52,14 @@ dependencies { [group: 'io.jsonwebtoken', name: 'jjwt', version: versions.jjwt], [group: 'org.apache.fineract.cn.anubis', name: 'api', version: versions.frameworkanubis], [group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis], + [group: 'io.netty', name: 'netty-all', version: '4.1.39.Final'], + [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.39.Final'] ) } -publishToMavenLocal.dependsOn bootRepackage - +tasks.withType(PublishToMavenLocal) { task -> + task.dependsOn 'bootRepackage' +} publishing { publications { @@ -71,7 +71,7 @@ publishing { } bootService(MavenPublication) { // "boot" jar - artifact ("$buildDir/libs/$project.name-$version-boot.jar") + artifact(file("$buildDir/libs/$project.name-$project.version-${bootRepackage.classifier}.jar")) groupId project.group artifactId ("service-boot") version project.findProperty('externalVersion') ?: project.version diff --git a/api/build.gradle b/api/build.gradle index 1a034a9..0fbd89c 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -22,7 +22,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE' } } @@ -30,13 +30,14 @@ 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 "io.spring.dependency-management" version "1.0.8.RELEASE" + id 'maven-publish' + id 'java' } apply from: '../shared.gradle' -apply plugin: 'io.spring.dependency-management' - dependencies { compile ( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-feign'], diff --git a/build.gradle b/build.gradle index 4873b74..73eb8f3 100644 --- a/build.gradle +++ b/build.gradle @@ -55,6 +55,14 @@ task artifactoryPublish { dependsOn gradle.includedBuild('component-test').task(':artifactoryPublish') } +task clean { + group 'all' + dependsOn gradle.includedBuild('another-for-test').task(':clean') + dependsOn gradle.includedBuild('api').task(':clean') + dependsOn gradle.includedBuild('component-test').task(':clean') + dependsOn gradle.includedBuild('library').task(':clean') +} + task licenseFormat { group 'all' dependsOn gradle.includedBuild('api').task(':licenseFormat') diff --git a/component-test/build.gradle b/component-test/build.gradle index 01f5572..16d17ca 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -19,24 +19,26 @@ buildscript { ext { springBootVersion = '1.4.1.RELEASE' } - repositories { jcenter() } - - dependencies { - classpath ("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } } 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 "org.springframework.boot" version "1.4.3.RELEASE" + id 'maven-publish' + id 'java' } apply from: '../shared.gradle' +bootRepackage { + enabled = false +} + dependencies { compile( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'], diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7724e6e..94336fc 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 8521cd8..290541c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Apr 18 15:55:31 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/library/build.gradle b/library/build.gradle index b2af84a..e27a743 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE' } } @@ -29,12 +29,13 @@ 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 "io.spring.dependency-management" version "0.6.1.RELEASE" + id 'maven-publish' + id 'java' } apply from: '../shared.gradle' -apply plugin: 'io.spring.dependency-management' - dependencyManagement { imports { mavenBom 'org.springframework.cloud:spring-cloud-netflix:1.2.0.RELEASE' @@ -60,7 +61,7 @@ dependencies { } jar { - from sourceSets.main.allSource + from sourceSets.main.java } publishing { diff --git a/shared.gradle b/shared.gradle index 4d92282..9831447 100644 --- a/shared.gradle +++ b/shared.gradle @@ -18,12 +18,6 @@ group 'org.apache.fineract.cn.permitted-feign-client' version '0.1.0-BUILD-SNAPSHOT' -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'maven-publish' -apply plugin: 'io.spring.dependency-management' - - ext.versions = [ frameworktest : '0.1.0-BUILD-SNAPSHOT', frameworkapi : '0.1.0-BUILD-SNAPSHOT', @@ -78,7 +72,7 @@ dependencies { } jar { - from sourceSets.main.allSource + from sourceSets.main.java } artifactory { 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
