(ofbiz-framework) branch trunk updated: Fixed: Keep needed classpath entries in the Eclipse .classpath file (OFBIZ-12880)

[mbrohl]

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

mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6a35d40d3b Fixed: Keep needed classpath entries in the Eclipse 
.classpath file (OFBIZ-12880)
6a35d40d3b is described below

commit 6a35d40d3b333d04f79704169035ed1bfc49c55e
Author: Michael Brohl <michael.br...@ecomify.de>
AuthorDate: Tue Jan 23 23:20:06 2024 +0100

    Fixed: Keep needed classpath entries in the Eclipse .classpath file
    (OFBIZ-12880)
    
    Keeps classpath entries for config folders and dtds which are removed
    from the .classpath file after it is generated by the Eclipse Gradle
    task.
---
 build.gradle | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index e55529938c..04cffdafc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -411,14 +411,12 @@ eclipse.classpath.file.whenMerged { classpath ->
 
         classpath.entries.removeAll { entry ->
             // remove any "src" entries in .classpath of the form 
/componentName
-            entry.kind == 'src' && !(entry.path ==~ 'framework/base/config' || 
entry.path ==~ 'framework/base/dtd') && (
+            entry.kind == 'src' && (
             entry.path ==~ '.*/+(' + componentName.tokenize(fileSep).last() + 
')$' ||
             entry.path ==~ /(\/+framework)$/ ||
             entry.path ==~ /(\/+applications)$/ ||
             entry.path ==~ /(\/+plugins)$/ ||
-            entry.path ==~ /(\/+themes)$/ ||
-            entry.path ==~ eclipseEntry + '/config' ||
-            entry.path ==~ eclipseEntry + '/dtd')
+            entry.path ==~ /(\/+themes)$/ )
         }
     }
 }