Author: msahyoun
Date: Wed Dec 30 14:44:44 2020
New Revision: 1884944
URL: http://svn.apache.org/viewvc?rev=1884944&view=rev
Log:
PDFBOX-5061: remove jaxb dependency; closes #101
Modified:
pdfbox/trunk/examples/pom.xml
pdfbox/trunk/parent/pom.xml
pdfbox/trunk/preflight/pom.xml
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
Modified: pdfbox/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/pom.xml?rev=1884944&r1=1884943&r2=1884944&view=diff
==============================================================================
--- pdfbox/trunk/examples/pom.xml (original)
+++ pdfbox/trunk/examples/pom.xml Wed Dec 30 14:44:44 2020
@@ -42,21 +42,6 @@
<!-- be careful when updating this, because Lucene 8 requires jdk11 -->
</properties>
- <profiles>
- <profile>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
Modified: pdfbox/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?rev=1884944&r1=1884943&r2=1884944&view=diff
==============================================================================
--- pdfbox/trunk/parent/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Wed Dec 30 14:44:44 2020
@@ -141,7 +141,8 @@
<jdk>[9,10]</jdk>
</activation>
<properties>
- <addmod>--add-modules java.xml.bind</addmod>
+ <!-- needs to exist even if empty due to problems with
jacoco-maven-plugin -->
+ <addmod></addmod>
</properties>
</profile>
<!-- need to specify release version so that if PDFBox is built with
@@ -163,8 +164,6 @@
</build>
</profile>
<profile>
- <!-- from jdk11 onwards java.xml.bind is no longer part of the jdk
-->
- <!-- must be set to "test" or "provided" in subprojects -->
<id>jdk11</id>
<activation>
<jdk>[11,)</jdk>
@@ -173,15 +172,6 @@
<!-- needs to exist even if empty due to problems with
jacoco-maven-plugin -->
<addmod></addmod>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</profile>
<profile>
<id>pedantic</id>
Modified: pdfbox/trunk/preflight/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1884944&r1=1884943&r2=1884944&view=diff
==============================================================================
--- pdfbox/trunk/preflight/pom.xml (original)
+++ pdfbox/trunk/preflight/pom.xml Wed Dec 30 14:44:44 2020
@@ -35,21 +35,6 @@
<skip-bavaria>true</skip-bavaria>
</properties>
- <profiles>
- <profile>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java?rev=1884944&r1=1884943&r2=1884944&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
Wed Dec 30 14:44:44 2020
@@ -132,9 +132,6 @@ public class PreflightDocument extends P
*/
public ValidationResult validate() throws ValidationException
{
- // force early class loading to check if people forgot to use
--add-modules javax.xml.bind
- // on java 9 & 10, or to add jaxb-api on java 11 and later
- javax.xml.bind.DatatypeConverter.parseInt("0");
context.setConfig(config);
Collection<String> processes = config.getProcessNames();
for (String name : processes)
