Repository: jena
Updated Branches:
  refs/heads/master 6a1038e98 -> fef0fae97


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


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ae06ecf4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ae06ecf4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ae06ecf4

Branch: refs/heads/master
Commit: ae06ecf498c3cd7e909b76d81ae72a05709c6941
Parents: df760c5
Author: Rob Vesse <[email protected]>
Authored: Wed Oct 3 18:33:25 2018 +0100
Committer: Rob Vesse <[email protected]>
Committed: Wed Oct 3 18:34:27 2018 +0100

----------------------------------------------------------------------
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 7 +++++++
 pom.xml                                   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/ae06ecf4/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml 
b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index 1280964..cd6ed7f 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>

http://git-wip-us.apache.org/repos/asf/jena/blob/ae06ecf4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b7381ad..5e1c582 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>

Reply via email to