FINCN-179 gradle to 4.10.3, FINCN-178 make Travis build forks
diff --git a/api/build.gradle b/api/build.gradle
index 1cf7f0b..e8e2371 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -22,7 +22,7 @@
}
dependencies {
- classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
}
}
@@ -30,6 +30,9 @@
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'
}
diff --git a/build.gradle b/build.gradle
index 94fbbc4..88fa965 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,6 +53,14 @@
dependsOn gradle.includedBuild('test').task(':artifactoryPublish')
}
+task clean {
+ group 'all'
+ dependsOn gradle.includedBuild('api').task(':clean')
+ dependsOn gradle.includedBuild('library').task(':clean')
+ dependsOn gradle.includedBuild('test').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 b0152c0..8339427 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -19,24 +19,27 @@
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'
+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
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 756036c..290541c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Mar 14 12:33:07 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 @@
# 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 @@
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
diff --git a/shared.gradle b/shared.gradle
index 2c9a1e1..c9edcf6 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -74,7 +74,7 @@
}
jar {
- from sourceSets.main.allSource
+ from sourceSets.main.java
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
diff --git a/travis.sh b/travis.sh
index 03a75ee..d54330d 100755
--- a/travis.sh
+++ b/travis.sh
@@ -36,6 +36,12 @@
./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 @@
}
+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
