Author: fanningpj
Date: Sat Feb 13 14:49:40 2021
New Revision: 1886491
URL: http://svn.apache.org/viewvc?rev=1886491&view=rev
Log:
batik 1.14
Modified:
poi/trunk/.classpath
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/maven/poi-ooxml.pom
poi/trunk/osgi/README.md
poi/trunk/sonar/ooxml/pom.xml
poi/trunk/src/multimodule/poi/java9/module-info.class
Modified: poi/trunk/.classpath
URL:
http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Sat Feb 13 14:49:40 2021
@@ -43,7 +43,7 @@
<classpathentry kind="lib" path="lib/mockito-core-3.6.0.jar"/>
<classpathentry kind="lib"
path="lib/main-tests/byte-buddy-1.10.18.jar"/>
<classpathentry kind="lib"
path="lib/main-tests/byte-buddy-agent-1.10.18.jar"/>
- <classpathentry kind="lib" path="compile-lib/batik-all-1.12.jar"/>
+ <classpathentry kind="lib" path="compile-lib/batik-all-1.14.jar"/>
<classpathentry kind="lib" path="lib/SparseBitSet-1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sat Feb 13 14:49:40 2021
@@ -110,7 +110,7 @@ subprojects {
version = '5.0.1-SNAPSHOT'
ext {
- bouncyCastleVersion = '1.67'
+ bouncyCastleVersion = '1.68'
commonsCodecVersion = '1.15'
commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1'
@@ -311,7 +311,7 @@ project('ooxml') {
compile 'com.zaxxer:SparseBitSet:1.2'
// compile only, don't add it to our dist as it blows up the size
- compile 'org.apache.xmlgraphics:batik-all:1.13'
+ compile 'org.apache.xmlgraphics:batik-all:1.14'
compile 'xml-apis:xml-apis-ext:1.3.04'
compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4'
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Feb 13 14:49:40 2021
@@ -304,7 +304,7 @@ under the License.
<!-- svg/batik/pdf libs - not part of the distribution -->
<dependency prefix="svg.xml-apis-ext"
artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-provided"/>
<dependency prefix="svg.xmlgraphics-commons"
artifact="org.apache.xmlgraphics:xmlgraphics-commons:2.4"
usage="ooxml-provided"/>
- <dependency prefix="svg.batik-all"
artifact="org.apache.xmlgraphics:batik-all:1.13" usage="ooxml-provided"/>
+ <dependency prefix="svg.batik-all"
artifact="org.apache.xmlgraphics:batik-all:1.14" usage="ooxml-provided"/>
<dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.22"
usage="ooxml-provided"/>
<dependency prefix="pdf.fontbox"
artifact="org.apache.pdfbox:fontbox:2.0.22" usage="ooxml-provided"/>
<dependency prefix="pdf.graphics2d"
artifact="de.rototor.pdfbox:graphics2d:0.30" usage="ooxml-provided"/>
@@ -635,10 +635,9 @@ under the License.
<include name="xmlbeans-3.1.0.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml-provided">
- <include name="bcpkix-jdk15on-1.65.jar"/>
- <include name="bcpkix-jdk15on-1.66.jar"/>
- <include name="bcprov-ext-jdk15on-1.65.jar"/>
- <include name="bcprov-ext-jdk15on-1.66.jar"/>
+ <include name="bc*-1.65.jar"/>
+ <include name="bc*-1.66.jar"/>
+ <include name="batik*-1.13.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/>
Modified: poi/trunk/maven/poi-ooxml.pom
URL:
http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml.pom?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/maven/poi-ooxml.pom (original)
+++ poi/trunk/maven/poi-ooxml.pom Sat Feb 13 14:49:40 2021
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
- <version>1.13</version>
+ <version>1.14</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: poi/trunk/osgi/README.md
URL:
http://svn.apache.org/viewvc/poi/trunk/osgi/README.md?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/osgi/README.md (original)
+++ poi/trunk/osgi/README.md Sat Feb 13 14:49:40 2021
@@ -16,18 +16,18 @@ The bundle embeds all the jars from lib/
## Optional Dependencies
1. Apache Batik
-Required to render WMF/EMF images. The OSGi bundle is provided by ServiceMix
and available in Maven Central:
https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.13_1
+Required to render WMF/EMF images. The OSGi bundle is provided by ServiceMix
and available in Maven Central:
https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.14_1
2. Saxon
Required if using as the XSLT and XQuery Processor engine in XML Beans.
Available in Maven Central:
https://mvnrepository.com/artifact/net.sf.saxon/saxon/8.9.0.4-osgi
3. Apache XML Security for Java, Bouncy Castle and XML Commons Resolver
These are required to sign or validate signed Office documents. The OSGi
bundles are available in Maven Central:
- - Apache XML Security for Java:
https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/2.2.0
+ - Apache XML Security for Java:
https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/2.2.1
- XML Commons Resolver:
https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi
- - Bouncy Castle:
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.66,
https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.66
+ - Bouncy Castle:
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.68,
https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.68
4. PDFBox and PDFBox Graphics2D
Required to render to PDF documents.
The required jars can be downloaded from:
Modified: poi/trunk/sonar/ooxml/pom.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Sat Feb 13 14:49:40 2021
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
- <version>1.13</version>
+ <version>1.14</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: poi/trunk/src/multimodule/poi/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/java9/module-info.class?rev=1886491&r1=1886490&r2=1886491&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
