diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eb1703425..3a82d13599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ## Unreleased ([details][unreleased changes details]) - ### Fixed - #3275 - CCVAR: Fixed Same Attribute not updating correctly. +### Changed + +- #3390 - Remove usage of commons collections 3 + +### Fixed + +- #3398 - CreateRedirectConfigurationServlet throws PersistenceException when ancestor node types are different than expected + + ## 6.6.2 - 2024-06-25 ### Fixed diff --git a/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/ChecksumGeneratorServlet.java b/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/ChecksumGeneratorServlet.java index 76f9612701..f996f897e1 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/ChecksumGeneratorServlet.java +++ b/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/ChecksumGeneratorServlet.java @@ -22,7 +22,7 @@ import com.adobe.acs.commons.analysis.jcrchecksum.ChecksumGeneratorOptions; import com.adobe.acs.commons.analysis.jcrchecksum.impl.options.ChecksumGeneratorOptionsFactory; import com.adobe.acs.commons.analysis.jcrchecksum.impl.options.RequestChecksumGeneratorOptions; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Properties; import org.apache.felix.scr.annotations.Property; diff --git a/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/JSONDumpServlet.java b/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/JSONDumpServlet.java index d1cc36fe41..5269e84172 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/JSONDumpServlet.java +++ b/bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/servlets/JSONDumpServlet.java @@ -24,7 +24,7 @@ import com.adobe.acs.commons.analysis.jcrchecksum.impl.options.RequestChecksumGeneratorOptions; import com.google.gson.stream.JsonWriter; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Properties; import org.apache.felix.scr.annotations.Property; diff --git a/bundle/src/main/java/com/adobe/acs/commons/data/Spreadsheet.java b/bundle/src/main/java/com/adobe/acs/commons/data/Spreadsheet.java index 5f36e8121a..7583fe3b71 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/data/Spreadsheet.java +++ b/bundle/src/main/java/com/adobe/acs/commons/data/Spreadsheet.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; diff --git a/bundle/src/main/java/com/adobe/acs/commons/exporters/impl/users/UsersExportServlet.java b/bundle/src/main/java/com/adobe/acs/commons/exporters/impl/users/UsersExportServlet.java index c8534a76ef..8860895602 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/exporters/impl/users/UsersExportServlet.java +++ b/bundle/src/main/java/com/adobe/acs/commons/exporters/impl/users/UsersExportServlet.java @@ -19,7 +19,7 @@ import com.day.cq.commons.jcr.JcrConstants; import com.day.text.csv.Csv; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.felix.scr.annotations.sling.SlingServlet; diff --git a/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/IncludeDecoratorFilterImpl.java b/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/IncludeDecoratorFilterImpl.java index f221624222..6236b4f81a 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/IncludeDecoratorFilterImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/IncludeDecoratorFilterImpl.java @@ -29,7 +29,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; diff --git a/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/NamespaceResourceWrapper.java b/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/NamespaceResourceWrapper.java index bbe3728716..a89012a938 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/NamespaceResourceWrapper.java +++ b/bundle/src/main/java/com/adobe/acs/commons/granite/ui/components/impl/include/NamespaceResourceWrapper.java @@ -21,8 +21,8 @@ import java.util.Iterator; import java.util.Optional; -import org.apache.commons.collections.iterators.FilterIterator; -import org.apache.commons.collections.iterators.TransformIterator; +import org.apache.commons.collections4.iterators.FilterIterator; +import org.apache.commons.collections4.iterators.TransformIterator; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/GroupHttpCacheConfigExtension.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/GroupHttpCacheConfigExtension.java index 6f759e1e06..47abecca0c 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/GroupHttpCacheConfigExtension.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/GroupHttpCacheConfigExtension.java @@ -26,7 +26,7 @@ import com.adobe.acs.commons.httpcache.keys.CacheKey; import com.adobe.acs.commons.httpcache.keys.CacheKeyFactory; import com.adobe.acs.commons.httpcache.util.UserUtils; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImpl.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImpl.java index 196af27919..e4759c37bc 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImpl.java @@ -27,7 +27,7 @@ import com.adobe.acs.commons.httpcache.store.HttpCacheStore; import com.adobe.acs.commons.httpcache.util.UserUtils; import com.adobe.acs.commons.util.ParameterUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestParameterHttpCacheConfigExtension.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestParameterHttpCacheConfigExtension.java index 643c2b8f75..992d1931cf 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestParameterHttpCacheConfigExtension.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestParameterHttpCacheConfigExtension.java @@ -20,7 +20,7 @@ import com.adobe.acs.commons.httpcache.config.HttpCacheConfig; import com.adobe.acs.commons.httpcache.config.HttpCacheConfigExtension; import com.adobe.acs.commons.httpcache.keys.CacheKeyFactory; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestPathHttpCacheConfigExtension.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestPathHttpCacheConfigExtension.java index f2b64583ba..31886eef0a 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestPathHttpCacheConfigExtension.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/RequestPathHttpCacheConfigExtension.java @@ -22,7 +22,7 @@ import com.adobe.acs.commons.httpcache.config.impl.keys.RequestPathCacheKey; import com.adobe.acs.commons.httpcache.keys.CacheKey; import com.adobe.acs.commons.httpcache.keys.CacheKeyFactory; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; @@ -42,7 +42,7 @@ import java.util.regex.Pattern; import static java.util.Collections.emptyList; -import static org.apache.commons.collections.CollectionUtils.isEmpty; +import static org.apache.commons.collections4.CollectionUtils.isEmpty; @Component( configurationPolicy = ConfigurationPolicy.REQUIRE, diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/ResourcePropertiesHttpCacheConfigExtension.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/ResourcePropertiesHttpCacheConfigExtension.java index cc800225f7..65098d0ff8 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/ResourcePropertiesHttpCacheConfigExtension.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/config/impl/ResourcePropertiesHttpCacheConfigExtension.java @@ -20,7 +20,7 @@ import com.adobe.acs.commons.httpcache.config.HttpCacheConfig; import com.adobe.acs.commons.httpcache.config.HttpCacheConfigExtension; import com.adobe.acs.commons.httpcache.keys.CacheKeyFactory; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/rule/impl/HonorCacheControlHeaders.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/rule/impl/HonorCacheControlHeaders.java index 9019c2a42a..73ac301741 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/rule/impl/HonorCacheControlHeaders.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/rule/impl/HonorCacheControlHeaders.java @@ -19,7 +19,7 @@ import com.adobe.acs.commons.httpcache.config.HttpCacheConfig; import com.adobe.acs.commons.httpcache.engine.CacheContent; import com.adobe.acs.commons.httpcache.rule.AbstractHttpCacheHandlingRule; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.SlingHttpServletRequest; diff --git a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/asset/NamesFilter.java b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/asset/NamesFilter.java index 7fde471fe4..de42d96564 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/asset/NamesFilter.java +++ b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/asset/NamesFilter.java @@ -17,7 +17,7 @@ */ package com.adobe.acs.commons.mcp.impl.processes.asset; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/CreateRedirectConfigurationServlet.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/CreateRedirectConfigurationServlet.java index e686d69f1e..b92cf63280 100755 --- a/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/CreateRedirectConfigurationServlet.java +++ b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/CreateRedirectConfigurationServlet.java @@ -30,6 +30,7 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.jcr.resource.api.JcrResourceConstants; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; @@ -89,7 +90,7 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse Resource bucket = root.getChild(bucketName); if (bucket == null) { bucket = resolver.create(root, bucketName, - ImmutableMap.of(JcrConstants.JCR_PRIMARYTYPE, "sling:Folder")); + ImmutableMap.of(JcrConstants.JCR_PRIMARYTYPE, JcrResourceConstants.NT_SLING_FOLDER)); log.info("created {}", bucket.getPath()); } @@ -97,7 +98,7 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse if (config == null) { String contextPrefix = StringUtils.defaultString(request.getParameter(REQ_PARAM_CTX_PREFIX)); config = resolver.create(bucket, configName, - ImmutableMap.of(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, + ImmutableMap.of(JcrConstants.JCR_PRIMARYTYPE, JcrResourceConstants.NT_SLING_FOLDER, ResourceResolver.PROPERTY_RESOURCE_TYPE, REDIRECTS_RESOURCE_PATH, REQ_PARAM_CTX_PREFIX, contextPrefix)); log.info("created {} with context prefix '{}'", config.getPath(), contextPrefix); diff --git a/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/RefetchFlushContentBuilderImpl.java b/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/RefetchFlushContentBuilderImpl.java index e8e2240570..e6169c9b34 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/RefetchFlushContentBuilderImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/RefetchFlushContentBuilderImpl.java @@ -25,7 +25,7 @@ import com.day.cq.replication.ReplicationContentFactory; import com.day.cq.replication.ReplicationException; import com.day.cq.replication.ReplicationLog; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; diff --git a/bundle/src/main/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResource.java b/bundle/src/main/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResource.java index 5cf6cfc1bf..2a787214dd 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResource.java +++ b/bundle/src/main/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResource.java @@ -21,7 +21,6 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.apache.commons.collections.IteratorUtils; import org.apache.jackrabbit.JcrConstants; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.Resource; @@ -153,7 +152,7 @@ public ChildrenAsPropertyResource(Resource resource, String propertyName, Compar **/ @Override public final Iterator listChildren() { - return IteratorUtils.getIterator(this.orderedCache); + return this.orderedCache.iterator(); } /** diff --git a/bundle/src/main/java/com/adobe/acs/commons/users/impl/Ace.java b/bundle/src/main/java/com/adobe/acs/commons/users/impl/Ace.java index 488e0851aa..8ddbc05916 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/users/impl/Ace.java +++ b/bundle/src/main/java/com/adobe/acs/commons/users/impl/Ace.java @@ -19,7 +19,7 @@ package com.adobe.acs.commons.users.impl; import com.adobe.acs.commons.util.ParameterUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry; diff --git a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/execution/impl/runners/SyntheticWorkflowRunnerImpl.java b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/execution/impl/runners/SyntheticWorkflowRunnerImpl.java index 09c273150e..8616186b51 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/execution/impl/runners/SyntheticWorkflowRunnerImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/execution/impl/runners/SyntheticWorkflowRunnerImpl.java @@ -28,7 +28,6 @@ import com.adobe.acs.commons.workflow.synthetic.SyntheticWorkflowModel; import com.adobe.acs.commons.workflow.synthetic.SyntheticWorkflowRunner; import com.day.cq.workflow.WorkflowException; -import org.apache.commons.collections.ListUtils; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; @@ -42,6 +41,8 @@ import org.slf4j.LoggerFactory; import javax.jcr.Session; + +import java.util.Collections; import java.util.List; @Component @@ -227,7 +228,7 @@ private PayloadGroup onboardNextPayloadGroup(Workspace workspace, PayloadGroup c private List onboardNextPayloads(Workspace workspace, PayloadGroup payloadGroup) throws PersistenceException { if (payloadGroup == null) { - return ListUtils.EMPTY_LIST; + return Collections.emptyList(); } List payloads = payloadGroup.getPayloads(); diff --git a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverImpl.java b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverImpl.java index eb95d68403..7d862f313e 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverImpl.java @@ -30,7 +30,7 @@ import com.adobe.granite.workflow.exec.Workflow; import com.adobe.granite.workflow.exec.filter.WorkItemFilter; import com.day.cq.workflow.WorkflowService; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; diff --git a/bundle/src/test/java/com/adobe/acs/commons/httpcache/engine/impl/HttpCacheEngineImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/httpcache/engine/impl/HttpCacheEngineImplTest.java index 12b482f67a..28d5cb75fa 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/httpcache/engine/impl/HttpCacheEngineImplTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/httpcache/engine/impl/HttpCacheEngineImplTest.java @@ -26,7 +26,7 @@ import com.adobe.acs.commons.httpcache.store.HttpCacheStore; import com.adobe.acs.commons.httpcache.store.mem.impl.MemTempSinkImpl; import com.day.cq.commons.feed.StringResponseWrapper; -import org.apache.commons.collections.map.SingletonMap; +import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.io.IOUtils; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; diff --git a/bundle/src/test/java/com/adobe/acs/commons/httpcache/store/jcr/impl/visitor/mock/RootNodeMockFactory.java b/bundle/src/test/java/com/adobe/acs/commons/httpcache/store/jcr/impl/visitor/mock/RootNodeMockFactory.java index 8cf90ef570..d05b648919 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/httpcache/store/jcr/impl/visitor/mock/RootNodeMockFactory.java +++ b/bundle/src/test/java/com/adobe/acs/commons/httpcache/store/jcr/impl/visitor/mock/RootNodeMockFactory.java @@ -33,7 +33,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.collections.IteratorUtils; +import org.apache.commons.collections4.IteratorUtils; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.AbstractNode; import org.apache.jackrabbit.value.BinaryImpl; diff --git a/bundle/src/test/java/com/adobe/acs/commons/reports/models/PredictedTagsCellValueTest.java b/bundle/src/test/java/com/adobe/acs/commons/reports/models/PredictedTagsCellValueTest.java index 4476259818..ba1697851d 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/reports/models/PredictedTagsCellValueTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/reports/models/PredictedTagsCellValueTest.java @@ -22,7 +22,7 @@ import com.day.cq.dam.api.Asset; import com.day.cq.dam.api.DamConstants; import io.wcm.testing.mock.aem.junit.AemContext; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.reflect.FieldUtils; import org.apache.jackrabbit.vault.util.PathUtil; import org.apache.sling.api.SlingHttpServletRequest; diff --git a/bundle/src/test/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResourceTest.java b/bundle/src/test/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResourceTest.java index 7bc05734bc..060ffea8ca 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResourceTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/synth/children/ChildrenAsPropertyResourceTest.java @@ -17,7 +17,7 @@ */ package com.adobe.acs.commons.synth.children; -import org.apache.commons.collections.IteratorUtils; +import org.apache.commons.collections4.IteratorUtils; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; diff --git a/bundle/src/test/java/com/adobe/acs/commons/util/visitors/ContentVisitorTest.java b/bundle/src/test/java/com/adobe/acs/commons/util/visitors/ContentVisitorTest.java index 241cd1ca78..1bf238b182 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/util/visitors/ContentVisitorTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/util/visitors/ContentVisitorTest.java @@ -18,7 +18,7 @@ package com.adobe.acs.commons.util.visitors; -import org.apache.commons.collections.IteratorUtils; +import org.apache.commons.collections4.IteratorUtils; import org.apache.jackrabbit.JcrConstants; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; diff --git a/pom.xml b/pom.xml index d61a9d9d9d..663c11e93a 100644 --- a/pom.xml +++ b/pom.xml @@ -472,7 +472,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/ org.owasp dependency-check-maven - 9.0.10 + 10.0.2 org.sonatype.plugins