Repository: any23 Updated Branches: refs/heads/master 53e9cdd69 -> ca17e7700
ANY23-346 reverted to rdf4j 2.2.4 due to regression in 2.3 Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/ca17e770 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/ca17e770 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/ca17e770 Branch: refs/heads/master Commit: ca17e7700b82ac69498268ce17c703aa6371ef3b Parents: 53e9cdd Author: Hans <firedrak...@gmail.com> Authored: Sun Apr 15 18:13:40 2018 -0500 Committer: Hans <firedrak...@gmail.com> Committed: Sun Apr 15 18:13:40 2018 -0500 ---------------------------------------------------------------------- .../any23/extractor/microdata/MicrodataExtractor.java | 10 +++++----- pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/ca17e770/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java index 3663800..2c78445 100644 --- a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java @@ -28,7 +28,6 @@ import org.apache.any23.extractor.html.DomUtils; import org.apache.any23.rdf.RDFUtils; import org.apache.any23.vocab.DCTerms; import org.apache.any23.vocab.XHTML; -import org.eclipse.rdf4j.common.net.ParsedIRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.IRI; @@ -40,6 +39,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import java.io.IOException; +import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.Date; @@ -500,7 +500,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor { private static Optional<IRI> toAbsoluteIRI(String urlString) { if (urlString != null) { try { - ParsedIRI iri = ParsedIRI.create(urlString.trim()); + URI iri = URI.create(urlString.trim()); if (iri.isAbsolute()) { return Optional.of(RDFUtils.iri(iri.toString())); } @@ -512,9 +512,9 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor { } private static IRI toAbsoluteIRI(IRI documentIRI, String part) throws URISyntaxException { - ParsedIRI iri; + URI iri; try { - iri = ParsedIRI.create(part.trim()); + iri = URI.create(part.trim()); } catch (RuntimeException e) { throw new URISyntaxException(String.valueOf(part), e.getClass().getName() + ": " + e.getMessage()); } @@ -523,7 +523,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor { return RDFUtils.iri(iri.toString()); } - return RDFUtils.iri(new ParsedIRI(documentIRI.toString()).resolve(iri).toString()); + return RDFUtils.iri(new URI(documentIRI.toString()).resolve(iri).toString()); } private void notifyError(MicrodataParserException[] errors, ExtractionResult out) { http://git-wip-us.apache.org/repos/asf/any23/blob/ca17e770/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 392a3cd..758a342 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ <httpcore.version>4.4.6</httpcore.version> <owlapi.version>5.1.3</owlapi.version> <poi.version>3.16</poi.version> - <rdf4j.version>2.3.1</rdf4j.version> + <rdf4j.version>2.2.4</rdf4j.version> <semargl.version>0.7</semargl.version> <slf4j.logger.version>1.7.25</slf4j.logger.version> <tika.version>1.17</tika.version>