This is an automated email from the ASF dual-hosted git repository. jsedding pushed a commit to branch resolver-2.x-backports in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit 91d12faebd8cda30473cb01650e4607cd7546c63 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Mar 28 15:28:48 2025 +0100 SLING-12726 Update to Parent 62 (cherry picked from commit ec016b2347634d556d36bc7f326fa3a74cd30c54) --- .sling-module.json | 5 +++++ pom.xml | 30 +++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.sling-module.json b/.sling-module.json new file mode 100644 index 0000000..0419030 --- /dev/null +++ b/.sling-module.json @@ -0,0 +1,5 @@ +{ + "jenkins": { + "jdks": [17] + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index d7b75ba..d91ad08 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>49</version> + <version>62</version> <relativePath /> </parent> @@ -251,7 +251,22 @@ </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>org.osgi.service.cm</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.tracker</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -269,16 +284,17 @@ <artifactId>org.osgi.annotation.bundle</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.healthcheck.api</artifactId> <version>2.0.4</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Testing --> <dependency>
