Merge pull request #367 from TAMULib/3751-remove_icu

VIVO-3751: Remove ICU4J dependency.
vivo-project · Feb 27, 2023 · 4d60cd9 · 4d60cd9
2 parents 9b6e362 + 5ec99a2
commit 4d60cd9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.config;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,8 +15,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.icu.text.SimpleDateFormat;
-
 /**
  * Information about the provenance of this application: release, revision
  * level, build date, etc.

diff --git a/...va/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java b/...va/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
@@ -2,15 +2,14 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.admin;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import com.ibm.icu.text.SimpleDateFormat;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import java.text.Collator;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -17,7 +18,6 @@
 import org.apache.jena.shared.DoesNotExistException;
 import org.apache.jena.util.iterator.ExtendedIterator;
 import org.apache.jena.util.iterator.WrappedIterator;
-import com.ibm.icu.text.Collator;
 
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;

diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
@@ -7,6 +7,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -20,8 +21,6 @@
 import stubs.javax.servlet.ServletContextStub;
 import stubs.javax.servlet.http.HttpSessionStub;
 
-import com.ibm.icu.text.SimpleDateFormat;
-
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -65,11 +65,6 @@
 
 
 
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>59.1</version>
-        </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-jpeg</artifactId>