This is an automated email from the ASF dual-hosted git repository. radu pushed a commit to branch issue/osgi-registrations in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 8e131c85f6023cf4cbda7f04445e72be4466c4e1 Author: Radu Cotescu <[email protected]> AuthorDate: Tue Feb 14 10:03:15 2023 +0100 SLING-11775 - Update the Sling Resource Merger to parent pom version 49 --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 328b169..b650054 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>41</version> + <version>49</version> <relativePath /> </parent> @@ -51,22 +51,27 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.versioning</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <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.apache.sling</groupId> @@ -85,10 +90,16 @@ <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> <!-- Testing --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId>
