Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

batik 1.14 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1886491 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-02-13 14:49:40 +00:00
parent 25dc09b041
commit 79a9cf3692
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -43,7 +43,7 @@
<classpathentry kind="lib" path="lib/mockito-core-3.6.0.jar"/> <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-1.10.18.jar"/>
<classpathentry kind="lib" path="lib/main-tests/byte-buddy-agent-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="lib" path="lib/SparseBitSet-1.2.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

4
build.gradle
View File

@ -110,7 +110,7 @@ subprojects {
version = '5.0.1-SNAPSHOT' version = '5.0.1-SNAPSHOT'
ext { ext {
bouncyCastleVersion = '1.67' bouncyCastleVersion = '1.68'
commonsCodecVersion = '1.15' commonsCodecVersion = '1.15'
commonsCompressVersion = '1.20' commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1' commonsMathVersion = '3.6.1'
@ -311,7 +311,7 @@ project('ooxml') {
compile 'com.zaxxer:SparseBitSet:1.2' compile 'com.zaxxer:SparseBitSet:1.2'
// compile only, don't add it to our dist as it blows up the size // 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 'xml-apis:xml-apis-ext:1.3.04'
compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4' compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4'

9
build.xml
View File

@ -304,7 +304,7 @@ under the License.
<!-- svg/batik/pdf libs - not part of the distribution --> <!-- 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.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.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.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.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"/> <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"/> <include name="xmlbeans-3.1.0.jar"/>
</fileset> </fileset>
<fileset dir="${basedir}/lib/ooxml-provided"> <fileset dir="${basedir}/lib/ooxml-provided">
<include name="bcpkix-jdk15on-1.65.jar"/> <include name="bc*-1.65.jar"/>
<include name="bcpkix-jdk15on-1.66.jar"/> <include name="bc*-1.66.jar"/>
<include name="bcprov-ext-jdk15on-1.65.jar"/> <include name="batik*-1.13.jar"/>
<include name="bcprov-ext-jdk15on-1.66.jar"/>
</fileset> </fileset>
<fileset dir="${basedir}/lib/ooxml-tests"> <fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/> <include name="guava-20.0.jar"/>

2
maven/poi-ooxml.pom
View File

@ -94,7 +94,7 @@
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId> <artifactId>batik-all</artifactId>
<version>1.13</version> <version>1.14</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>

6
osgi/README.md
View File

@ -16,18 +16,18 @@ The bundle embeds all the jars from lib/main:
## Optional Dependencies ## Optional Dependencies
1. Apache Batik 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 2. Saxon
Required if using as the XSLT and XQuery Processor engine in XML Beans. 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 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 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: 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 - 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 4. PDFBox and PDFBox Graphics2D
Required to render to PDF documents. Required to render to PDF documents.
The required jars can be downloaded from: The required jars can be downloaded from:

2
sonar/ooxml/pom.xml
View File

@ -151,7 +151,7 @@
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId> <artifactId>batik-all</artifactId>
<version>1.13</version> <version>1.14</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>

BIN
src/multimodule/poi/java9/module-info.class
View File

Binary file not shown.