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-group.git
commit 147712c9f0747acf0ca663f54f30962291fe3198 Author: Juhan Aasaru <[email protected]> AuthorDate: Tue Oct 1 16:57:18 2019 +0300 FINCN-179 gradle to 4.10.3 FINCN-178 make Travis build forks FINCN-175 remove Netty warnings set application to unique port --- api/build.gradle | 6 +++++- build.gradle | 7 +++++++ component-test/build.gradle | 8 +++++++- gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 3 +-- gradlew | 6 +++--- service/build.gradle | 26 +++++++++++++------------- service/src/main/resources/application.yml | 2 +- shared.gradle | 7 +------ travis.sh | 16 ++++++++++++---- 10 files changed, 50 insertions(+), 31 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 46254a9..81b3063 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -21,13 +21,17 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE' } + classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE' + } } 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' diff --git a/build.gradle b/build.gradle index eeb68fb..b125a56 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,13 @@ task prepareForTest { dependsOn gradle.includedBuild('component-test').task(':build') } +task clean { + group 'all' + dependsOn gradle.includedBuild('api').task(':clean') + dependsOn gradle.includedBuild('service').task(':clean') + dependsOn gradle.includedBuild('component-test').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 9ab28b5..8b790b9 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -25,7 +25,6 @@ buildscript { } dependencies { - classpath ("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3") } } @@ -34,11 +33,18 @@ 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' apply plugin: 'org.asciidoctor.convert' +bootRepackage { + enabled = false +} + dependencies { compile( [group: 'org.apache.fineract.cn.group', name: 'api', version: project.version], diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c733004..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 4aca373..290541c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Mar 16 14:47:20 CET 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-bin.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/service/build.gradle b/service/build.gradle index 296bcf1..c759268 100644 --- a/service/build.gradle +++ b/service/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' } @@ -58,12 +55,15 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkmariadb], [group: 'org.apache.fineract.cn', name: 'postgresql', version: '0.1.0-BUILD-SNAPSHOT'], [group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand], - [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator] + [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], + [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 { service(MavenPublication) { @@ -74,7 +74,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 ("$project.name-boot") version project.findProperty('externalVersion') ?: project.version diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index e95b85a..f7e348a 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -52,7 +52,7 @@ eureka: defaultZone: http://localhost:8761/eureka/ server: - port: 8081 + port: 2032 contextPath: /group/v1/* cassandra: diff --git a/shared.gradle b/shared.gradle index b3b7253..f467c25 100644 --- a/shared.gradle +++ b/shared.gradle @@ -30,11 +30,6 @@ ext.versions = [ validator : '5.3.0.Final' ] -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'maven-publish' -apply plugin: 'io.spring.dependency-management' - tasks.withType(JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -71,7 +66,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
