From b21c026598bcb49381cdfeeee43c07924a133b90 Mon Sep 17 00:00:00 2001 From: Dragan Ivanovic Date: Wed, 1 Nov 2023 11:06:03 +0100 Subject: [PATCH] Upgrade of slf4j-log4j12 dependency (#422) * Upgrade of slf4j-log4j12 dependency (to 1.7.36) * Optimization of imports --- .../vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java | 6 ++---- dependencies/pom.xml | 2 +- 2 files changed, 3 insertions(+), 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 index 79e6e4496c..84405d1696 100644 --- 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 @@ -51,7 +51,6 @@ 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; public abstract class RDFServiceJena extends RDFServiceImpl implements RDFService { @@ -61,7 +60,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic protected volatile boolean rebuildGraphURICache = true; protected volatile boolean isRebuildGraphURICacheRunning = false; - protected final List graphURIs = new CopyOnWriteArrayList(); + protected final List graphURIs = new CopyOnWriteArrayList(); @Override public abstract boolean changeSetUpdate(ChangeSet changeSet) throws RDFServiceException; @@ -133,8 +132,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 index 7be48b59d6..ad776e5c78 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -212,7 +212,7 @@ org.slf4j slf4j-log4j12 - 1.7.26 + 1.7.36 org.directwebremoting