This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-12534-parent-62 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-test-services.git
commit 32f378b4db7259fb44666e5b63ce094826e2f2ae Author: Stefan Seifert <[email protected]> AuthorDate: Tue Dec 10 12:40:49 2024 +0100 SLING-12534 Switch to Parent 62, Java 11 --- .sling-module.json | 5 +++++ pom.xml | 30 ++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.sling-module.json b/.sling-module.json new file mode 100644 index 0000000..cfad4d2 --- /dev/null +++ b/.sling-module.json @@ -0,0 +1,5 @@ +{ + "jenkins": { + "jdks": [17, 21] + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3989e62..cb37685 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>46</version> + <version>62</version> <relativePath /> </parent> @@ -39,12 +39,14 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-test-services.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-test-services.git</developerConnection> <url>https://github.com/apache/sling-org-apache-sling-launchpad-test-services.git</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> <properties> + <sling.java.version>11</sling.java.version> <project.build.outputTimestamp>2022-02-25T16:00:25Z</project.build.outputTimestamp> </properties> + <build> <plugins> <plugin> @@ -65,8 +67,7 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.annotation</artifactId> - <version>6.0.1</version> + <artifactId>org.osgi.annotation.versioning</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -90,6 +91,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -101,21 +103,25 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> <version>2.24.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> <version>2.4.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.scripting.api</artifactId> <version>2.1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.models.api</artifactId> <version>1.3.6</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -127,23 +133,28 @@ <groupId>org.apache.sling</groupId> <artifactId>adapter-annotations</artifactId> <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.servlets.post</artifactId> <version>2.1.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -178,8 +189,15 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.servlets.annotations</artifactId> <version>1.2.6</version> + <scope>provided</scope> </dependency> - + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + <scope>provided</scope> + </dependency> + </dependencies> </project>
