You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/02/28 19:28:39 UTC
svn commit: r1887010 - in /poi/trunk: build.gradle build.xml
Author: fanningpj
Date: Sun Feb 28 19:28:39 2021
New Revision: 1887010
URL: http://svn.apache.org/viewvc?rev=1887010&view=rev
Log:
change gradle build to get unreleased xmlbeans jar from ci-builds (like ant build does)
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1887010&r1=1887009&r2=1887010&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Feb 28 19:28:39 2021
@@ -71,25 +71,8 @@ task adjustWrapperPropertiesFile {
}
wrapper.finalizedBy adjustWrapperPropertiesFile
-
-// helper method to download a jar file manually from an URL, e.g. XMLBeans 4.0.0
-def urlFile = { url, name ->
- File file = new File("$buildDir/download/${name}.jar")
- file.parentFile.mkdirs()
- if (!file.exists()) {
- new URL(url).withInputStream { downloadStream ->
- file.withOutputStream { fileOut ->
- fileOut << downloadStream
- }
- }
- }
- files(file.absolutePath)
-}
-
/**
-
Define properties for all projects, including this one
-
*/
allprojects {
apply plugin: 'eclipse'
@@ -119,7 +102,7 @@ subprojects {
log4jVersion = '2.14.0'
mockitoVersion = '3.6.0'
hamcrestVersion = '2.2'
- xmlbeansVersion = '4.0.0'
+ xmlbeansVersion = '4.0.1'
}
tasks.withType(JavaCompile) {
@@ -287,6 +270,13 @@ project('ooxml') {
antdep 'org.apache.ant:ant:1.10.9'
}
+ task downloadJarsToLibs(){
+ def f = new File('lib/ooxml/xmlbeans-4.0.1.jar')
+ if (!f.exists()) {
+ new URL('https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-4.0.1.jar').withInputStream{ i -> f.withOutputStream{ it << i }}
+ }
+ }
+
// we need to ensure that the custom ant tasks are compiled before we import the build.xml file
ant.mkdir(dir: "../../build/poi-ant-contrib")
ant.javac(srcdir: "../../src/excelant/poi-ant-contrib"
@@ -302,9 +292,11 @@ project('ooxml') {
'ant-' + antTargetName
}
compileJava.dependsOn 'ant-compile-ooxml-xsds'
+ compileJava.dependsOn 'downloadJarsToLibs'
dependencies {
- compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ //compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ compile files("../../lib/ooxml/xmlbeans-${xmlbeansVersion}.jar")
compile 'org.apache.commons:commons-collections4:4.4'
compile "org.apache.commons:commons-math3:${commonsMathVersion}"
compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
@@ -360,7 +352,8 @@ project('examples') {
compile project(':ooxml')
compile project(':scratchpad')
- compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ //compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ compile files("../../lib/ooxml/xmlbeans-${xmlbeansVersion}.jar")
compile "org.apache.logging.log4j:log4j-core:${log4jVersion}"
compile files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
@@ -407,7 +400,8 @@ project('integrationtest') {
compile project(':scratchpad')
compile project(':examples')
- testCompile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ //testCompile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+ testCompile files("../../lib/ooxml/xmlbeans-${xmlbeansVersion}.jar")
testCompile files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
testCompile files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1887010&r1=1887009&r2=1887010&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Feb 28 19:28:39 2021
@@ -329,7 +329,7 @@ under the License.
<!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
<dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.06" usage="ooxml"/>
<dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:4.0.1" usage="ooxml"
- url="https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build//xmlbeans-4.0.1.jar"/>
+ url="https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-4.0.1.jar"/>
<dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.20" usage="ooxml"/>
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org