diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/tags/OptionTag.java b/api/src/main/java/edu/cornell/mannlib/vedit/tags/OptionTag.java index 8b556b226..d911b258f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/tags/OptionTag.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/tags/OptionTag.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vedit.tags; -import org.apache.commons.collections.map.ListOrderedMap; -import org.apache.commons.collections.OrderedMapIterator; +import org.apache.commons.collections4.map.ListOrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; import java.util.List; import java.util.Iterator; import java.io.IOException; @@ -51,7 +51,7 @@ public class OptionTag extends EditTag { } catch (ClassCastException e){ // maybe it's a ListOrderedMap of optgroups optGroups = (ListOrderedMap) getFormObject().getOptionLists().get(name); - OrderedMapIterator ogKey = optGroups.orderedMapIterator(); + OrderedMapIterator ogKey = optGroups.mapIterator(); while (ogKey.hasNext()) { String optGroupName = (String) ogKey.next(); out.println(""); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java index 451f1aaee..ddffaa236 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; -import org.apache.commons.collections.map.ListOrderedMap; +import org.apache.commons.collections4.map.ListOrderedMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -230,7 +230,7 @@ public class EntityRetryController extends BaseEditController { } List dynamicFields = new ArrayList(); - Iterator dpHashIt = dpMap.orderedMapIterator(); + Iterator dpHashIt = dpMap.mapIterator(); while (dpHashIt.hasNext()) { String uri = dpHashIt.next(); DataProperty dp = (DataProperty) dpMap.get(uri); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java index d5cf345f8..3fb55e2ef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java @@ -207,7 +207,7 @@ public class JenaXMLFileUpload extends JenaIngestController { XsltTransformer t = xsltExec.load(); //this is how to set parameters: //t.setParameter(new QName("someparametername"), new XdmAtomicValue(10)); - Serializer out = new Serializer(); + Serializer out = new Processor(false).newSerializer(); out.setOutputProperty(Serializer.Property.METHOD, "xml"); out.setOutputProperty(Serializer.Property.INDENT, "yes"); File outFile = new File(file.getAbsolutePath() + ".rdfxml"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java index 78124ea4b..02cc0706d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java @@ -19,7 +19,7 @@ import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.collections4.EnumerationUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java index d33000c1d..3069df378 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.apache.commons.collections.IteratorUtils; +import org.apache.commons.collections4.IteratorUtils; import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 56e13c7bd..14b13be59 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -111,20 +111,10 @@ commons-lang3 3.4 - - commons-collections - commons-collections - 3.2.2 - org.apache.commons - commons-csv - 1.4 - - - commons-logging - commons-logging - 1.1.1 + commons-collections4 + 4.1 mysql @@ -145,7 +135,7 @@ net.sf.saxon Saxon-HE - 9.6.0-7 + 9.8.0-4 net.sourceforge.owlapi @@ -159,6 +149,7 @@ + net.sourceforge.owlapi @@ -180,12 +171,12 @@ org.semarglproject semargl-core - 0.6.1 + 0.7 org.semarglproject semargl-rdfa - 0.6.1 + 0.7 @@ -226,7 +217,7 @@ org.apache.solr solr-solrj - 4.7.2 + 4.10.4 org.directwebremoting diff --git a/solr/pom.xml b/solr/pom.xml index c7533cd27..00669b264 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -38,7 +38,7 @@ org.apache.solr solr - 4.7.2 + 4.10.4 war