Author: tilman
Date: Sat Oct 6 15:36:41 2018
New Revision: 1843018
URL: http://svn.apache.org/viewvc?rev=1843018&view=rev
Log:
PDFBOX-4163: add support for jdk11
Modified:
pdfbox/trunk/parent/pom.xml
pdfbox/trunk/preflight/pom.xml
pdfbox/trunk/xmpbox/pom.xml
Modified: pdfbox/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?rev=1843018&r1=1843017&r2=1843018&view=diff
==============================================================================
--- pdfbox/trunk/parent/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Sat Oct 6 15:36:41 2018
@@ -122,18 +122,39 @@
<profile>
<id>jdk9</id>
<!--
- allows automatic activation when jdk9 or higher is used
+ allows automatic activation when jdk9 or jdk10 are used
https://maven.apache.org/guides/introduction/introduction-to-profiles.html
https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
-->
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<properties>
<addmod>--add-modules java.activation --add-modules
java.xml.bind</addmod>
</properties>
</profile>
<profile>
+ <!-- from jdk11 onwards activation and bind are no longer part of
the jdk -->
+ <id>jdk11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ <profile>
<id>pedantic</id>
<build>
<plugins>
Modified: pdfbox/trunk/preflight/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1843018&r1=1843017&r2=1843018&view=diff
==============================================================================
--- pdfbox/trunk/preflight/pom.xml (original)
+++ pdfbox/trunk/preflight/pom.xml Sat Oct 6 15:36:41 2018
@@ -35,6 +35,24 @@
<skip-bavaria>true</skip-bavaria>
</properties>
+ <profiles>
+ <profile>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
Modified: pdfbox/trunk/xmpbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/pom.xml?rev=1843018&r1=1843017&r2=1843018&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/pom.xml (original)
+++ pdfbox/trunk/xmpbox/pom.xml Sat Oct 6 15:36:41 2018
@@ -31,6 +31,19 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
+ <profiles>
+ <profile>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
