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/13 16:44:45 UTC
[jackrabbit-filevault] branch JCRVLT-670 updated: JCRVLT-670: Upgrade to commons-collections4
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCRVLT-670
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/JCRVLT-670 by this push:
new 882e526f JCRVLT-670: Upgrade to commons-collections4
882e526f is described below
commit 882e526fe3e78d2efbb618fb8d67ad09abfd5140
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Dec 13 17:44:32 2022 +0100
JCRVLT-670: Upgrade to commons-collections4
---
parent/pom.xml | 2 +-
vault-cli/pom.xml | 6 ++++++
vault-core/pom.xml | 5 +++++
.../org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java | 6 +++---
.../vault/packaging/registry/impl/FSPackageRegistryIT.java | 2 +-
vault-validation/pom.xml | 6 ++++++
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 22681c7d..80e1ea74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -502,7 +502,7 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.1</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git a/vault-cli/pom.xml b/vault-cli/pom.xml
index 333251dd..5b3a272b 100644
--- a/vault-cli/pom.xml
+++ b/vault-cli/pom.xml
@@ -189,6 +189,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ <scope>compile</scope>
+ </dependency>
<!-- transitive (but with scope "provided") dependency of vault -->
<dependency>
<groupId>org.osgi</groupId>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index d71a3323..67d49a18 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -182,6 +182,11 @@
<artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- StaX implementation for indentation -->
<dependency>
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
index 9da58a40..4d2b800c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
@@ -39,8 +39,8 @@ import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.PropertyDefinition;
-import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.jackrabbit.vault.fs.api.AggregateManager;
import org.apache.jackrabbit.vault.fs.api.Aggregator;
import org.apache.jackrabbit.vault.fs.api.ArtifactHandler;
@@ -129,7 +129,7 @@ public class AggregateManagerImpl implements AggregateManager {
*/
private final Set<String> nodeTypes = new HashSet<String>();
- private final Map<String, String> nameCache = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+ private final Map<String, String> nameCache = new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK);
/**
* config
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistryIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistryIT.java
index 0524f64c..f6e205e1 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistryIT.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistryIT.java
@@ -38,7 +38,7 @@ import java.util.UUID;
import javax.jcr.RepositoryException;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index b8ee0d9a..1a3005f4 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -124,6 +124,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ <scope>compile</scope>
+ </dependency>
<!-- JCR Stuff -->
<dependency>
<groupId>javax.jcr</groupId>