remove old ooxml-libs on build - update path

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

diff --git a/build.xml b/build.xml
index 5bb8f8e64999ff05c510a0ad3ecaded27d869c6e..b8de10ac669b8fc6d0d5111b379df3f9ccda1d97 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -613,6 +613,9 @@ under the License.
             <fileset dir="${basedir}/lib/util">
                 <include name="asm*7.2.jar"/>
             </fileset>
+            <fileset dir="${basedir}/lib/ooxml">
+                <include name="xmlbeans-3.1.0.jar"/>
+            </fileset>
         </delete>
 
         <condition property="jars.present">

diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 4b39a6abf8bae0ea7895382819aeb938ea4162fd..781b5a0ebc8ccba4163967e0d5f050f6d8d08207 100644 (file)
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -240,7 +240,7 @@ poijobs.each { poijob ->
                 writeDescription('Build was aborted due to timeout')
             }
             preBuildCleanup {
-                includePattern('**/ooxml-lib/ooxml*.jar')
+                includePattern('**/lib/ooxml/ooxml*.jar')
                 includePattern('sonar/*/target/**')
             }
             if(poijob.sonar) {
@@ -448,7 +448,7 @@ poijobs.each { poijob ->
                     defaultEncoding('UTF-8')
                 }
                 // in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
-                archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,build/integration-test-results/**,ooxml-lib/**,build/*/build/libs/*.jar')
+                archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,build/integration-test-results/**,lib/ooxml/**,build/*/build/libs/*.jar')
                 warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
                     resolveRelativePaths()
                 }