You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2022/09/20 12:35:29 UTC
svn commit: r1904163 - in /jackrabbit/trunk: jackrabbit-parent/pom.xml jackrabbit-standalone-components/pom.xml jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java
Author: reschke
Date: Tue Sep 20 12:35:28 2022
New Revision: 1904163
URL: http://svn.apache.org/viewvc?rev=1904163&view=rev
Log:
JCR-4845: jackrabbit-standalone: Upgrade to commons-collections4
Modified:
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/jackrabbit-standalone-components/pom.xml
jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1904163&r1=1904162&r2=1904163&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Tue Sep 20 12:35:28 2022
@@ -476,6 +476,11 @@
<version>3.2.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
Modified: jackrabbit/trunk/jackrabbit-standalone-components/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone-components/pom.xml?rev=1904163&r1=1904162&r2=1904163&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone-components/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone-components/pom.xml Tue Sep 20 12:35:28 2022
@@ -166,6 +166,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
Modified: jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java?rev=1904163&r1=1904162&r2=1904163&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java (original)
+++ jackrabbit/trunk/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java Tue Sep 20 12:35:28 2022
@@ -30,7 +30,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.commons.chain.Context;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
/**
* Utility class for getting and setting context attributes.
@@ -351,7 +351,7 @@ public final class CommandHelper {
}
/**
- * Gets the <code>Item</code> s under the given <code>Node</code> that
+ * Gets the <code>Item</code>s under the given <code>Node</code> that
* match the pattern
* @param ctx
* the <code>Context</code>
@@ -365,10 +365,10 @@ public final class CommandHelper {
* if the underlying repository throws a
* <code>RepositoryException</code>
*/
- public static Iterator getItems(Context ctx, Node node, String pattern)
+ @SuppressWarnings("unchecked")
+ public static Iterator<Item> getItems(Context ctx, Node node, String pattern)
throws RepositoryException {
return IteratorUtils.chainedIterator(getNodes(ctx, node, pattern),
getProperties(ctx, node, pattern));
}
-
}