Browse Source

use xmlbeans-3.0.3 rc version

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1855952 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_4_1_0
PJ Fanning 5 years ago
parent
commit
cb9d33d53d
6 changed files with 644 additions and 622 deletions
  1. 1
    1
      .classpath
  2. 4
    1
      build.gradle
  3. 3
    2
      build.xml
  4. 14
    1
      maven/poi-ooxml-schemas.pom
  5. 6
    1
      sonar/pom.xml
  6. 616
    616
      src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java

+ 1
- 1
.classpath View File

@@ -18,7 +18,7 @@
<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/log4j-1.2.17.jar"/>
<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.2.jar" sourcepath="ooxml-lib/xmlbeans-3.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.3.jar" sourcepath="ooxml-lib/xmlbeans-3.0.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="ooxml-lib/curvesapi-1.05.jar"/>

+ 4
- 1
build.gradle View File

@@ -26,6 +26,9 @@ buildscript {
}

repositories {
maven {
url 'https://repository.apache.org/content/repositories/staging'
}
mavenCentral()
}

@@ -226,7 +229,7 @@ project('ooxml') {
compileJava.dependsOn 'ant-compile-ooxml-xsds'

dependencies {
compile 'org.apache.xmlbeans:xmlbeans:3.0.2'
compile 'org.apache.xmlbeans:xmlbeans:3.0.3'
compile 'org.apache.commons:commons-collections4:4.2'
compile 'org.apache.commons:commons-math3:3.6.1'
compile 'org.apache.commons:commons-compress:1.18'

+ 3
- 2
build.xml View File

@@ -241,9 +241,9 @@ under the License.
<property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/>
<property name="ooxml.curvesapi.url"
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.2.jar"/>
<property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.0.3.jar"/>
<property name="ooxml.xmlbeans.url"
value="https://repository.apache.org/content/repositories/releases/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2.jar"/>
value="https://repository.apache.org/content/repositories/staging/org/apache/xmlbeans/xmlbeans/3.0.3/xmlbeans-3.0.3.jar"/>
<property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.18.jar"/>
<property name="ooxml.commons-compress.url"
value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar"/>
@@ -706,6 +706,7 @@ under the License.
<include name="xmlbeans-2.*.jar"/>
<include name="xmlbeans-3.0.0.jar"/>
<include name="xmlbeans-3.0.1.jar"/>
<include name="xmlbeans-3.0.2.jar"/>
</fileset>
<fileset dir="${compile.lib}">
<include name="xercesImpl-*.jar"/>

+ 14
- 1
maven/poi-ooxml-schemas.pom View File

@@ -31,6 +31,19 @@
<url>http://poi.apache.org/</url>
<description>Apache POI - Java API To Access Microsoft Format Files</description>

<repositories>
<repository>
<id>apache-releases-repo</id>
<name>apache releases repo</name>
<url>https://repository.apache.org/content/repositories/releases</url>
</repository>
<repository>
<id>apache-staging-repo</id>
<name>apache staging repo</name>
<url>https://repository.apache.org/content/repositories/staging</url>
</repository>
</repositories>

<mailingLists>
<mailingList>
<name>POI Users List</name>
@@ -62,7 +75,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</dependency>
</dependencies>
</project>

+ 6
- 1
sonar/pom.xml View File

@@ -53,6 +53,11 @@
<name>apache releases repo</name>
<url>https://repository.apache.org/content/repositories/releases</url>
</repository>
<repository>
<id>apache-staging-repo</id>
<name>apache staging repo</name>
<url>https://repository.apache.org/content/repositories/staging</url>
</repository>
</repositories>

<modules>
@@ -72,7 +77,7 @@
<sonar.scm.disabled>true</sonar.scm.disabled>

<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
<xmlbeans.version>3.0.2</xmlbeans.version>
<xmlbeans.version>3.0.3</xmlbeans.version>
<junit.version>4.12</junit.version>
<xmlunit.version>2.5.1</xmlunit.version>
<mockito.version>2.13.0</mockito.version>

+ 616
- 616
src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
File diff suppressed because it is too large
View File


Loading…
Cancel
Save