Upgrade of slf4j-log4j12 dependency (to 1.7.36)

chenejac · Nov 1, 2023 · 053fa42 · 053fa42
1 parent c23d85b
commit 053fa42
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
@@ -31,6 +31,13 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import org.apache.jena.query.QuerySolutionMap;
+import org.apache.jena.query.ReadWrite;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.riot.RDFDataMgr;
+
 import org.apache.jena.graph.Triple;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.Query;
@@ -51,7 +58,22 @@
 import org.apache.jena.sdb.SDB;
 import org.apache.jena.shared.Lock;
 import org.apache.jena.sparql.core.Quad;
-import org.apache.log4j.lf5.util.StreamUtils;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceImpl;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
+import edu.cornell.mannlib.vitro.webapp.utils.sparql.ResultSetIterators.ResultSetQuadsIterator;
+import edu.cornell.mannlib.vitro.webapp.utils.sparql.ResultSetIterators.ResultSetTriplesIterator;
+import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 
 public abstract class RDFServiceJena extends RDFServiceImpl implements RDFService {
 
@@ -61,7 +83,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
 
     protected volatile boolean rebuildGraphURICache = true;
     protected volatile boolean isRebuildGraphURICacheRunning = false;
-    protected final List<String> graphURIs = new CopyOnWriteArrayList<String>(); 
+    protected final List<String> graphURIs = new CopyOnWriteArrayList<String>();
 
     @Override
 	public abstract boolean changeSetUpdate(ChangeSet changeSet) throws RDFServiceException;
@@ -133,8 +155,7 @@ private void dumpOperation(Model model, ModelChange modelChange) {
 		byte[] changeBytes = new byte[0];
 		try {
 			modelChange.getSerializedModel().mark(Integer.MAX_VALUE);
-			changeBytes = StreamUtils
-					.getBytes(modelChange.getSerializedModel());
+			changeBytes = IOUtils.toByteArray(modelChange.getSerializedModel());
 			modelChange.getSerializedModel().reset();
 		} catch (IOException e) {
 			// leave it empty.

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -212,7 +212,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.26</version>
+            <version>1.7.36</version>
         </dependency>
         <dependency>
             <groupId>org.directwebremoting</groupId>