From 6c4cba722a0a2dd1fccb96e4346cbc455668cf3b Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Fri, 2 Feb 2018 17:10:52 +0000
Subject: [PATCH 1/4] Set plugin versions compatible with building using Java9

---
 pom.xml | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index fbff9928044..aec41291b71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,6 @@
     <version>18</version>
   </parent>
 
-  <prerequisites>
-    <maven>3.3.5</maven>
-  </prerequisites>
-
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
@@ -595,6 +591,9 @@
                   <message>No SNAPSHOT dependencies are allowed!</message>
                   <onlyWhenRelease>true</onlyWhenRelease>
                 </requireReleaseDeps>
+                <requireMavenVersion>
+                  <version>3.5.0</version>
+                </requireMavenVersion>
               </rules>
               <fail>true</fail>
               <failFast>true</failFast>
@@ -720,9 +719,65 @@
     <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
     <pluginManagement>
       <plugins>
+        <!-- For Java 9 : ahead of versions ia apache:apache v19 -->
+        <!--
+            maven-compiler-plugin  3.7.0
+            maven-enforcer-plugin  3.0.0-M1
+            maven-javadoc-plugin   3.0.0-M1 -> 3.0.0
+            maven-surefire-plugin  2.21.0 (2.20.1)
+            maven-war-plugin       3.1.0  (3.2.0)
+        -->
+
+        <!--
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.7.0</version>
+        </plugin>
+        -->
+        <!--
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.0.0-M1</version>
+        </plugin>
+        -->
+        <!--
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        -->
+        <!--
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.20.1</version>
+        </plugin>
+        -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        
+        <!-- Other updates -->
+        <plugin>
+          <!-- Needed -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+
+
+        <!-- Jena configuration -->
+
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.7.0</version>
           <configuration>
             <encoding>UTF-8</encoding>
             <debug>true</debug>
@@ -736,6 +791,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.20.1</version>
         </plugin>
 
         <plugin>
@@ -761,6 +817,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>
@@ -829,6 +886,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.0.0-M1</version>
           <executions>
             <execution>
               <id>enforce</id>
@@ -863,7 +921,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
         </plugin>
 
         <!--

From 42304cb55e5bb812ef50b6835c5b50e697b2c533 Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Fri, 2 Feb 2018 17:58:01 +0000
Subject: [PATCH 2/4] Comment out elephas - system provided tools.jar has gone
 in Java9

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index aec41291b71..a67d0b6c6e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,7 +261,9 @@
 
         <!-- Slow building modules -->
         <module>jena-jdbc</module>
+        <!-- Fails for Java9 build.
         <module>jena-elephas</module>
+        -->
         <module>apache-jena-osgi</module>
       </modules>
     </profile>

From c4e93202037208ca311d359a83b213d46d2732d7 Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Sat, 3 Feb 2018 16:26:29 +0000
Subject: [PATCH 3/4] JENA-1475: Setup for java8 build with plugins suitable
 for java9.

---
 pom.xml | 71 ++++++++++++---------------------------------------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index a67d0b6c6e4..2e283aa0b61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <ver.awaitility>1.7.0</ver.awaitility>
 
     <jdk.version>1.8</jdk.version>
-    <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
+    <targetJdk>${jdk.version}</targetJdk>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
@@ -146,12 +146,11 @@
       <!--
           This is the dev profile, typically used locally with 
           "mvn clean install -Pdev".
-          It only builds the modules shipped in apache-jena binaries.
+          It builds the modules shipped in apache-jena binaries
+          but does not build these binaries.
+          This profile does not build javadoc.
       -->
       <id>dev</id>
-      <!-- The maven artifacts of the core development modules 
-           See profile bootstrap for a first build from empty.
-      -->
       <modules>
         <module>jena-shaded-guava</module>
         <module>jena-iri</module>
@@ -261,9 +260,10 @@
 
         <!-- Slow building modules -->
         <module>jena-jdbc</module>
-        <!-- Fails for Java9 build.
-        <module>jena-elephas</module>
+        <!--  Fails when building with Java9 JDK because it requires 
+             system jar jdk.tools which is not available in Java9.
         -->
+        <module>jena-elephas</module>
         <module>apache-jena-osgi</module>
       </modules>
     </profile>
@@ -598,7 +598,7 @@
                 </requireMavenVersion>
               </rules>
               <fail>true</fail>
-              <failFast>true</failFast>
+              <failFast>false</failFast>
             </configuration>
           </execution>
         </executions>
@@ -721,61 +721,13 @@
     <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
     <pluginManagement>
       <plugins>
-        <!-- For Java 9 : ahead of versions ia apache:apache v19 -->
-        <!--
-            maven-compiler-plugin  3.7.0
-            maven-enforcer-plugin  3.0.0-M1
-            maven-javadoc-plugin   3.0.0-M1 -> 3.0.0
-            maven-surefire-plugin  2.21.0 (2.20.1)
-            maven-war-plugin       3.1.0  (3.2.0)
-        -->
 
-        <!--
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
-        </plugin>
-        -->
-        <!--
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M1</version>
-        </plugin>
-        -->
-        <!--
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-        -->
-        <!--
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20.1</version>
-        </plugin>
-        -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-        
-        <!-- Other updates -->
-        <plugin>
-          <!-- Needed -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
 
-
-        <!-- Jena configuration -->
-
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -920,12 +872,19 @@
           <version>2.5.3</version>
           <extensions>true</extensions>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+
         <!--
             Avoid the warnings and errors from m2e.
             This plugin's configuration is used to store Eclipse m2e settings only. 

From 1271890a00b99907fad13104167795273f5f6b4d Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Wed, 7 Feb 2018 22:25:03 +0000
Subject: [PATCH 4/4] JENA-1475: Elephas setting for specific surefire version

---
 jena-elephas/jena-elephas-io/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jena-elephas/jena-elephas-io/pom.xml b/jena-elephas/jena-elephas-io/pom.xml
index eb74a01460c..d7edd055e07 100644
--- a/jena-elephas/jena-elephas-io/pom.xml
+++ b/jena-elephas/jena-elephas-io/pom.xml
@@ -90,6 +90,8 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+	      <!-- versions 2.20 and 2.20.1 result in test failures -->
+	      <version>2.19.1</version>
         <configuration>
           <parallel>classes</parallel>
           <threadCount>2</threadCount>
@@ -97,4 +99,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>