You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/02/03 07:31:04 UTC
[incubator-hop] branch master updated: HOP-2489 Bump
commons-collections to commons-collections4 (#594)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 915b3fb HOP-2489 Bump commons-collections to commons-collections4 (#594)
915b3fb is described below
commit 915b3fb338d4bd26360804071ce93ec1ecfd680c
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Wed Feb 3 08:30:56 2021 +0100
HOP-2489 Bump commons-collections to commons-collections4 (#594)
* HOP-2489 Bump commons-collections version 3.2.2 to commons-collections4
version 4.4
* Hop-2489 Fix transforms commons-collections4
---
core/pom.xml | 16 +++++-----------
.../java/org/apache/hop/core/hash/ByteArrayHashMap.java | 2 +-
.../main/java/org/apache/hop/core/util/DateDetector.java | 6 +++---
.../java/org/apache/hop/core/util/DateDetectorTest.java | 2 +-
engine/pom.xml | 9 +++++----
.../org/apache/hop/core/ConcurrentMapProperties.java | 2 +-
.../org/apache/hop/core/util/AddClosureArrayList.java | 2 +-
.../src/main/java/org/apache/hop/core/util/Assert.java | 2 +-
.../org/apache/hop/core/util/CollectionPredicates.java | 2 +-
.../main/java/org/apache/hop/core/util/KeyValueSet.java | 6 +++---
.../org/apache/hop/core/util/PluginPropertyHandler.java | 4 ++--
.../hop/concurrency/WorkflowMapConcurrencyTest.java | 2 +-
.../hop/concurrency/WorkflowTrackerConcurrencyTest.java | 2 +-
.../hop/pipeline/transforms/datagrid/DataGridDialog.java | 2 +-
.../hop/pipeline/transforms/mailinput/MailInput.java | 2 +-
.../apache/hop/pipeline/transforms/sort/SortRows.java | 2 +-
ui/pom.xml | 2 --
17 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 6edd2e5..b07f70a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,7 +44,7 @@
<slf4j-log4j12.version>1.7.30</slf4j-log4j12.version>
<xml-apis-ext.version>1.3.04</xml-apis-ext.version>
<spring.framework.version>4.3.2.RELEASE</spring.framework.version>
- <commons-collections.version>3.2.2</commons-collections.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-vfs2.version>2.4.1</commons-vfs2.version>
<commons-io.version>2.2</commons-io.version>
@@ -298,16 +298,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
diff --git a/core/src/main/java/org/apache/hop/core/hash/ByteArrayHashMap.java b/core/src/main/java/org/apache/hop/core/hash/ByteArrayHashMap.java
index 8f73629..12eda99 100644
--- a/core/src/main/java/org/apache/hop/core/hash/ByteArrayHashMap.java
+++ b/core/src/main/java/org/apache/hop/core/hash/ByteArrayHashMap.java
@@ -17,7 +17,7 @@
package org.apache.hop.core.hash;
-import org.apache.commons.collections.map.AbstractHashedMap;
+import org.apache.commons.collections4.map.AbstractHashedMap;
import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.RowMeta;
diff --git a/core/src/main/java/org/apache/hop/core/util/DateDetector.java b/core/src/main/java/org/apache/hop/core/util/DateDetector.java
index a4fcaeb..f84bb81 100644
--- a/core/src/main/java/org/apache/hop/core/util/DateDetector.java
+++ b/core/src/main/java/org/apache/hop/core/util/DateDetector.java
@@ -16,8 +16,8 @@
*/
package org.apache.hop.core.util;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -28,7 +28,7 @@ public class DateDetector {
private static final String LOCALE_en_US = "en_US";
@SuppressWarnings( "serial" )
- static final BidiMap DATE_FORMAT_TO_REGEXPS_US = new DualHashBidiMap() {
+ static final BidiMap<String,String> DATE_FORMAT_TO_REGEXPS_US = new DualHashBidiMap<String, String>() {
{
put( "MM-dd-yyyy", "^[0-1]?[0-9]-[0-3]?[0-9]-\\d{4}$" );
put( "dd/MM/yyyy", "^[0-3]?[0-9]/[0-1]?[0-9]/\\d{4}$" );
diff --git a/core/src/test/java/org/apache/hop/core/util/DateDetectorTest.java b/core/src/test/java/org/apache/hop/core/util/DateDetectorTest.java
index ffd04bb..0f522a4 100644
--- a/core/src/test/java/org/apache/hop/core/util/DateDetectorTest.java
+++ b/core/src/test/java/org/apache/hop/core/util/DateDetectorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.hop.core.util;
-import org.apache.commons.collections.BidiMap;
+import org.apache.commons.collections4.BidiMap;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/engine/pom.xml b/engine/pom.xml
index baab29d..123fdf8 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -42,6 +42,7 @@
<!-- Third-party dependencies -->
<commons-validator.version>1.3.1</commons-validator.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
<jersey-apache-client.version>1.19.1</jersey-apache-client.version>
<jersey-bundle.version>1.19.1</jersey-bundle.version>
<olap4j.version>1.2.0</olap4j.version>
@@ -90,10 +91,10 @@
<version>${commons-vfs2.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/engine/src/main/java/org/apache/hop/core/ConcurrentMapProperties.java b/engine/src/main/java/org/apache/hop/core/ConcurrentMapProperties.java
index 2c84287..61c50f3 100644
--- a/engine/src/main/java/org/apache/hop/core/ConcurrentMapProperties.java
+++ b/engine/src/main/java/org/apache/hop/core/ConcurrentMapProperties.java
@@ -16,7 +16,7 @@
*/
package org.apache.hop.core;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import java.io.IOException;
import java.io.InputStream;
diff --git a/engine/src/main/java/org/apache/hop/core/util/AddClosureArrayList.java b/engine/src/main/java/org/apache/hop/core/util/AddClosureArrayList.java
index 6922a50..3d21755 100644
--- a/engine/src/main/java/org/apache/hop/core/util/AddClosureArrayList.java
+++ b/engine/src/main/java/org/apache/hop/core/util/AddClosureArrayList.java
@@ -17,7 +17,7 @@
package org.apache.hop.core.util;
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
import java.util.ArrayList;
diff --git a/engine/src/main/java/org/apache/hop/core/util/Assert.java b/engine/src/main/java/org/apache/hop/core/util/Assert.java
index 73d0d1a..3996d44 100644
--- a/engine/src/main/java/org/apache/hop/core/util/Assert.java
+++ b/engine/src/main/java/org/apache/hop/core/util/Assert.java
@@ -17,7 +17,7 @@
package org.apache.hop.core.util;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang.StringUtils;
import java.text.MessageFormat;
diff --git a/engine/src/main/java/org/apache/hop/core/util/CollectionPredicates.java b/engine/src/main/java/org/apache/hop/core/util/CollectionPredicates.java
index e162133..40bd6fb 100644
--- a/engine/src/main/java/org/apache/hop/core/util/CollectionPredicates.java
+++ b/engine/src/main/java/org/apache/hop/core/util/CollectionPredicates.java
@@ -17,7 +17,7 @@
package org.apache.hop.core.util;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import java.util.Collection;
import java.util.Map;
diff --git a/engine/src/main/java/org/apache/hop/core/util/KeyValueSet.java b/engine/src/main/java/org/apache/hop/core/util/KeyValueSet.java
index 50892fe..8daccba 100644
--- a/engine/src/main/java/org/apache/hop/core/util/KeyValueSet.java
+++ b/engine/src/main/java/org/apache/hop/core/util/KeyValueSet.java
@@ -17,9 +17,9 @@
package org.apache.hop.core.util;
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
diff --git a/engine/src/main/java/org/apache/hop/core/util/PluginPropertyHandler.java b/engine/src/main/java/org/apache/hop/core/util/PluginPropertyHandler.java
index 6a8e1b6..5874a5a 100644
--- a/engine/src/main/java/org/apache/hop/core/util/PluginPropertyHandler.java
+++ b/engine/src/main/java/org/apache/hop/core/util/PluginPropertyHandler.java
@@ -17,8 +17,8 @@
package org.apache.hop.core.util;
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.FunctorException;
import org.apache.hop.core.exception.HopException;
import org.w3c.dom.Node;
diff --git a/engine/src/test/java/org/apache/hop/concurrency/WorkflowMapConcurrencyTest.java b/engine/src/test/java/org/apache/hop/concurrency/WorkflowMapConcurrencyTest.java
index 1b7f390..5c6c892 100644
--- a/engine/src/test/java/org/apache/hop/concurrency/WorkflowMapConcurrencyTest.java
+++ b/engine/src/test/java/org/apache/hop/concurrency/WorkflowMapConcurrencyTest.java
@@ -17,7 +17,7 @@
package org.apache.hop.concurrency;
-import org.apache.commons.collections.ListUtils;
+import org.apache.commons.collections4.ListUtils;
import org.apache.hop.workflow.WorkflowConfiguration;
import org.apache.hop.workflow.WorkflowMeta;
import org.apache.hop.workflow.engine.IWorkflowEngine;
diff --git a/engine/src/test/java/org/apache/hop/concurrency/WorkflowTrackerConcurrencyTest.java b/engine/src/test/java/org/apache/hop/concurrency/WorkflowTrackerConcurrencyTest.java
index 083c601..21c4500 100644
--- a/engine/src/test/java/org/apache/hop/concurrency/WorkflowTrackerConcurrencyTest.java
+++ b/engine/src/test/java/org/apache/hop/concurrency/WorkflowTrackerConcurrencyTest.java
@@ -17,7 +17,7 @@
package org.apache.hop.concurrency;
-import org.apache.commons.collections.ListUtils;
+import org.apache.commons.collections4.ListUtils;
import org.apache.hop.core.gui.WorkflowTracker;
import org.apache.hop.workflow.ActionResult;
import org.apache.hop.workflow.WorkflowMeta;
diff --git a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
index 9c49f78..f781c17 100644
--- a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
+++ b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
@@ -18,7 +18,7 @@
package org.apache.hop.pipeline.transforms.datagrid;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.row.value.ValueMetaFactory;
diff --git a/plugins/transforms/mailinput/src/main/java/org/apache/hop/pipeline/transforms/mailinput/MailInput.java b/plugins/transforms/mailinput/src/main/java/org/apache/hop/pipeline/transforms/mailinput/MailInput.java
index a1d8b49..b3ef8c7 100644
--- a/plugins/transforms/mailinput/src/main/java/org/apache/hop/pipeline/transforms/mailinput/MailInput.java
+++ b/plugins/transforms/mailinput/src/main/java/org/apache/hop/pipeline/transforms/mailinput/MailInput.java
@@ -17,7 +17,7 @@
package org.apache.hop.pipeline.transforms.mailinput;
-import org.apache.commons.collections.iterators.ArrayIterator;
+import org.apache.commons.collections4.iterators.ArrayIterator;
import org.apache.commons.lang.StringUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
diff --git a/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRows.java b/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRows.java
index ad86a95..9466689 100644
--- a/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRows.java
+++ b/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRows.java
@@ -17,7 +17,7 @@
package org.apache.hop.pipeline.transforms.sort;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.hop.core.Const;
diff --git a/ui/pom.xml b/ui/pom.xml
index 5b43e44..343c175 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -98,8 +98,6 @@
</exclusion>
</exclusions>
</dependency>
-
-
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>