From 5ec99a2204746107ff76f1d881ce12b0fe87217f Mon Sep 17 00:00:00 2001
From: Kevin Day <kday@tamu.edu>
Date: Wed, 22 Feb 2023 09:42:17 -0600
Subject: [PATCH] Issue 3751: Remove ICU4J dependency.

This is only used in a handful of places.
The core java libraries provide the same functionality but with a less exchaustive locale database.

The IBM ICU is more up to date than the Java version but is otherwise identical.

see: https://unicode-org.github.io/icu/userguide/icu4j/#introduction-to-icu4j
---
 .../mannlib/vitro/webapp/config/RevisionInfoBean.java        | 3 +--
 .../controller/admin/ShowBackgroundThreadsController.java    | 3 +--
 .../mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java  | 2 +-
 .../mannlib/vitro/webapp/config/RevisionInfoSetupTest.java   | 3 +--
 dependencies/pom.xml                                         | 5 -----
 5 files changed, 4 insertions(+), 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
index d01677d6a..652500cb9 100644
--- 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 javax.servlet.http.HttpSession;
 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/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
index 2734b5cdd..2057cb4a8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.admin;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -9,8 +10,6 @@ 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
index d2e0db56e..f72f7e012 100644
--- 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.CannotCreateException;
 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
index cd2a96026..00e861772 100644
--- 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 edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup.DATE_FOR
 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 org.junit.Test;
 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
index 6813fec38..6e3fa542e 100644
--- 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>