diff options
| -rw-r--r-- | build.gradle | 50 | ||||
| -rw-r--r-- | build.xml | 47 |
2 files changed, 1 insertions, 96 deletions
diff --git a/build.gradle b/build.gradle index daa77eb0a3..421ebbec2a 100644 --- a/build.gradle +++ b/build.gradle @@ -593,7 +593,7 @@ task allJavaDoc(type: Javadoc) { } -task jenkins(dependsOn: ['replaceVersion', subprojects.build, 'binDistZip','binDistTar','srcDistZip','srcDistTar']) {} +task jenkins(dependsOn: ['replaceVersion', subprojects.build, 'srcDistZip','srcDistTar']) {} clean { delete "${rootDir}/build/dist" @@ -708,44 +708,6 @@ distributions { var poiDep = project(':poi').configurations.getAt('compileClasspath') var ooxmlImp = project(':poi-ooxml').configurations.getAt('compileClasspath') - bin { - distributionBaseName = "poi-bin-${version}-${date}" - contents { - from('build/dist/maven') { - include "**/*${version}.jar" - exclude "**/*lite-agent*.jar" - exclude "**/*integration*.jar" - } - - from('build/dist') { include 'poi-javadoc*.jar'} - from('legal') { exclude 'HEADER' } - from(poiDep) { include "**/*.jar" } - from(ooxmlImp) { include "**/*.jar" } - - from('.') { - include '*/build/reports/*.bom.*' - } - - includeEmptyDirs = false - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - eachFile { - String root = "poi-bin-${version}/" - if (name.startsWith('poi')) { - path = root + name - } else if (poiDep.contains(file)) { - path = root + 'lib/' + name - } else if (name =~ /^(batik|bc|fontbox|graphics|pdfbox|xml-apis|xmlgraphics|xmlsec)/) { - path = root + 'auxiliary/' + name - } else if (ooxmlImp.contains(file)) { - path = root + 'ooxml-lib/' + name - } else { - path = root + name - } - } - } - } - src { distributionBaseName = "poi-src-${version}-${date}" contents { @@ -800,14 +762,6 @@ distributions { } } -binDistZip.dependsOn 'zipJavadocs', ':poi-ooxml-full:jar', ':poi-ooxml-full:cyclonedxBom', - ':poi-ooxml:jar', ':poi-ooxml:cyclonedxBom', - ':poi-ooxml-lite:jar', ':poi-ooxml-lite:cyclonedxBom', - ':poi-scratchpad:jar', ':poi-scratchpad:cyclonedxBom', - ':poi-excelant:jar', ':poi-excelant:cyclonedxBom', - ':poi:jar', ':poi:cyclonedxBom', ':poi-examples:jar', ':poi-examples:cyclonedxBom' -binDistTar.dependsOn 'binDistZip' - task soLinkCheck() { doLast { def path = ant.path { @@ -859,7 +813,5 @@ task fixDistDir { } } -binDistZip.finalizedBy fixDistDir -binDistTar.finalizedBy fixDistDir srcDistZip.finalizedBy fixDistDir srcDistTar.finalizedBy fixDistDir @@ -2385,45 +2385,6 @@ under the License. <globmapper from="*" to="${zipdir}/*"/> </mappedresources> - <!-- jars to include in binary assemblies --> - <union id="bin-files" cache="true"> - <mappedresources refid="legal-files"/> - <mappedresources cache="true"> - <fileset dir="${main.lib}"> - <include name="commons-codec-*.jar"/> - <include name="commons-collections4-*.jar"/> - <include name="commons-math3-*.jar"/> - <include name="commons-io-*.jar"/> - <include name="log4j-api-*.jar"/> - <include name="SparseBitSet-*.jar"/> - </fileset> - <globmapper from="*" to="${zipdir}/lib/*"/> - </mappedresources> - <mappedresources cache="true"> - <fileset dir="${ooxml.lib}"/> - <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/> - </mappedresources> - <mappedresources cache="true"> - <fileset dir="${ooxml-provided.lib}"/> - <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/auxiliary/\1"/> - </mappedresources> - <mappedresources cache="true"> - <fileset dir="${ooxml-batik.lib}"/> - <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/auxiliary/\1"/> - </mappedresources> - <mappedresources cache="true"> - <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar,**/*-tests.jar"/> - <chainedmapper> - <flattenmapper/> - <globmapper from="*" to="${zipdir}/*"/> - </chainedmapper> - </mappedresources> - <mappedresources cache="true"> - <fileset dir="${build.site}"/> - <globmapper from="*" to="${zipdir}/docs/*"/> - </mappedresources> - </union> - <!-- patterns to exclude from source assemblies --> <union id="src-files" cache="true"> <mappedresources refid="legal-files"/> @@ -2460,14 +2421,6 @@ under the License. </mappedresources> </union> - <zip destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.zip"> - <union refid="bin-files"/> - </zip> - - <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.tar.gz" longfile="gnu" compression="gzip"> - <union refid="bin-files"/> - </tar> - <zip destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.zip"> <union refid="src-files"/> </zip> |