Adjust paths in build-files some more and copy svn-libs

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

diff --git a/build.gradle b/build.gradle
index a450472a76c38b0fe64169e51f2af1731c105730..d8a089bfe53c0adb04f2569637cc5af5ab655771 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -349,7 +349,7 @@ rat {
 
     // List of Gradle exclude directives, defaults to ['**/.gradle/**']
     //excludes.add("main/java/org/apache/poi/**/*-chart-data.txt")
-    includes.add("build.javacheck.xml")
+    excludes.add("build.javacheck.xml")
     excludes.add("**/build/**")
     excludes.add("**/out/**")
     excludes.add("**/*.iml")

diff --git a/build.xml b/build.xml
index b69ea32602fc73b4c5fdd336cd6f79e5701ca7b4..51cf06bdd7e1501080ad24251f7ce1c77bc884a1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -90,7 +90,7 @@ under the License.
         <attribute name="value"/>
         <sequential>
             <mkdir dir="poi-excelant/build/poi-ant-contrib"/>
-            <javac srcdir="poi-excelant/src//poi-ant-contrib/java" destdir="poi-excelant/build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
+            <javac srcdir="poi-excelant/src/poi-ant-contrib/java" destdir="poi-excelant/build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
             <taskdef name="PropertyResetHelper" classname="PropertyReset" classpath="poi-excelant/build/poi-ant-contrib"/>
             <PropertyResetHelper name="@{name}" value="@{value}" />
         </sequential>
@@ -887,10 +887,9 @@ under the License.
     </target>
     <target name="fetch-svn-jars" depends="check-svn-jars" unless="svn.jars.present">
                <!-- some jars are gone since bintray.dl is shutting down, so we started to include them in the sources for now -->
-        <downloadfile src="file://${basedir}/lib.stored/svnant-1.3.1.jar" dest="${dist.svnant.jar}"/>
-        <downloadfile src="file://${basedir}/lib.stored/adapter-base-1.12.0.jar" dest="${dist.svnclientadapter-base.jar}"/>
-        <downloadfile src="file://${basedir}/lib.stored/adapter-javahl-1.12.0.jar" dest="${dist.svnclientadapter-svnkit.jar}"/>
-        <downloadfile src="file://${basedir}/lib.stored/adapter-svnkit-1.12.0.jar" dest="${dist.svnclientadapter-javahl.jar}"/>
+               <copy todir="lib/util">
+                       <fileset dir="lib.stored/" includes="*.jar"/>
+               </copy>
         <downloadfile src="${dist.svnkit.url}" dest="${dist.svnkit.jar}"/>
         <downloadfile src="${dist.svnkit-javahl16.url}" dest="${dist.svnkit-javahl16.jar}"/>
         <downloadfile src="${dist.sqljet.url}" dest="${dist.sqljet.jar}"/>