You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/05/11 15:51:48 UTC
[uima-ruta] branch UIMA-6447-Update-dependencies created (now fd9e80e6)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch UIMA-6447-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
at fd9e80e6 [UIMA-6447] Update dependencies (Ruta 3.2.0)
This branch includes the following new commits:
new fd9e80e6 [UIMA-6447] Update dependencies (Ruta 3.2.0)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-ruta] 01/01: [UIMA-6447] Update dependencies (Ruta 3.2.0)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-6447-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit fd9e80e643a4dec986d75be534082f876fcc1585
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed May 11 17:51:42 2022 +0200
[UIMA-6447] Update dependencies (Ruta 3.2.0)
- Commons Collections 4 -> 4.4
- Remove usages of Commons Collections 3 in the Ruta Code
---
ruta-core/pom.xml | 10 ++++++----
ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java | 2 +-
.../main/java/org/apache/uima/ruta/action/GatherAction.java | 2 +-
.../main/java/org/apache/uima/ruta/action/MergeAction.java | 2 +-
.../org/apache/uima/ruta/condition/ImplicitCondition.java | 2 +-
ruta-ep-engine/pom.xml | 5 ++---
ruta-parent/pom.xml | 12 ++++++++++--
7 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 6b38a546..5696d42a 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ruta-core</artifactId>
@@ -80,8 +82,8 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
@@ -101,7 +103,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
index 37789255..f6536522 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
@@ -36,7 +36,7 @@ import java.util.NoSuchElementException;
import java.util.Set;
import java.util.TreeMap;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.uima.cas.BooleanArrayFS;
import org.apache.uima.cas.CAS;
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java b/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
index f1ca6e7e..76dd19b3 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java b/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
index bf4421f4..6d72f1c9 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
@@ -22,7 +22,7 @@ package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.collections.ListUtils;
+import org.apache.commons.collections4.ListUtils;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java b/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
index 29a62ab2..2668ff39 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml
index 6e3b05b5..293c43db 100644
--- a/ruta-ep-engine/pom.xml
+++ b/ruta-ep-engine/pom.xml
@@ -90,9 +90,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 36773992..2693814a 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -122,6 +124,7 @@
<antlr-version>3.5.3</antlr-version>
<htmlparser-version>1.6</htmlparser-version>
<commons-collections-version>3.2.2</commons-collections-version>
+ <commons-collections4-version>4.4</commons-collections4-version>
<commons-text-version>1.9</commons-text-version>
<commons-lang3-version>3.12.0</commons-lang3-version>
<commons-io-version>2.8.0</commons-io-version>
@@ -158,6 +161,11 @@
<artifactId>commons-collections</artifactId>
<version>${commons-collections-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -310,7 +318,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>apache-release</id>