This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new 2be59914 Bump commons-collections:commons-collections 2.1 to
org.apache.commons:commons-collections4 4.5.0
2be59914 is described below
commit 2be599149cc09bd24d4fdbdb7fe4e661f1dd6e30
Author: Gary D. Gregory <[email protected]>
AuthorDate: Sun May 4 10:06:07 2025 -0400
Bump commons-collections:commons-collections 2.1 to
org.apache.commons:commons-collections4 4.5.0
---
.../commons/jelly/expression/CompositeExpression.java | 2 +-
.../apache/commons/jelly/expression/ExpressionSupport.java | 6 +++---
.../java/org/apache/commons/jelly/parser/XMLParser.java | 14 +++++++-------
.../jelly/tags/velocity/JellyContextAdapterTest.java | 2 +-
pom.xml | 6 +++---
src/changes/changes.xml | 1 +
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
index 46e2a8ac..c2ce6f82 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.iterators.SingletonIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
index 9bc5a281..6145569d 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
@@ -23,9 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.iterators.ArrayIterator;
-import org.apache.commons.collections.iterators.EnumerationIterator;
-import org.apache.commons.collections.iterators.SingletonIterator;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+import org.apache.commons.collections4.iterators.EnumerationIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 48281c8f..8396498b 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.EmptyStackException;
import java.util.HashMap;
@@ -31,7 +32,6 @@ import java.util.Properties;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.collections.ArrayStack;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
@@ -86,7 +86,7 @@ public class XMLParser extends DefaultHandler {
private TagScript tagScript;
/** The stack of body scripts. */
- private ArrayStack scriptStack = new ArrayStack();
+ private ArrayDeque scriptStack = new ArrayDeque();
/** The stack of tagScripts - use ArrayList as it allows null. */
private ArrayList tagScriptStack = new ArrayList();
@@ -329,7 +329,7 @@ public class XMLParser extends DefaultHandler {
* @param prefix Prefix to look up
*/
public String findNamespaceURI(String prefix) {
- ArrayStack stack = (ArrayStack) namespaces.get(prefix);
+ ArrayDeque stack = (ArrayDeque) namespaces.get(prefix);
if (stack == null) {
return (null);
}
@@ -801,9 +801,9 @@ public class XMLParser extends DefaultHandler {
public void startPrefixMapping(String prefix, String namespaceURI)
throws SAXException {
// Register this prefix mapping
- ArrayStack stack = (ArrayStack) namespaces.get(prefix);
+ ArrayDeque stack = (ArrayDeque) namespaces.get(prefix);
if (stack == null) {
- stack = new ArrayStack();
+ stack = new ArrayDeque();
namespaces.put(prefix, stack);
}
stack.push(namespaceURI);
@@ -823,13 +823,13 @@ public class XMLParser extends DefaultHandler {
@Override
public void endPrefixMapping(String prefix) throws SAXException {
// Deregister this prefix mapping
- ArrayStack stack = (ArrayStack) namespaces.get(prefix);
+ ArrayDeque stack = (ArrayDeque) namespaces.get(prefix);
if (stack == null) {
return;
}
try {
stack.pop();
- if (stack.empty()) {
+ if (stack.isEmpty()) {
namespaces.remove(prefix);
}
}
diff --git
a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
index c0bc4f68..a6aed726 100644
---
a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
+++
b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
@@ -20,7 +20,7 @@ package org.apache.commons.jelly.tags.velocity;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.jelly.JellyContext;
import junit.framework.Test;
diff --git a/pom.xml b/pom.xml
index 65cf14c6..fa50d1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,9 +200,9 @@
<version>1.10.1</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.5.0</version>
</dependency>
<dependency>
<groupId>commons-jexl</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 13da2e7e..0be09e44 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -58,6 +58,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
xmlunit:xmlunit from a mix of 0.8 and 1.0 to 1.6.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory.
Dependabot">Bump commons-cli:commons-cli from 1.0 to 1.9.0 #24.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-lang:commons-lang 2.0 to org.apache.commons:commons-lang3
3.17.0.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-collections:commons-collections 2.1 to
org.apache.commons:commons-collections4 4.5.0.</action>
</release>
</body>
</document>
