From ae06ecf498c3cd7e909b76d81ae72a05709c6941 Mon Sep 17 00:00:00 2001
From: Rob Vesse <rvesse@apache.org>
Date: Wed, 3 Oct 2018 18:33:25 +0100
Subject: [PATCH 1/2] Get Jena JDBC building on JDK 10 (JENA-1609)

Pass needed log4j dependency directly to Javadoc plugin when bundling
the Jena JDBC javadocs.

Also upgrade Javadoc plugin to 3.0.1 to avoid bugs
---
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 7 +++++++
 pom.xml                                   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index 1280964db78..cd6ed7fe6f6 100644
--- a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
@@ -137,6 +137,13 @@
 					<charset>UTF-8</charset>
 					<docencoding>UTF-8</docencoding>
 
+					<additionalDependencies>
+						<additionalDependency>
+							<groupId>log4j</groupId>
+							<artifactId>log4j</artifactId>
+							<version>${ver.log4j}</version>
+						</additionalDependency>
+					</additionalDependencies>
 					<!-- Include only JDBC dependencies -->
 					<includeDependencySources>true</includeDependencySources>
 					<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
diff --git a/pom.xml b/pom.xml
index b7381adfec3..5e1c5824c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -787,7 +787,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.1</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>

From 4ee971b42a018dc8887db274283a1606b2f2b32a Mon Sep 17 00:00:00 2001
From: Rob Vesse <rvesse@apache.org>
Date: Wed, 3 Oct 2018 19:02:30 +0100
Subject: [PATCH 2/2] Remove Javadoc link that JDK 10 dislikes (JENA-1609)

---
 .../rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/jena-elephas/jena-elephas-mapreduce/src/main/java/org/apache/jena/hadoop/rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java b/jena-elephas/jena-elephas-mapreduce/src/main/java/org/apache/jena/hadoop/rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java
index 34769ceaa7d..e21fa6a4ae4 100644
--- a/jena-elephas/jena-elephas-mapreduce/src/main/java/org/apache/jena/hadoop/rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java
+++ b/jena-elephas/jena-elephas-mapreduce/src/main/java/org/apache/jena/hadoop/rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java
@@ -27,10 +27,7 @@
 
 /**
  * Abstract mapper implementation which helps in filtering tuples from the
- * input, derived implementations provide an implementation of the
- * {@link #accepts(TKey, T)}
- * 
- * 
+ * input
  * 
  * @param <TKey>
  *            Key type
@@ -39,7 +36,6 @@
  * @param <T>
  *            Writable tuple type
  */
-@SuppressWarnings("javadoc")
 public abstract class AbstractNodeTupleFilterMapper<TKey, TValue, T extends AbstractNodeTupleWritable<TValue>> extends
         Mapper<TKey, T, TKey, T> {