This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit aa9842bbba6990cf8b4dfb8fdf321b56fef01731 Author: Konrad Windszus <[email protected]> AuthorDate: Fri Mar 1 16:58:42 2024 +0100 SLING-12261 Update to sling-bundle-parent 60 Fix dependencies --- pom.xml | 57 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 8b8a7be..3644b17 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>60</version> <relativePath /> </parent> @@ -38,7 +38,6 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git</developerConnection> <url>https://github.com/apache/sling-org-apache-sling-event.git</url> - <tag>org.apache.sling.event-4.3.12</tag> </scm> <properties> @@ -46,6 +45,7 @@ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> <min.port>37000</min.port> <max.port>37999</max.port> + <sling.java.version>11</sling.java.version> <project.build.outputTimestamp>2023-10-05T16:16:32Z</project.build.outputTimestamp> </properties> @@ -142,6 +142,12 @@ <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> @@ -163,14 +169,17 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> + <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> + <artifactId>org.osgi.service.event</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -181,13 +190,19 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.11.0</version> + <version>2.22.0</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> @@ -211,7 +226,7 @@ <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> @@ -230,11 +245,13 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <!-- Testing --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -261,14 +278,14 @@ </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> - <version>2.2.6</version> + <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-oak</artifactId> - <version>3.1.0-1.40.0</version> + <artifactId>org.apache.sling.testing.sling-mock</artifactId> + <version>3.4.18</version> <scope>test</scope> </dependency> <dependency> @@ -295,17 +312,6 @@ <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> - </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.paxexam</artifactId> @@ -330,13 +336,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - <version>4.13.1</version> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>2.8.2</version> - <scope>test</scope> </dependency> <!-- Pax Exam -->
