Skip to content

PDFBOX-5061 Replace javax.xml.bind by jakarta.xml.bind #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

PDFBOX-5061 Replace javax.xml.bind by jakarta.xml.bind #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -88,7 +73,12 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${lucene.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${bind-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
Expand Down
12 changes: 1 addition & 11 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<bouncycastle.version>1.68</bouncycastle.version>
<bind-api.version>3.0.0</bind-api.version>

<!-- This is a default value to avoid problems when running single tests
see also https://stackoverflow.com/a/28695766/535646
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
20 changes: 5 additions & 15 deletions preflight/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -189,6 +174,11 @@
<artifactId>bcprov-jdk15on</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${bind-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ public void setContext(PreflightContext context)
*/
public ValidationResult validate() throws ValidationException
{
// force early class loading to check if people forgot to use --add-modules javax.xml.bind
// force early class loading to check if people forgot to use --add-modules jakarta.xml.bind
// on java 9 & 10, or to add jaxb-api on java 11 and later
javax.xml.bind.DatatypeConverter.parseInt("0");
jakarta.xml.bind.DatatypeConverter.parseInt("0");
context.setConfig(config);
Collection<String> processes = config.getProcessNames();
for (String name : processes)
Expand Down
36 changes: 13 additions & 23 deletions xmpbox/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,20 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>

<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.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${bind-api.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
10 changes: 5 additions & 5 deletions xmpbox/src/main/java/org/apache/xmpbox/DateConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ private static Calendar fromISO8601(String dateString)
{
toParse = dateString.substring(0, tzIndex) + ":00";
}
Calendar cal = javax.xml.bind.DatatypeConverter.parseDateTime(toParse);
Calendar cal = jakarta.xml.bind.DatatypeConverter.parseDateTime(toParse);

TimeZone z = TimeZone.getTimeZone(timeZoneString);
cal.setTimeZone(z);
Expand All @@ -385,21 +385,21 @@ private static Calendar fromISO8601(String dateString)
int teeIndex = dateString.indexOf('T');
if (teeIndex == -1)
{
return javax.xml.bind.DatatypeConverter.parseDateTime(dateString);
return jakarta.xml.bind.DatatypeConverter.parseDateTime(dateString);
}
int plusIndex = dateString.indexOf('+', teeIndex + 1);
int minusIndex = dateString.indexOf('-', teeIndex + 1);
if (plusIndex == -1 && minusIndex == -1)
{
return javax.xml.bind.DatatypeConverter.parseDateTime(dateString);
return jakarta.xml.bind.DatatypeConverter.parseDateTime(dateString);
}
plusIndex = Math.max(plusIndex, minusIndex);
if (plusIndex - teeIndex == 6)
{
String toParse = dateString.substring(0, plusIndex) + ":00" + dateString.substring(plusIndex);
return javax.xml.bind.DatatypeConverter.parseDateTime(toParse);
return jakarta.xml.bind.DatatypeConverter.parseDateTime(toParse);
}
return javax.xml.bind.DatatypeConverter.parseDateTime(dateString);
return jakarta.xml.bind.DatatypeConverter.parseDateTime(dateString);
}
}
}
16 changes: 8 additions & 8 deletions xmpbox/src/test/java/org/apache/xmpbox/DateConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,41 +60,41 @@ void testDateConversion() throws Exception
DateConverter.toCalendar("2011-11-20T10:09Z"));

// Test some time zone offsets
jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192Z");
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192Z");
convDate = DateConverter.toCalendar("2015-02-02T16:37:19.192Z");
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+00:00");
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+00:00");
convDate = DateConverter.toCalendar("2015-02-02T16:37:19.192Z");
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+02:00");
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+02:00");
convDate = DateConverter.toCalendar("2015-02-02T16:37:19.192+02:00");
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192Z");
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192Z");
convDate = DateConverter.toCalendar("2015-02-02T08:37:19.192PST");
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+01:00");
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime("2015-02-02T16:37:19.192+01:00");
convDate = DateConverter.toCalendar("2015-02-02T16:37:19.192Europe/Berlin");
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

// PDFBOX-4902: half-hour TZ
String time = "2015-02-02T16:37:19.192+05:30";
jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime(time);
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime(time);
assertEquals(time, DateConverter.toISO8601(jaxbCal, true));
convDate = DateConverter.toCalendar(time);
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

time = "2015-02-02T16:37:19.192-05:30";
jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime(time);
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime(time);
assertEquals(time, DateConverter.toISO8601(jaxbCal, true));
convDate = DateConverter.toCalendar(time);
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));

time = "2015-02-02T16:37:19.192+10:30";
jaxbCal = javax.xml.bind.DatatypeConverter.parseDateTime(time);
jaxbCal = jakarta.xml.bind.DatatypeConverter.parseDateTime(time);
assertEquals(time, DateConverter.toISO8601(jaxbCal, true));
convDate = DateConverter.toCalendar(time);
assertEquals(dateFormat.format(jaxbCal.getTime()), dateFormat.format(convDate.getTime()));
Expand Down