This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit 2ab428d38fbdbaa9cc3215481af9043849207054 Author: Konrad Windszus <[email protected]> AuthorDate: Fri Oct 10 18:10:56 2025 +0200 SLING-12261 Use Parent 62 Update dependencies to be compliant with Sling Mock 3.x --- .sling-module.json | 3 +- pom.xml | 100 +++++++++++++-------- .../sling/event/impl/jobs/JobManagerImplTest.java | 2 +- 3 files changed, 64 insertions(+), 41 deletions(-) diff --git a/.sling-module.json b/.sling-module.json index 8b0fb37..35477b9 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -1,5 +1,6 @@ { "jenkins": { - "buildTimeout": 60 + "buildTimeout": 60, + "jdks": [17, 21] } } diff --git a/pom.xml b/pom.xml index ee26cfa..07c5717 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>48</version> + <version>62</version> <relativePath /> </parent> @@ -47,8 +47,7 @@ <min.port>37000</min.port> <max.port>37999</max.port> <project.build.outputTimestamp>2025-06-04T08:33:29Z</project.build.outputTimestamp> - <!-- Mockito does no longer support Java 8 --> - <minimalJavaBuildVersion>11</minimalJavaBuildVersion> + <sling.java.version>8</sling.java.version> </properties> @@ -144,12 +143,34 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.event</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.condition</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.discovery.api</artifactId> @@ -165,14 +186,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -183,13 +197,19 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.11.0</version> + <version>2.25.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.event.api</artifactId> + <version>1.0.4</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.osgi</artifactId> - <version>2.1.0</version> + <version>2.4.0</version> <scope>provided</scope> </dependency> <dependency> @@ -213,13 +233,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.serviceusermapper</artifactId> - <version>1.2.0</version> + <version>1.5.4</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>2.11.2</version> + <version>2.20.9</version> <scope>provided</scope> </dependency> <dependency> @@ -232,11 +252,32 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <!-- Testing --> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> + <version>3.1.0-1.40.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> + <version>3.5.4</version> + <scope>test</scope> + </dependency> + <!-- transitive dependency of sling-mock, otherwise ancient version from commons.testing takes precedence--> + <dependency> + <artifactId>org.apache.sling.jcr.api</artifactId> + <groupId>org.apache.sling</groupId> + <version>2.4.0</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -261,18 +302,6 @@ <version>2.0.20</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> - <version>2.2.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> - <version>3.1.0-1.40.0</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> @@ -297,16 +326,11 @@ <artifactId>javax.inject</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.event.api</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.testing</artifactId> <version>2.0.10</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -332,7 +356,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - <version>4.13.1</version> </dependency> <dependency> <groupId>org.jmock</groupId> @@ -379,11 +402,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.service.condition</artifactId> - <version>1.0.0</version> - <scope>provided</scope> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.19.0</version> + <scope>test</scope> </dependency> - </dependencies> </project> diff --git a/src/test/java/org/apache/sling/event/impl/jobs/JobManagerImplTest.java b/src/test/java/org/apache/sling/event/impl/jobs/JobManagerImplTest.java index fb391d5..991dc1f 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/JobManagerImplTest.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/JobManagerImplTest.java @@ -32,7 +32,7 @@ import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.event.impl.TestUtil;
