diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java index 4e8e23c6f8..14e4113312 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java @@ -28,6 +28,7 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.ByteBuffer; import java.sql.Timestamp; +import java.util.Arrays; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -50,8 +51,6 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; -import edu.emory.mathcs.backport.java.util.Arrays; - /** * DataServices Class */ diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java index b7a87f7d50..1bde29de0f 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.base.container; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -32,8 +33,6 @@ import org.apache.ofbiz.base.start.StartupLoader; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; -import edu.emory.mathcs.backport.java.util.Collections; - /** * An object that loads containers (background processes). *