This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
commit 28410449452f7ea8964eb2d984a7146ecff5d130 Author: Konrad Windszus <[email protected]> AuthorDate: Thu Aug 29 10:16:38 2024 +0200 Update to sling-bundle-parent 60 Fix reproducible build issues (due to newer depends-m-p) --- .sling-module.json | 8 ++++++++ pom.xml | 36 +++++++++++++++--------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.sling-module.json b/.sling-module.json new file mode 100644 index 0000000..d4268ec --- /dev/null +++ b/.sling-module.json @@ -0,0 +1,8 @@ +{ + "jenkins": { + "jdks": [ + 17, + 21 + ] + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3cd47c7..6df012d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>46</version> + <version>60</version> <relativePath /> </parent> @@ -39,6 +39,7 @@ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> <jackrabbit.version>2.20.0</jackrabbit.version> <oak.version>1.22</oak.version> + <sling.java.version>8</sling.java.version> </properties> <scm> @@ -59,14 +60,6 @@ </excludes> </configuration> </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-baseline-maven-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -76,10 +69,6 @@ </excludePackageNames> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -114,11 +103,6 @@ <dependencies> <!-- javax --> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -132,7 +116,12 @@ </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.util.tracker</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -143,7 +132,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.http.whiteboard</artifactId> - <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> @@ -182,6 +170,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -195,6 +184,7 @@ <version>1.4.6</version> <scope>provided</scope> </dependency> + <!-- Testing --> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.paxexam</artifactId> @@ -208,7 +198,11 @@ <version>7.0.5</version> <scope>test</scope> </dependency> - <!-- Testing --> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId>
