This is an automated email from the ASF dual-hosted git repository.
ptuomola pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 6a55a80 FINERACT-1198 - Revert spotlessApply and use only
spotlessCheck
6a55a80 is described below
commit 6a55a80c7d8ba05ff49f906e1715b65055fe8fb6
Author: Yemdjih Kaze Nasser <[email protected]>
AuthorDate: Thu Nov 26 06:13:08 2020 +0100
FINERACT-1198 - Revert spotlessApply and use only spotlessCheck
---
.travis.yml | 2 +-
build.gradle | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 132d630..5d5d4f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,6 @@ script:
# using "&&" instead of several "-" means that integrationTest does not run if
test fails,
# and Docker test does not run if integration test fails, which makes PR
failure easier to understand.
# @see
https://docs.travis-ci.com/user/job-lifecycle/#customizing-the-build-phase
- - ./gradlew --no-daemon --console=plain -PautomatedBuild=true licenseMain
licenseTest check build test --fail-fast doc && sudo service mysql stop &&
docker-compose build && docker-compose up -d && sleep 60s && curl -f -k
--retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30
https://localhost:8443/fineract-provider/actuator/health && (( $(curl -f -k
--retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30
https://localhost:8443/fineract-provider/actua [...]
+ - ./gradlew --no-daemon --console=plain licenseMain licenseTest check build
test --fail-fast doc && sudo service mysql stop && docker-compose build &&
docker-compose up -d && sleep 60s && curl -f -k --retry 5
--retry-connrefused --connect-timeout 30 --retry-delay 30
https://localhost:8443/fineract-provider/actuator/health && (( $(curl -f -k
--retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30
https://localhost:8443/fineract-provider/actuator/info | wc --chars) [...]
# We stop the mysql system service when running the Docker test to avoid port
3306 conflicts (unless we run the mysql in docker-compose on another port; req.
FINERACT-773)
# The fancy /actuator/info test makes sure that has more than 100 characters
of JSON to test that the git.properties worked (see FINERACT-983)
diff --git a/build.gradle b/build.gradle
index d4eaab4..ee23730 100644
--- a/build.gradle
+++ b/build.gradle
@@ -461,13 +461,7 @@ configure(project.fineractJavaProjects) {
lineEndings 'UNIX'
}
- compileJava {
- if (project.hasProperty('automatedBuild')) {
- dependsOn(spotlessCheck)
- } else {
- dependsOn(spotlessApply)
- }
- }
+ compileJava.dependsOn spotlessCheck
// If we are running Gradle within Eclipse to enhance classes with OpenJPA,
// set the classes directory to point to Eclipse's default build directory
