You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ka...@apache.org on 2020/05/29 05:13:33 UTC

[fineract] branch develop updated (4b108f0 -> 1db6e8d)

This is an automated email from the ASF dual-hosted git repository.

kaze pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.


    from 4b108f0  fix broken build due to @Deprecated error [FINERACT-1012]
     new fedea8c  FINERACT-966 Bump dom4j from 2.1.0 to 2.1.3
     new 1db6e8d  fix ClasspathHellDuplicatesCheckRuleTest (FINERACT-966)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 fineract-provider/build.gradle        | 10 ++++++++--
 fineract-provider/dependencies.gradle |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)


[fineract] 01/02: FINERACT-966 Bump dom4j from 2.1.0 to 2.1.3

Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kaze pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit fedea8c248d34dade6565cecc57a78cc582b26eb
Author: nnatarajan <na...@gmail.com>
AuthorDate: Tue May 26 14:09:10 2020 -0600

    FINERACT-966 Bump dom4j from 2.1.0 to 2.1.3
---
 fineract-provider/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index b05c453..ddc61d2 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -109,7 +109,7 @@ dependencyManagement {
         dependency 'junit:junit:+'
         dependency 'org.mockito:mockito-core:+'
         dependency 'io.github.classgraph:classgraph:4.8.78'
-        dependency 'org.dom4j:dom4j:2.1.0'
+        dependency 'org.dom4j:dom4j:2.1.3'
         dependency 'org.awaitility:awaitility:4.0.2'
         dependency 'com.github.spotbugs:spotbugs-annotations:4.0.3'
 


[fineract] 02/02: fix ClasspathHellDuplicatesCheckRuleTest (FINERACT-966)

Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kaze pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 1db6e8d2066122330e1ee4dcda96aef986e59f24
Author: Michael Vorburger <mi...@vorburger.ch>
AuthorDate: Thu May 28 21:56:35 2020 +0200

    fix ClasspathHellDuplicatesCheckRuleTest (FINERACT-966)
    
    and prevent FINERACT-940 related javax.xml.parsers problems
    
    as per https://github.com/spotbugs/spotbugs/issues/1128
---
 fineract-provider/build.gradle        | 10 ++++++++--
 fineract-provider/dependencies.gradle |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index ddc61d2..b425c10 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -109,10 +109,16 @@ dependencyManagement {
         dependency 'junit:junit:+'
         dependency 'org.mockito:mockito-core:+'
         dependency 'io.github.classgraph:classgraph:4.8.78'
-        dependency 'org.dom4j:dom4j:2.1.3'
         dependency 'org.awaitility:awaitility:4.0.2'
         dependency 'com.github.spotbugs:spotbugs-annotations:4.0.3'
 
+        dependency ('org.dom4j:dom4j:2.1.3') {
+            exclude 'relaxngDatatype:relaxngDatatype' // already in com.sun.xml.bind:jaxb-osgi:2.3.0.1
+            // FINERACT-940 && FINERACT-966 https://github.com/spotbugs/spotbugs/issues/1128
+            exclude 'xpp3:xpp3'
+            exclude 'pull-parser:pull-parser'
+	    }
+
         dependencySet(group: 'com.sun.jersey', version: jerseyVersion) {
             entry 'jersey-core'
             entry 'jersey-servlet'
@@ -482,7 +488,7 @@ dependencies {
   tomcat "org.apache.tomcat:tomcat:9.0.34@zip"
 }
 
-dependencies { 
+dependencies {
     errorprone "com.google.errorprone:error_prone_core:2.3.4"
 }
 cargo {
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index 28976d1..56e83fc 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -20,6 +20,7 @@ dependencies {
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
     spotbugsPlugins "jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0@jar"
+    spotbugs 'com.github.spotbugs:spotbugs:4.0.3'
 
 	// Never use "compile" scope, but make all dependencies either 'implementation', 'runtimeOnly' or 'testCompile'.
 	// Note that we never use 'api', because Fineract at least currently is a simple monolithic application ("WAR"), not a library.
@@ -70,8 +71,8 @@ dependencies {
             'com.jayway.jsonpath:json-path',
 
              // JAX-B dependencies for JDK 9+
-             "jakarta.xml.bind:jakarta.xml.bind-api",
-             "org.dom4j:dom4j",
+             'jakarta.xml.bind:jakarta.xml.bind-api',
+             'org.dom4j:dom4j',
 
              'com.github.spotbugs:spotbugs-annotations',
     )