This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13120-java-21-compatibility in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit 0436cecf3561e802c50ff2f995bdf7d117e2a224 Author: Stefan Seifert <[email protected]> AuthorDate: Wed Feb 18 11:31:39 2026 +0100 update mockito --- pom.xml | 18 ++++++++++------- .../sling/pipes/internal/TraversePipeTest.java | 23 +++++++++++----------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 7955435..462672e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,11 +35,9 @@ <description>bulk content changes tool</description> <properties> - <sling.java.version>8</sling.java.version> + <sling.java.version>11</sling.java.version> <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> <project.build.outputTimestamp>1660725790</project.build.outputTimestamp> - <maven.compiler.source>8</maven.compiler.source> - <maven.compiler.target>8</maven.compiler.target> </properties> <scm> @@ -158,6 +156,12 @@ <artifactId>org.osgi.service.metatype.annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> @@ -291,10 +295,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.21.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> diff --git a/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java index 3bd3b61..fd1c711 100644 --- a/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java @@ -16,6 +16,15 @@ */ package org.apache.sling.pipes.internal; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertTrue; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import org.apache.commons.collections4.IteratorUtils; import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.api.resource.Resource; @@ -23,15 +32,6 @@ import org.apache.sling.pipes.AbstractPipeTest; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.mockito.cglib.core.CollectionUtils; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertTrue; /** * Testing traverse pipes and its different configurations on the same resource tree @@ -40,6 +40,7 @@ public class TraversePipeTest extends AbstractPipeTest { public static final String ROOT = "/content/traverse"; public static final String CONF_ROOT = ROOT + "/pipes/"; + @Override @Before public void setup() throws PersistenceException { super.setup(); @@ -74,7 +75,7 @@ public class TraversePipeTest extends AbstractPipeTest { @Test @Ignore //for now nameGlobs is not implemented (see SLING-7089) public void testWhiteListProperties() throws Exception { - List<String> colorList = CollectionUtils.transform(getResourceList("whiteListProperties"), o -> ((Resource)o).adaptTo(String.class)); + List<String> colorList = getResourceList("whiteListProperties").stream().map(o -> o.adaptTo(String.class)).collect(Collectors.toList()); assertListEquals(colorList, "green", "yellow", "green", "orange"); } @@ -88,7 +89,7 @@ public class TraversePipeTest extends AbstractPipeTest { return IteratorUtils.toList(output); } List<String> getResourceNameList(String pipeName){ - return CollectionUtils.transform(getResourceList(pipeName), o -> ((Resource)o).getName()); + return getResourceList(pipeName).stream().map(o -> o.getName()).collect(Collectors.toList()); } private void assertListEquals(List<String> tested, String... expected){
