You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2020/04/26 14:47:38 UTC
[fineract] 02/03: Fix rat reports
This is an automated email from the ASF dual-hosted git repository.
vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 0a80195ac28ae09cfd07b18f301a7f664980031c
Author: xurror <ka...@outlook.com>
AuthorDate: Thu Apr 23 04:16:40 2020 +0100
Fix rat reports
---
.travis.yml | 2 +-
fineract-provider/build.gradle | 165 ++++++++++++++++++++---------------------
2 files changed, 81 insertions(+), 86 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 955add4..933e5e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,5 +61,5 @@ 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 --console=plain licenseMain licenseTest licenseIntegrationTest check && ./gradlew --console=plain integrationTest && sudo service mysql stop && docker-compose build && docker-compose up -d && sleep 30s && http --verify=no --timeout 240 --check-status get https://localhost:8443/fineract-provider/actuator/health
+ - ./gradlew clean && ./gradlew --console=plain licenseMain licenseTest licenseIntegrationTest check && ./gradlew --console=plain integrationTest && sudo service mysql stop && docker-compose build && docker-compose up -d && sleep 30s && http --verify=no --timeout 240 --check-status get https://localhost:8443/fineract-provider/actuator/health
# 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)
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 746898b..595e755 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -43,7 +43,7 @@ buildscript {
// below
classpath "org.apache.openjpa:openjpa:$openJPAVersion"
classpath 'com.radcortez.gradle:openjpa-gradle-plugin:3.1.0'
- classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2'
+ classpath "org.nosphere.apache:creadur-rat-gradle:0.6.0"
classpath "com.github.spotbugs:spotbugs-gradle-plugin:2.0.1"
// Use Guava version 23+ as a workaround to spotbug intergration.
// See: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/128#issuecomment-535864882
@@ -175,86 +175,82 @@ jacocoTestReport{
}
rat {
- xmlOutput = false
- htmlOutput = false
- plainOutput = true
- verbose = false
-// inputDir = './..'
- reportDir = new File(buildDir,'reports/rat')
- excludes = [
- '**/licenses/**',
- '**/*.md',
- '**/*.github/**',
- '**/MANIFEST.MF',
- '**/*.json',
- '**/*.txt',
- '**/*.log',
- '**/fineractdev-eclipse-preferences.epf',
- '**/template-expected.html',
- '**/template.mustache',
- '**/.classpath',
- '**/.project',
- '**/.idea/**',
- '**/*.ipr',
- '**/*.iws',
- '**/.settings/**',
- '**/bin/**',
- '**/.git/**',
- '**/.gitignore',
- '**/.gitkeep',
- '**/*.iml',
- //Notice files
- '**/NOTICE_RELEASE',
- '**/NOTICE_SOURCE',
- // Swagger License
- '**/src/main/resources/swagger-ui/**',
- // gradle
- '**/.gradle/**',
- '**/gradlew',
- '**/gradlew.bat',
- '**/gradle/wrapper/gradle-wrapper.properties',
- '**/caches/**',
- '**/daemon/**',
- '**/native/**',
- '**/wrapper/**',
- '**/build/**',
-
- //Api Docs
- '**/api-docs/*.*',
- '**/docs/system-architecture/.htaccess',
- '**/docs/system-architecture/404.html',
- '**/docs/system-architecture/index.html',
- '**/docs/system-architecture/**/*.xml',
- '**/bootstrap-3.0.0/assets/application.js',
- '**/system-architecture/js/plugins.js',
-
- //Apache License
- '**/bootstrap-3.0.0/assets/less.js',
- '**/css/bootstrap-3.0.0/**/*.*',
-
- //Public Domain See http://www.JSON.org/js.html
- '**/bootstrap-3.0.0/assets/json2.js.htm',
-
- // MIT License
- '**/modernizr-2.6.2.min.js',
- '**/css/normalize.css',
- '**/assets/filesaver.js',
- '**/css/fonts/glyphicons-halflings-regular.svg',
- '**/assets/jszip.js',
- '**/assets/jquery.js',
- '**/api-docs/jquery-1.7.min.js',
- '**/css/toc-0.1.2/**/*.*',
- '**/docs/system-architecture/css/main.css',
- '**/system-architecture/js/vendor/jquery-1.9.1.min.js',
- '**/system-architecture/js/vendor/toc-0.1.2/jquery.toc.min.js',
- '**/assets/respond.min.js',
- '**/assets/html5shiv.js',
-
- //BSD License
- '**/assets/uglify.js',
- //Ignore out folder
- '**/out/**',
- ]
+ verbose = false
+ reportDir = new File(buildDir,'reports/rat')
+ excludes = [
+ '**/licenses/**',
+ '**/*.md',
+ '**/*.github/**',
+ '**/MANIFEST.MF',
+ '**/*.json',
+ '**/*.txt',
+ '**/*.log',
+ '**/fineractdev-eclipse-preferences.epf',
+ '**/template-expected.html',
+ '**/template.mustache',
+ '**/.classpath',
+ '**/.project',
+ '**/.idea/**',
+ '**/*.ipr',
+ '**/*.iws',
+ '**/.settings/**',
+ '**/bin/**',
+ '**/.git/**',
+ '**/.gitignore',
+ '**/.gitkeep',
+ '**/*.iml',
+ //Notice files
+ '**/NOTICE_RELEASE',
+ '**/NOTICE_SOURCE',
+ // Swagger License
+ '**/src/main/resources/swagger-ui/**',
+ // gradle
+ '**/.gradle/**',
+ '**/gradlew',
+ '**/gradlew.bat',
+ '**/gradle/wrapper/gradle-wrapper.properties',
+ '**/caches/**',
+ '**/daemon/**',
+ '**/native/**',
+ '**/wrapper/**',
+ '**/build/**',
+
+ //Api Docs
+ '**/api-docs/*.*',
+ '**/docs/system-architecture/.htaccess',
+ '**/docs/system-architecture/404.html',
+ '**/docs/system-architecture/index.html',
+ '**/docs/system-architecture/**/*.xml',
+ '**/bootstrap-3.0.0/assets/application.js',
+ '**/system-architecture/js/plugins.js',
+
+ //Apache License
+ '**/bootstrap-3.0.0/assets/less.js',
+ '**/css/bootstrap-3.0.0/**/*.*',
+
+ //Public Domain See http://www.JSON.org/js.html
+ '**/bootstrap-3.0.0/assets/json2.js.htm',
+
+ // MIT License
+ '**/modernizr-2.6.2.min.js',
+ '**/css/normalize.css',
+ '**/assets/filesaver.js',
+ '**/css/fonts/glyphicons-halflings-regular.svg',
+ '**/assets/jszip.js',
+ '**/assets/jquery.js',
+ '**/api-docs/jquery-1.7.min.js',
+ '**/css/toc-0.1.2/**/*.*',
+ '**/docs/system-architecture/css/main.css',
+ '**/system-architecture/js/vendor/jquery-1.9.1.min.js',
+ '**/system-architecture/js/vendor/toc-0.1.2/jquery.toc.min.js',
+ '**/assets/respond.min.js',
+ '**/assets/html5shiv.js',
+
+ //BSD License
+ '**/assets/uglify.js',
+ //Ignore out folder
+ '**/out/**',
+ ]
}
configurations {
@@ -327,14 +323,14 @@ modernizer {
ignorePackages = []
ignoreClassNamePatterns = [
- '.*AbstractPersistableCustom'
+ '.*AbstractPersistableCustom'
]
ignoreGeneratedClasses = true
exclusions = []
exclusionPatterns = [
-// To be removed when https://issues.apache.org/jira/browse/FINERACT-826 is fixed
- 'org/joda/time/.*'
+ // To be removed when https://issues.apache.org/jira/browse/FINERACT-826 is fixed
+ 'org/joda/time/.*'
]
}
@@ -406,7 +402,6 @@ war {
license {
header rootProject.file('../APACHE_LICENSETEXT.md')
excludes([
- "**/rat-report.txt",
"**/git.properties",
"**/*.html",
"**/*.mustache",