Merge pull request #84 from apache/UIMA-6447-Update-dependencies
[UIMA-6447] Update dependencies (Ruta 3.2.0)
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 6b38a54..5696d42 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 3778925..f653652 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.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 f1ca6e7..76dd19b 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.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 bf4421f..6d72f1c 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 @@
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 29a62ab..2668ff3 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.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 6e3b05b..293c43d 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 3677399..2693814 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>
@@ -160,6 +163,11 @@
</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>
<version>${commons-text-version}</version>
</dependency>
@@ -310,7 +318,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>apache-release</id>
