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
This commit is contained in:
Andreas Beeker 2020-06-20 05:27:08 +00:00
parent 01717a3fd6
commit c1b0256d51
2 changed files with 5 additions and 2 deletions

View File

@ -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">

View File

@ -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()
}