[directory-fortress-core] branch master updated: FC-230 - Support Java 11+

[sm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 0cd8424  FC-230 - Support Java 11+
0cd8424 is described below

commit 0cd842485790a2d8eaf316da0eb46f025f8a0832
Author: Shawn McKinney <sm...@apache.org>
AuthorDate: Sun Jul 14 11:09:18 2019 -0600

    FC-230 - Support Java 11+
---
 pom.xml | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2101b56..6c1ba45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,8 @@
   <!-- The used properties for this project                   -->
   <!-- ====================================================== -->
   <properties>
+
+    <java.version>1.8</java.version>
     <additionalparam>-Xdoclint:none</additionalparam>
     <!-- Jars -->
     <version.accelerator.api>1.0-RC41</version.accelerator.api>
@@ -114,6 +116,7 @@
     <version.javaee.api>8.0</version.javaee.api>
     <version.javax.ws.rs-api>2.1</version.javax.ws.rs-api>
     <version.jaxb>2.3.0.1</version.jaxb>
+    <version.jaxb.api>2.3.0</version.jaxb.api>
     <version.jgrapht-core>1.0.0</version.jgrapht-core>
     <version.jmeter.core>2.11</version.jmeter.core>
     <version.jmeter.java>2.11</version.jmeter.java>
@@ -479,6 +482,15 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- Add for Java 9++ -->
+<!--
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+-->
+
   </dependencies>
 
   <build>
@@ -543,9 +555,10 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
           <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
             <optimize>true</optimize>
             <encoding>ISO-8859-1</encoding>
           </configuration>
@@ -756,6 +769,22 @@
 
   <profiles>
 
+    <!-- If JDK11++ pull in the JAXB API dependency. -->
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>11</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${version.jaxb.api}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+
     <!-- This profile starts the Fortress Console App -->
     <!-- To execute: mvn -Pconsole test -->
     <profile>