aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2021-03-14 19:47:22 +0000
committerPJ Fanning <fanningpj@apache.org>2021-03-14 19:47:22 +0000
commitaaf0e2f7f93fa00255d50049b79035cfa36c510a (patch)
tree777ea4565a9d970c26c6dd821874a42bf435adf3
parentdeb410b568f56fd292f94b85b7ef28d54bae7f2d (diff)
downloadpoi-aaf0e2f7f93fa00255d50049b79035cfa36c510a.tar.gz
poi-aaf0e2f7f93fa00255d50049b79035cfa36c510a.zip
xmlbeans 5.0.0 release
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887648 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--.classpath8
-rw-r--r--build.gradle3
-rw-r--r--build.xml3
-rw-r--r--maven/poi-ooxml-full.pom2
-rw-r--r--maven/poi-ooxml-lite.pom2
-rw-r--r--sonar/pom.xml2
-rw-r--r--src/multimodule/ooxml-lite/java9/module-info.classbin1663 -> 1663 bytes
7 files changed, 9 insertions, 11 deletions
diff --git a/.classpath b/.classpath
index 916216ba2b..ec5f3187ab 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,7 @@
<classpathentry kind="src" path="src/integrationtest"/>
<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-4.0.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-5.0.0.jar" sourcepath="lib/ooxml/xmlbeans-5.0.0-sources.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
<classpathentry kind="lib" path="lib/ooxml/curvesapi-1.06.jar"/>
@@ -26,13 +26,13 @@
<classpathentry kind="lib" path="lib/main-tests/jmh-generator-annprocess-1.26.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="lib" path="compile-lib/log4j-api-2.14.0.jar"/>
- <classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.67.jar"/>
- <classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.67.jar"/>
+ <classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.68.jar"/>
+ <classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.68.jar"/>
<classpathentry kind="lib" path="lib/ooxml-tests/reflections-0.9.12.jar"/>
<classpathentry kind="lib" path="lib/ooxml-tests/guava-30.0-jre.jar"/>
<classpathentry kind="lib" path="lib/ooxml-tests/javassist-3.27.0-GA.jar"/>
<classpathentry kind="lib" path="lib/ooxml-tests/log4j-1.2.17.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ooxml-provided/xmlsec-2.2.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ooxml-provided/xmlsec-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
diff --git a/build.gradle b/build.gradle
index 845d107044..6363e71ff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -298,8 +298,7 @@ project('ooxml') {
compileJava.dependsOn 'downloadJarsToLibs'
dependencies {
- //compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
- compile files("../../lib/ooxml/xmlbeans-${xmlbeansVersion}.jar")
+ compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
compile 'org.apache.commons:commons-collections4:4.4'
compile "org.apache.commons:commons-math3:${commonsMathVersion}"
compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
diff --git a/build.xml b/build.xml
index 7e6ddf7af9..c9f9d53b30 100644
--- a/build.xml
+++ b/build.xml
@@ -327,8 +327,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:5.0.0" usage="ooxml"
- url="https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar"/>
+ <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.0.0" usage="ooxml"/>
<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-->
diff --git a/maven/poi-ooxml-full.pom b/maven/poi-ooxml-full.pom
index 76d38e799e..3696f23e7b 100644
--- a/maven/poi-ooxml-full.pom
+++ b/maven/poi-ooxml-full.pom
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>4.0.0</version>
+ <version>5.0.0</version>
</dependency>
</dependencies>
</project>
diff --git a/maven/poi-ooxml-lite.pom b/maven/poi-ooxml-lite.pom
index 5b0ffdc071..9ad3a4b9a2 100644
--- a/maven/poi-ooxml-lite.pom
+++ b/maven/poi-ooxml-lite.pom
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>4.0.0</version>
+ <version>5.0.0</version>
</dependency>
</dependencies>
</project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 8dfbf0df4b..898997314a 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -79,7 +79,7 @@
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
- <xmlbeans.version>4.0.0</xmlbeans.version>
+ <xmlbeans.version>5.0.0</xmlbeans.version>
<junit.version>5.7.0</junit.version>
<xmlunit.version>2.8.2</xmlunit.version>
<mockito.version>3.6.28</mockito.version>
diff --git a/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class
index 5a1a8d9258..2a720c718d 100644
--- a/src/multimodule/ooxml-lite/java9/module-info.class
+++ b/src/multimodule/ooxml-lite/java9/module-info.class
Binary files differ