Repository: commons-rdf Updated Branches: refs/heads/master 58fcfd723 -> 8adf17623
Upgrade to Jena 3.4.0 Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/29824463 Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/29824463 Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/29824463 Branch: refs/heads/master Commit: 29824463f4f7005a939a709089efa990152108ed Parents: 482b831 Author: ajs6f <aj...@apache.org> Authored: Thu Sep 28 10:39:19 2017 -0400 Committer: ajs6f <aj...@apache.org> Committed: Thu Sep 28 11:31:15 2017 -0400 ---------------------------------------------------------------------- .../apache/commons/rdf/jena/experimental/JenaRDFParser.java | 8 ++++---- .../java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java | 2 +- pom.xml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/29824463/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java index 5d61962..2513e82 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/experimental/JenaRDFParser.java @@ -33,7 +33,7 @@ import org.apache.commons.rdf.jena.JenaRDF; import org.apache.commons.rdf.simple.experimental.AbstractRDFParser; import org.apache.jena.graph.Graph; import org.apache.jena.riot.Lang; -import org.apache.jena.riot.RDFDataMgr; +import org.apache.jena.riot.RDFParser; import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.riot.system.StreamRDFLib; @@ -89,13 +89,13 @@ public class JenaRDFParser extends AbstractRDFParser<JenaRDFParser> { final String baseStr = getBase().map(IRI::getIRIString).orElse(null); if (getSourceIri().isPresent()) { - RDFDataMgr.parse(dest, getSourceIri().get().toString(), baseStr, lang, null); + RDFParser.source(getSourceIri().get().toString()).base(baseStr).lang(lang).parse(dest); } else if (getSourceFile().isPresent()) { try (InputStream s = Files.newInputStream(getSourceFile().get())) { - RDFDataMgr.parse(dest, s, baseStr, lang, null); + RDFParser.source(s).base(baseStr).lang(lang).parse(dest); } } else { - RDFDataMgr.parse(dest, getSourceInputStream().get(), baseStr, lang, null); + RDFParser.source(getSourceInputStream().get()).base(baseStr).lang(lang).parse(dest); } } http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/29824463/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java ---------------------------------------------------------------------- diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java index 77de68a..3ae449e 100644 --- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java +++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaIRIImpl.java @@ -28,7 +28,7 @@ class JenaIRIImpl extends AbstractJenaRDFTerm implements JenaIRI { JenaIRIImpl(final Node node) { super(node); if (!node.isURI()) { - throw new IllegalArgumentException("Node is not a blank node: " + node); + throw new IllegalArgumentException("Node is not an IRI node: " + node); } } http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/29824463/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e1fa78d..bd32c70 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ <version>42</version> </parent> - <groupId>org.apache.commons</groupId> <artifactId>commons-rdf-parent</artifactId> <version>0.4.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,7 +63,7 @@ is cross-compatible --> <jsonldjava.version>0.9.0</jsonldjava.version> <rdf4j.version>2.2</rdf4j.version> - <jena.version>3.2.0</jena.version> + <jena.version>3.4.0</jena.version> <!-- NOTE: dexx and xerces versions should match the versions marked as <optional> in jena-osgi pom --> @@ -75,7 +74,7 @@ <!-- Test dependencies --> <slf4j.version>1.7.20</slf4j.version> <junit.version>4.12</junit.version> - + <skipAPICompatCheck>false</skipAPICompatCheck> </properties> <scm> @@ -461,8 +460,9 @@ <oldVersionPattern>\d+\.\d+\.\d+\-incubating</oldVersionPattern> <!-- japicmp requires "mvn package site" - below means "mvn site" still works (but without japicmp report) --> - <ignoreMissingNewVersion>true</ignoreMissingNewVersion> + <ignoreMissingNewVersion>true</ignoreMissingNewVersion> </parameter> + <skip>${skipAPICompatCheck}</skip> </configuration> </plugin>
