Update Jena to 3.1.1, JFact to 4.0.4 and httpcomponents to 4.4

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Supplier;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -524,6 +525,16 @@ public class RDFServiceGraph implements GraphWithPerform {
             return null;
         }
 
+        @Override
+        public void execute(Runnable runnable) {
+
+        }
+
+        @Override
+        public <T> T calculate(Supplier<T> supplier) {
+            return null;
+        }
+
         @Override
         public boolean transactionsSupported() {
             return true;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java

@@ -10,6 +10,7 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.graph.Graph;
@@ -1078,4 +1079,33 @@ public abstract class AbstractModelDecorator implements Model {
 		return inner.isClosed();
 	}
 
+	@Override
+	public Statement getRequiredProperty(Resource resource, Property property, String s) {
+		return inner.getRequiredProperty(resource, property, s);
+	}
+
+	@Override
+	public Statement getProperty(Resource resource, Property property, String s) {
+		return inner.getProperty(resource, property, s);
+	}
+
+	@Override
+	public void executeInTxn(Runnable runnable) {
+		inner.executeInTxn(runnable);
+	}
+
+	@Override
+	public <T> T calculateInTxn(Supplier<T> supplier) {
+		return inner.calculateInTxn(supplier);
+	}
+
+	@Override
+	public PrefixMapping clearNsPrefixMap() {
+		return inner.clearNsPrefixMap();
+	}
+
+	@Override
+	public int numPrefixes() {
+		return inner.numPrefixes();
+	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java

@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.graph.Graph;
@@ -1775,4 +1776,34 @@ public abstract class AbstractOntModelDecorator implements OntModel {
 	public Model writeAll(OutputStream out, String lang, String base) {
 		return inner.writeAll(out, lang, base);
 	}
+
+	@Override
+	public Statement getRequiredProperty(Resource resource, Property property, String s) {
+		return inner.getRequiredProperty(resource, property, s);
+	}
+
+	@Override
+	public Statement getProperty(Resource resource, Property property, String s) {
+		return inner.getProperty(resource, property, s);
+	}
+
+	@Override
+	public void executeInTxn(Runnable runnable) {
+		inner.executeInTxn(runnable);
+	}
+
+	@Override
+	public <T> T calculateInTxn(Supplier<T> supplier) {
+		return inner.calculateInTxn(supplier);
+	}
+
+	@Override
+	public PrefixMapping clearNsPrefixMap() {
+		return inner.clearNsPrefixMap();
+	}
+
+	@Override
+	public int numPrefixes() {
+		return inner.numPrefixes();
+	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java

@@ -127,12 +127,7 @@ public class RDFServiceVirtuoso extends RDFServiceSparql {
 	private HttpPost createHttpRequest(String updateString) {
 		HttpPost meth = new HttpPost(updateEndpointURI);
 		meth.addHeader("Content-Type", "application/sparql-query");
-		try {
+		meth.setEntity(new StringEntity(updateString, "UTF-8"));
-			meth.setEntity(new StringEntity(updateString, "UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			// UTF-8 is unsupported?
-			throw new RuntimeException(e);
-		}
 		return meth;
 	}
 

dependencies/pom.xml

@@ -150,48 +150,49 @@
         <dependency>
             <groupId>net.sourceforge.owlapi</groupId>
             <artifactId>jfact</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.4</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.owlapi</groupId>
             <artifactId>owlapi-distribution</artifactId>
-            <version>4.0.1</version>
+            <version>4.2.7</version>
-            <exclusions>
+            <!-- See semargl-rdfa, guidce -->
+            <!-- exclusions>
                 <exclusion>
                     <groupId>*</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
-            </exclusions>
+            </exclusions -->
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.2.4</version>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
-            <version>4.2.5</version>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-arq</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-core</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-sdb</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>