[fineract] branch develop updated: improve ClasspathHellDuplicatesCheckRuleTest (req. by FINERACT-953)

[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


The following commit(s) were added to refs/heads/develop by this push:
     new dd0c838  improve ClasspathHellDuplicatesCheckRuleTest (req. by FINERACT-953)
     new 44376ca  Merge pull request #911 from vorburger/FINERACT-953_groovy
dd0c838 is described below

commit dd0c838439ff513f07d9e19d76a3369cb29c01ed
Author: Michael Vorburger <mi...@vorburger.ch>
AuthorDate: Tue May 19 23:01:28 2020 +0200

    improve ClasspathHellDuplicatesCheckRuleTest (req. by FINERACT-953)
    
    to ignore all META-INF/groovy** such as
    META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule which is
    part of both groovy-xml-3.0.3.jar as well as e.g. ical4j-3.0.18.jar
---
 .../infrastructure/classdupes/ClasspathHellDuplicatesChecker.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java
index 01eaa73..6a682b4 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java
@@ -129,7 +129,7 @@ public class ClasspathHellDuplicatesChecker {
                 || resourcePath.startsWith("META-INF/additional-spring")
                 || resourcePath.startsWith("META-INF/terracotta")
                 // Groovy is groovy
-                || resourcePath.startsWith("META-INF/groovy-release-info.properties")
+                || resourcePath.startsWith("META-INF/groovy")
                 // Something doesn't to be a perfectly clean in Maven Surefire:
                 || resourcePath.startsWith("META-INF/maven/")
                 || resourcePath.contains("surefire")