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-integration-tests.git
commit 0721935a12ec557b6ae2583c45e83ef555de6d14 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Dec 10 13:18:28 2024 +0100 SLING-12534 Switch to Parent 62, Java 11 --- .sling-module.json | 5 +++++ pom.xml | 53 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 21 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 86e5e44..50fece5 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>48</version> + <version>62</version> <relativePath /> </parent> @@ -35,7 +35,7 @@ </description> <properties> - <sling.java.version>8</sling.java.version> + <sling.java.version>11</sling.java.version> <!-- HTTP port of Sling instance to test --> <http.port>8080</http.port> @@ -87,13 +87,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> @@ -178,12 +171,6 @@ <version>1.1.2</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.9.12</version> - <scope>compile</scope> - </dependency> <!-- for DavExIntegrationTest --> @@ -217,11 +204,13 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-api</artifactId> <version>${jackrabbit.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <version>${jackrabbit.version}</version> + <scope>provided</scope> </dependency> <!-- Dependencies for the Test Build and Run --> @@ -229,6 +218,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.testing</artifactId> <version>2.1.2</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -256,41 +246,49 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>4.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> <version>4.3</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.5.13</version> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.5</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.servlets.post</artifactId> <version>2.3.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> <version>2.3.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.classloader</artifactId> <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.osgi</artifactId> <version>2.1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -299,14 +297,16 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <version>1.9.0</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.cmpn</artifactId> - <version>6.0.0</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.cm</artifactId> + <version>1.6.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -336,31 +336,37 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.base</artifactId> <version>3.0.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> <version>3.0.8</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.tools</artifactId> <version>1.0.16</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.junit.remote</artifactId> <version>1.0.12</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.junit.core</artifactId> <version>1.0.28</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.junit.teleporter</artifactId> <version>1.0.20</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>commons-io</groupId> @@ -378,26 +384,31 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.test-services</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.api</artifactId> <version>1.2.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.installer.core</artifactId> <version>3.6.6</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>3.0.9</version> + <scope>provided</scope> </dependency> </dependencies> </project>
