FINERACT-777 Use api / implementation scoped Gradle dependencies (#661)

see https://issues.apache.org/jira/browse/FINERACT-777
This commit is contained in:
Percy Ayuk Ashu
2019-12-01 17:08:31 -08:00
committed by Michael Vorburger ⛑️
parent 981bc17a60
commit 451f4a6338
5 changed files with 292 additions and 252 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ apply plugin: 'eclipse'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'com.bmuschko.tomcat' apply plugin: 'com.bmuschko.tomcat'
apply plugin: 'project-report' apply plugin: 'project-report'
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'openjpa' apply plugin: 'openjpa'
// apply plugin: 'pmd' // apply plugin: 'pmd'
// apply plugin: 'findbugs' // apply plugin: 'findbugs'
+85 -65
View File
@@ -31,83 +31,103 @@ dependencies {
exclude group: 'com.zaxxer', module: 'HikariCP' exclude group: 'com.zaxxer', module: 'HikariCP'
} }
compile( api(
// [group: 'ch.vorburger.mariaDB4j', name: 'mariaDB4j', version: '2.1.3'], [group: 'com.google.code.gson', name: 'gson', version: '2.2.4'],
[group: 'org.quartz-scheduler', name: 'quartz', version: '2.1.7'],
[group: 'org.apache.openjpa', name:'openjpa', version: openJPAVersion],
[group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'],
[group: 'joda-time', name: 'joda-time', version: '2.4'],
[group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'],
[group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'org.springframework', name: 'spring-context-support', version: springVersion],
[group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion],
[group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion],
[group: 'com.squareup.retrofit', name: 'retrofit', version: '1.6.1']
)
implementation(
// [group: 'ch.vorburger.mariaDB4j', name: 'mariaDB4j', version: '2.1.3'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion], [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion],
[group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion], [group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion],
[group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion], [group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion],
//[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'], //[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'],
[group: 'org.springframework', name: 'spring-context-support', version: springVersion],
[group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion],
[group: 'org.apache.openjpa', name:'openjpa', version: openJPAVersion],
//[group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'],
[group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-servlet', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-server', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-json', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-spring', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-multipart', version: jerseyVersion],
[group: 'com.squareup.retrofit', name: 'retrofit', version: '1.6.1'],
[group: 'com.squareup.okhttp', name: 'okhttp', version: '2.0.0'],
[group: 'com.squareup.okhttp', name: 'okhttp-urlconnection', version: '2.0.0'],
[group: 'com.google.code.gson', name: 'gson', version: '2.2.4'], [group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion],
[group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'joda-time', name: 'joda-time', version: '2.4'],
//[group: 'net.sourceforge.javacsv', name: 'javacsv', version: '2.0'],
[group: 'org.apache.commons', name: 'commons-email', version: '1.3.3'],
[group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2'],
// no slf4j & logback here (anymore), as spring-boot-starter-logging already brings this now, better assembled (log4j-over-slf4j was originally forgotten here)
//[group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'],
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.4'],
[group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion],
[group: 'org.apache.poi',name: 'poi', version: '3.9'], //[group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.9'],
[group: 'com.lowagie', name: 'itext', version: '2.1.7'], [group: 'com.sun.jersey', name: 'jersey-servlet', version: jerseyVersion],
//[group: 'com.lowagie', name: 'itext-rtf', version: '2.1.7'], [group: 'com.sun.jersey', name: 'jersey-server', version: jerseyVersion],
[group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'], [group: 'com.sun.jersey', name: 'jersey-json', version: jerseyVersion],
[group: 'com.googlecode.flyway', name: 'flyway-core', version: '2.1.1'], [group: 'com.sun.jersey.contribs', name: 'jersey-spring', version: jerseyVersion],
[group: 'org.quartz-scheduler', name: 'quartz', version: '2.1.7'], [group: 'com.sun.jersey.contribs', name: 'jersey-multipart', version: jerseyVersion],
[group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.80'],
[group: 'net.sf.ehcache', name: 'ehcache', version: '2.7.2'],
[group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'],
[group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1'],
[group: 'org.apache.tika', name: 'tika-core', version :'1.9'],
// Although fineract (at the time of writing) doesn't have any compile time dep. on this,
// it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
[group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
// Once we've switched to Java 8 this dep can be removed.
//[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
[group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'],
[group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'], [group: 'com.squareup.okhttp', name: 'okhttp', version: '2.0.0'],
[group: 'org.apache.activemq', name: 'activemq-broker', version: '5.9.1'], [group: 'com.squareup.okhttp', name: 'okhttp-urlconnection', version: '2.0.0'],
[group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final']
//[group: 'net.sourceforge.javacsv', name: 'javacsv', version: '2.0'],
[group: 'org.apache.commons', name: 'commons-email', version: '1.3.3'],
[group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2'],
// no slf4j & logback here (anymore), as spring-boot-starter-logging already brings this now, better assembled (log4j-over-slf4j was originally forgotten here)
//[group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'],
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.4'],
[group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion],
[group: 'org.apache.poi',name: 'poi', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.9'],
[group: 'com.lowagie', name: 'itext', version: '2.1.7'],
//[group: 'com.lowagie', name: 'itext-rtf', version: '2.1.7'],
[group: 'com.googlecode.flyway', name: 'flyway-core', version: '2.1.1'],
[group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.80'],
[group: 'net.sf.ehcache', name: 'ehcache', version: '2.7.2'],
[group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'],
[group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1'],
[group: 'org.apache.tika', name: 'tika-core', version :'1.9'],
// Although fineract (at the time of writing) doesn't have any compile time dep. on this,
// it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
[group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
// Once we've switched to Java 8 this dep can be removed.
//[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
[group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'],
[group: 'org.apache.activemq', name: 'activemq-broker', version: '5.9.1'],
[group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final']
) )
implementation 'org.apache.bval:org.apache.bval.bundle:2.0.2' implementation 'org.apache.bval:org.apache.bval.bundle:2.0.2'
testCompile 'junit:junit:4.11', testCompile 'junit:junit:4.11',
'junit:junit-dep:4.11', 'junit:junit-dep:4.11',
'org.mockito:mockito-core:1.9.5', 'org.mockito:mockito-core:1.9.5',
'com.jayway.restassured:rest-assured:2.3.3', 'com.jayway.restassured:rest-assured:2.3.3',
[group: 'com.mockrunner', name: 'mockrunner-jms', version: '1.0.6'], [group: 'com.mockrunner', name: 'mockrunner-jms', version: '1.0.6'],
[group: 'com.mockrunner', name: 'mockrunner-jdbc', version: '1.0.6'] [group: 'com.google.code.gson', name: 'gson', version: '2.2.4'],
[group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'],
[group: 'joda-time', name: 'joda-time', version: '2.4'],
[ group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'],
[group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.springframework', name: 'spring-context-support', version: springVersion],
[group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion],
[group: 'com.mockrunner', name: 'mockrunner-jdbc', version: '1.0.6']
testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
exclude group: 'com.jayway.jsonpath', module: 'json-path' exclude group: 'com.jayway.jsonpath', module: 'json-path'
} }
} }
+93 -71
View File
@@ -27,79 +27,101 @@ dependencies {
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:${springBootVersion}") providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:${springBootVersion}")
compile( api(
[group: 'ch.vorburger.mariaDB4j', name: 'mariaDB4j', version: '2.1.3'], [group: 'com.google.code.gson', name: 'gson', version: '2.2.4'],
[group: 'org.quartz-scheduler', name: 'quartz', version: '2.1.7'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion], [group: 'joda-time', name: 'joda-time', version: '2.4'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: springBootVersion], [group: 'org.apache.openjpa', name:'openjpa-all', version:'2.4.1'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion], [group: 'org.springframework', name:'spring-jms'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion], [group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'],
//[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'], [group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'org.springframework', name: 'spring-context-support', version: springVersion], [group: 'org.springframework', name: 'spring-context-support', version: springVersion],
[group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion], [group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion],
[group: 'com.squareup.retrofit', name: 'retrofit', version: '1.6.1'],
[group: 'org.apache.openjpa', name:'openjpa', version:openJPAVersion], [group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion]
[group: 'org.apache.openjpa', name:'openjpa-maven-plugin', version:openJPAVersion],
[group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'],
[group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-servlet', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-server', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-json', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-spring', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-multipart', version: jerseyVersion],
[group: 'com.squareup.retrofit', name: 'retrofit', version: '1.6.1'],
[group: 'com.squareup.okhttp', name: 'okhttp', version: '2.0.0'],
[group: 'com.squareup.okhttp', name: 'okhttp-urlconnection', version: '2.0.0'],
[group: 'com.google.code.gson', name: 'gson', version: '2.2.4'],
[group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'joda-time', name: 'joda-time', version: '2.4'],
//[group: 'net.sourceforge.javacsv', name: 'javacsv', version: '2.0'],
[group: 'org.apache.commons', name: 'commons-email', version: '1.3.3'],
[group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2'],
// no slf4j & logback here (anymore), as spring-boot-starter-logging already brings this now, better assembled (log4j-over-slf4j was originally forgotten here)
//[group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'],
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.4'],
[group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion],
[group: 'org.apache.poi',name: 'poi', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.9'],
[group: 'com.lowagie', name: 'itext', version: '2.1.7'],
[group: 'com.lowagie', name: 'itext-rtf', version: '2.1.7'],
[group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'],
[group: 'com.googlecode.flyway', name: 'flyway-core', version: '2.1.1'],
[group: 'org.quartz-scheduler', name: 'quartz', version: '2.1.7'],
[group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.80'],
[group: 'net.sf.ehcache', name: 'ehcache', version: '2.7.2'],
[group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'],
[group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1'],
[group: 'org.apache.tika', name: 'tika-core', version :'1.9'],
// Although fineract (at the time of writing) doesn't have any compile time dep. on this,
// it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
[group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
// Once we've switched to Java 8 this dep can be removed.
//[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
[group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'],
[group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'],
[group: 'org.apache.activemq', name: 'activemq-broker', version: '5.9.1'],
[group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final']
) )
testCompile 'junit:junit:4.11', implementation(
'junit:junit-dep:4.11', [group: 'ch.vorburger.mariaDB4j', name: 'mariaDB4j', version: '2.1.3'],
'org.mockito:mockito-core:1.9.5',
'com.jayway.restassured:rest-assured:2.3.3', [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion],
[group: 'com.mockrunner', name: 'mockrunner-jms', version: '1.0.6'], [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: springBootVersion],
[group: 'com.mockrunner', name: 'mockrunner-jdbc', version: '1.0.6'] [group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion],
[group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion],
//[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'],
[group: 'org.apache.openjpa', name:'openjpa-maven-plugin', version:openJPAVersion],
[group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'],
[group: 'com.sun.jersey', name: 'jersey-servlet', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-server', version: jerseyVersion],
[group: 'com.sun.jersey', name: 'jersey-json', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-spring', version: jerseyVersion],
[group: 'com.sun.jersey.contribs', name: 'jersey-multipart', version: jerseyVersion],
[group: 'com.squareup.okhttp', name: 'okhttp', version: '2.0.0'],
[group: 'com.squareup.okhttp', name: 'okhttp-urlconnection', version: '2.0.0'],
//[group: 'net.sourceforge.javacsv', name: 'javacsv', version: '2.0'],
[group: 'org.apache.commons', name: 'commons-email', version: '1.3.3'],
[group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2'],
// no slf4j & logback here (anymore), as spring-boot-starter-logging already brings this now, better assembled (log4j-over-slf4j was originally forgotten here)
//[group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'],
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.4'],
[group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion],
[group: 'org.apache.poi',name: 'poi', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.9'],
[group: 'com.lowagie', name: 'itext', version: '2.1.7'],
[group: 'com.lowagie', name: 'itext-rtf', version: '2.1.7'],
[group: 'com.googlecode.flyway', name: 'flyway-core', version: '2.1.1'],
[group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.80'],
[group: 'net.sf.ehcache', name: 'ehcache', version: '2.7.2'],
[group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'],
[group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1'],
[group: 'org.apache.tika', name: 'tika-core', version :'1.9'],
// Although fineract (at the time of writing) doesn't have any compile time dep. on this,
// it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
[group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
// Once we've switched to Java 8 this dep can be removed.
//[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
[group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'],
[group: 'org.apache.activemq', name: 'activemq-broker', version: '5.9.1'],
[group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final']
)
testCompile 'junit:junit:4.11',
'junit:junit-dep:4.11',
'org.mockito:mockito-core:1.9.5',
'com.jayway.restassured:rest-assured:2.3.3',
[group: 'com.mockrunner', name: 'mockrunner-jms', version: '1.0.6'],
[group: 'com.google.code.gson', name: 'gson', version: '2.2.4'],
[group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'],
[group: 'joda-time', name: 'joda-time', version: '2.4'],
[ group: 'org.mnode.ical4j', name: 'ical4j', version: '1.0.4'],
[group: 'com.google.guava', name: 'guava', version: '15.0'],
[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'],
[group: 'org.springframework', name: 'spring-context-support', version: springVersion],
[group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion],
[group: 'com.mockrunner', name: 'mockrunner-jdbc', version: '1.0.6']
testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
exclude group: 'com.jayway.jsonpath', module: 'json-path' exclude group: 'com.jayway.jsonpath', module: 'json-path'
Vendored
-2
View File
@@ -80,14 +80,12 @@ if [ -n "$JAVA_HOME" ] ; then
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
else else
JAVACMD="java" JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi