This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 2b8f4f8b64a7d82d5ac4ae3d5f3a144982a8876d Author: Michael Brohl <michael.br...@ecomify.de> AuthorDate: Thu Feb 18 21:56:00 2021 +0100 Fixed: Corrects wrong API use for Collections and Arrays edu.emory.mathcs.backport.java.util.* instead of java.util.* which was spotted during the jCenter to mavenCentral migration. --- .../src/main/java/org/apache/ofbiz/content/data/DataServices.java | 2 +- .../src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java | 3 +-- .../src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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 4e8e23c..2b30528 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,7 +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/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java index 3565826..86b448e 100644 --- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java +++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.securityext.login; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; @@ -58,8 +59,6 @@ import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.webapp.control.LoginWorker; -import edu.emory.mathcs.backport.java.util.Arrays; - /** * LoginEvents - Events for UserLogin and Security handling. */ 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 619c52c..8a3e594 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,7 +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).