You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2018/10/04 09:16:31 UTC
[1/3] jena git commit: Get Jena JDBC building on JDK 10 (JENA-1609)
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 <rv...@apache.org>
Authored: Wed Oct 3 18:33:25 2018 +0100
Committer: Rob Vesse <rv...@apache.org>
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>
[3/3] jena git commit: Merge branch 'jdk10-build'
Posted by rv...@apache.org.
Merge branch 'jdk10-build'
This closes #476
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fef0fae9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fef0fae9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fef0fae9
Branch: refs/heads/master
Commit: fef0fae9713181b7208516de59bdb887ea8cc700
Parents: 6a1038e 4ee971b
Author: Rob Vesse <rv...@apache.org>
Authored: Thu Oct 4 10:16:14 2018 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Thu Oct 4 10:16:20 2018 +0100
----------------------------------------------------------------------
.../rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java | 6 +-----
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 7 +++++++
pom.xml | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] jena git commit: Remove Javadoc link that JDK 10 dislikes
(JENA-1609)
Posted by rv...@apache.org.
Remove Javadoc link that JDK 10 dislikes (JENA-1609)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4ee971b4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4ee971b4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4ee971b4
Branch: refs/heads/master
Commit: 4ee971b42a018dc8887db274283a1606b2f2b32a
Parents: ae06ecf
Author: Rob Vesse <rv...@apache.org>
Authored: Wed Oct 3 19:02:30 2018 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Wed Oct 3 19:02:30 2018 +0100
----------------------------------------------------------------------
.../rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4ee971b4/jena-elephas/jena-elephas-mapreduce/src/main/java/org/apache/jena/hadoop/rdf/mapreduce/filter/AbstractNodeTupleFilterMapper.java
----------------------------------------------------------------------
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 34769ce..e21fa6a 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 @@ import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable;
/**
* 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 @@ import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable;
* @param <T>
* Writable tuple type
*/
-@SuppressWarnings("javadoc")
public abstract class AbstractNodeTupleFilterMapper<TKey, TValue, T extends AbstractNodeTupleWritable<TValue>> extends
Mapper<TKey, T, TKey, T> {