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/12/06 15:36:33 UTC
svn commit: r1905797 - in /jackrabbit/branches/2.20: ./ jackrabbit-parent/ jackrabbit-standalone-components/ jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/
Author: reschke
Date: Tue Dec 6 15:36:33 2022
New Revision: 1905797
URL: http://svn.apache.org/viewvc?rev=1905797&view=rev
Log:
JCR-4845: jackrabbit-standalone: Upgrade to commons-collections4 (merged r1904163 and r1904169 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml
jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java
jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandLine.java
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1904163,1904169
Modified: jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-parent/pom.xml?rev=1905797&r1=1905796&r2=1905797&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-parent/pom.xml Tue Dec 6 15:36:33 2022
@@ -465,6 +465,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/branches/2.20/jackrabbit-standalone-components/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml?rev=1905797&r1=1905796&r2=1905797&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml Tue Dec 6 15:36:33 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/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java?rev=1905797&r1=1905796&r2=1905797&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandHelper.java Tue Dec 6 15:36:33 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));
}
-
}
Modified: jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandLine.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandLine.java?rev=1905797&r1=1905796&r2=1905797&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandLine.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-standalone-components/src/main/java/org/apache/jackrabbit/standalone/cli/CommandLine.java Tue Dec 6 15:36:33 2022
@@ -23,10 +23,9 @@ import java.util.Map;
import java.util.ResourceBundle;
import java.util.TreeMap;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.jackrabbit.standalone.cli.CommandHelper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.iterators.IteratorChain;
/**
* Command Line