From: Andreas Beeker <kiwiwings@apache.org>
Date: Wed, 5 Aug 2020 22:41:36 +0000 (+0000)
Subject: try to fix windows builds - path issues with regex patterns
X-Git-Tag: before_ooxml_3rd_edition~164
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fad42e3ed673b7ae56904477159b400b2994c404;p=poi.git

try to fix windows builds - path issues with regex patterns

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1880619 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index 02453efb05..fb2e8ad613 100644
--- a/build.xml
+++ b/build.xml
@@ -849,7 +849,11 @@ under the License.
             <local name="cp_java"/>
             <pathconvert property="cp_java" pathsep=",">
                 <path><lib/></path>
-                <regexpmapper from="^${basedir}[/\\](.*)$" to="\1/*.jar"/>
+                <filtermapper>
+                    <replacestring from="${basedir}" to=""/>
+                    <replaceregex pattern="^." replace=""/>
+                    <suffixlines suffix="${file.separator}*.jar"/>
+                </filtermapper>
             </pathconvert>
 
             <local name="maven-name"/>
@@ -1106,7 +1110,11 @@ under the License.
             <local name="cp_java"/>
             <pathconvert property="cp_java" pathsep=",">
                 <path refid="@{modulepath-ref}"/>
-                <regexpmapper from="^${basedir}[/\\](.*)$" to="\1/*.jar"/>
+                <filtermapper>
+                    <replacestring from="${basedir}" to=""/>
+                    <replaceregex pattern="^." replace=""/>
+                    <suffixlines suffix="${file.separator}*.jar"/>
+                </filtermapper>
             </pathconvert>
 
             <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="@{jacocodest}">