moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

uptake xmlbeans 3.0.1 (staging version, pre-release)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1838366 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-08-19 09:08:00 +00:00
parent 2ef660bf97
commit 37a3a769fe
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -18,7 +18,7 @@
<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/> <classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/> <classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.0.jar" sourcepath="ooxml-lib/xmlbeans-3.0.0.jar"/> <classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.1.jar" sourcepath="ooxml-lib/xmlbeans-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/> <classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.05.jar"/> <classpathentry kind="lib" path="ooxml-lib/curvesapi-1.05.jar"/>

4
build.gradle
View File

@ -26,10 +26,10 @@ buildscript {
} }
repositories { repositories {
maven { url "https://repository.apache.org/content/repositories/staging" }
mavenCentral() mavenCentral()
} }
// Only add the plugin for Sonar if enabled // Only add the plugin for Sonar if enabled
if (project.hasProperty('enableSonar')) { if (project.hasProperty('enableSonar')) {
println 'Enabling Sonar support' println 'Enabling Sonar support'
@ -216,7 +216,7 @@ project('ooxml') {
compileJava.dependsOn 'ant-compile-ooxml-xsds' compileJava.dependsOn 'ant-compile-ooxml-xsds'
dependencies { dependencies {
compile 'org.apache.xmlbeans:xmlbeans:3.0.0' compile 'org.apache.xmlbeans:xmlbeans:3.0.1'
compile 'org.apache.commons:commons-collections4:4.2' compile 'org.apache.commons:commons-collections4:4.2'
compile 'org.apache.commons:commons-math3:3.6.1' compile 'org.apache.commons:commons-math3:3.6.1'
compile 'org.apache.commons:commons-compress:1.18' compile 'org.apache.commons:commons-compress:1.18'

9
build.xml
View File

@ -200,9 +200,9 @@ under the License.
<property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/> <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/>
<property name="ooxml.curvesapi.url" <property name="ooxml.curvesapi.url"
value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar"/> value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar"/>
<property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.0.0.jar"/> <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.0.1.jar"/>
<property name="ooxml.xmlbeans.url" <property name="ooxml.xmlbeans.url"
value="https://repository.apache.org/content/repositories/releases/org/apache/xmlbeans/xmlbeans/3.0.0/xmlbeans-3.0.0.jar"/> value="https://repository.apache.org/content/repositories/staging/org/apache/xmlbeans/xmlbeans/3.0.1/xmlbeans-3.0.1.jar"/>
<property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.18.jar"/> <property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.18.jar"/>
<property name="ooxml.commons-compress.url" <property name="ooxml.commons-compress.url"
value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar"/> value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar"/>
@ -637,7 +637,8 @@ under the License.
<include name="ooxml-security-1.0.jar"/> <include name="ooxml-security-1.0.jar"/>
<include name="curvesapi-1.03.jar"/> <include name="curvesapi-1.03.jar"/>
<include name="curvesapi-1.04.jar"/> <include name="curvesapi-1.04.jar"/>
<include name="xmlbeans-2.*.jar*"/> <include name="xmlbeans-2.*.jar"/>
<include name="xmlbeans-3.0.0.jar"/>
</fileset> </fileset>
<fileset dir="${compile.lib}"> <fileset dir="${compile.lib}">
<include name="xercesImpl-*.jar"/> <include name="xercesImpl-*.jar"/>
@ -2025,7 +2026,7 @@ under the License.
<globmapper from="*" to="${zipdir}/lib/*"/> <globmapper from="*" to="${zipdir}/lib/*"/>
</mappedresources> </mappedresources>
<mappedresources cache="true"> <mappedresources cache="true">
<fileset dir="${ooxml.lib}" includes="xmlbeans-3.0.0.jar,curvesapi-*.jar"/> <fileset dir="${ooxml.lib}" includes="xmlbeans-3.0.1.jar,curvesapi-*.jar"/>
<regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/> <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/>
</mappedresources> </mappedresources>
<mappedresources cache="true"> <mappedresources cache="true">

2
maven/poi-ooxml-schemas.pom
View File

@ -62,7 +62,7 @@
<dependency> <dependency>
<groupId>org.apache.xmlbeans</groupId> <groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId> <artifactId>xmlbeans</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sonar/pom.xml
View File

@ -72,7 +72,7 @@
<sonar.scm.disabled>true</sonar.scm.disabled> <sonar.scm.disabled>true</sonar.scm.disabled>
<!-- define some of the third-party or plugin-versions globally to use the same in all modules --> <!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
<xmlbeans.version>3.0.0</xmlbeans.version> <xmlbeans.version>3.0.1</xmlbeans.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<xmlunit.version>2.5.1</xmlunit.version> <xmlunit.version>2.5.1</xmlunit.version>
<mockito.version>2.13.0</mockito.version> <mockito.version>2.13.0</mockito.version>

1
src/ooxml/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
View File

@ -40,6 +40,7 @@ public class POIXMLTypeLoader {
DEFAULT_XML_OPTIONS.setUseDefaultNamespace(); DEFAULT_XML_OPTIONS.setUseDefaultNamespace();
DEFAULT_XML_OPTIONS.setSaveAggressiveNamespaces(); DEFAULT_XML_OPTIONS.setSaveAggressiveNamespaces();
DEFAULT_XML_OPTIONS.setCharacterEncoding("UTF-8"); DEFAULT_XML_OPTIONS.setCharacterEncoding("UTF-8");
DEFAULT_XML_OPTIONS.setEntityExpansionLimit(1);
// Piccolo is disabled for POI builts, i.e. JAXP is used for parsing // Piccolo is disabled for POI builts, i.e. JAXP is used for parsing
// so only user code using XmlObject/XmlToken.Factory.parse // so only user code using XmlObject/XmlToken.Factory.parse
// directly can bypass the entity check, which is probably unlikely (... and not within our responsibility :)) // directly can bypass the entity check, which is probably unlikely (... and not within our responsibility :))