From 480bf4fb85087dbe66ae0f4072bb5aa57f6f06e6 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Mon, 15 Jun 2020 16:18:02 -0400 Subject: [PATCH 1/3] Update Jena to 3.15.0 Also add explicit dependency on Apache commons-io which should be a transitive dependency, but doesn't work for Jena 3.8+ Tried switching to standard packaging of apache-jena-libs, but that doesn't know how to find the JSONLD parser. --- main/pom.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index 956185887..c539ef413 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -308,22 +308,27 @@ org.apache.jena jena-arq - 3.6.0 + 3.15.0 org.apache.jena jena-base - 3.6.0 + 3.15.0 org.apache.jena jena-cmds - 3.6.0 + 3.15.0 org.apache.jena jena-core - 3.6.0 + 3.15.0 + + + commons-io + commons-io + 2.7 com.metaweb From 559494b75d418bc3361c1e293129d5b25db8c93a Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Mon, 15 Jun 2020 20:00:03 -0400 Subject: [PATCH 2/3] Add TODOs for Jena RDF language names --- main/src/com/google/refine/importers/RdfTripleImporter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main/src/com/google/refine/importers/RdfTripleImporter.java b/main/src/com/google/refine/importers/RdfTripleImporter.java index 822a75d99..e7d984c2d 100644 --- a/main/src/com/google/refine/importers/RdfTripleImporter.java +++ b/main/src/com/google/refine/importers/RdfTripleImporter.java @@ -84,6 +84,8 @@ public class RdfTripleImporter extends ImportingParserBase { try { switch (mode) { case NT: + // TODO: The standard lang name is "N-TRIPLE" + // we may need to switch if we change packagings model.read(input, null, "NT"); break; case N3: @@ -93,6 +95,7 @@ public class RdfTripleImporter extends ImportingParserBase { model.read(input, null, "TTL"); break; case JSONLD: + // TODO: The standard lang name is "JSONLD" model.read(input, null, "JSON-LD"); break; case RDFXML: From a4e9e130ef3304085b41b87e27ab21628aaef0cd Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Tue, 16 Jun 2020 16:58:26 -0400 Subject: [PATCH 3/3] Use property for Jena version --- main/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index c539ef413..8be4e8fe0 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -19,6 +19,7 @@ 3333 /tmp/refine 2.0.7 + 3.15.0 @@ -308,22 +309,22 @@ org.apache.jena jena-arq - 3.15.0 + ${jena.version} org.apache.jena jena-base - 3.15.0 + ${jena.version} org.apache.jena jena-cmds - 3.15.0 + ${jena.version} org.apache.jena jena-core - 3.15.0 + ${jena.version} commons-io