This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/update-to-parent40 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-resource.git
commit a1ddc1249d8081e0f5c3bb1e347181cf144b1b2a Author: Konrad Windszus <[email protected]> AuthorDate: Wed Dec 23 15:23:47 2020 +0100 SLING-10010 update to sling-bundle-parent 40 --- bnd.bnd | 4 ++++ pom.xml | 53 +++++++++++++---------------------------------------- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/bnd.bnd b/bnd.bnd new file mode 100644 index 0000000..c428e96 --- /dev/null +++ b/bnd.bnd @@ -0,0 +1,4 @@ +Import-Package: org.apache.sling.scripting.api.*;resolution:=optional,* +-conditionalpackage: org.apache.jackrabbit.util,org.apache.jackrabbit.name +Sling-Namespaces: sling=http://sling.apache.org/jcr/sling/1.0 +Sling-Nodetypes: SLING-INF/nodetypes/folder.cnd,SLING-INF/nodetypes/resource.cnd,SLING-INF/nodetypes/vanitypath.cnd,SLING-INF/nodetypes/redirect.cnd,SLING-INF/nodetypes/mapping.cnd \ No newline at end of file diff --git a/pom.xml b/pom.xml index aa47b79..f30b130 100644 --- a/pom.xml +++ b/pom.xml @@ -21,14 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>34</version> + <artifactId>sling-bundle-parent</artifactId> + <version>40</version> <relativePath /> </parent> <artifactId>org.apache.sling.jcr.resource</artifactId> <version>3.0.23-SNAPSHOT</version> - <packaging>bundle</packaging> <name>Apache Sling JCR Resource</name> <description> @@ -53,7 +52,7 @@ <plugins> <plugin> <groupId>org.apache.sling</groupId> - <artifactId>maven-sling-plugin</artifactId> + <artifactId>sling-maven-plugin</artifactId> <executions> <execution> <id>generate-adapter-metadata</id> @@ -61,39 +60,13 @@ <goals> <goal>generate-adapter-metadata</goal> </goals> + <configuration> + <!-- relying on https://issues.apache.org/jira/browse/MNG-5001 until https://issues.apache.org/jira/browse/SLING-10022 --> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + </configuration> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Import-Package> - org.apache.sling.scripting.api.*;resolution:=optional, - * - </Import-Package> - - <!-- Include utility classes from Jackrabbit JCR Commons --> - <Embed-Dependency> - jackrabbit-jcr-commons;inline="org/apache/jackrabbit/util/ISO8601.*|org/apache/jackrabbit/util/ISO9075.*|org/apache/jackrabbit/name/QName.*|org/apache/jackrabbit/util/XMLChar.*|org/apache/jackrabbit/util/Text.*", - </Embed-Dependency> - - <Sling-Namespaces> - sling=http://sling.apache.org/jcr/sling/1.0 - </Sling-Namespaces> - - <Sling-Nodetypes> - SLING-INF/nodetypes/folder.cnd, - SLING-INF/nodetypes/resource.cnd, - SLING-INF/nodetypes/vanitypath.cnd, - SLING-INF/nodetypes/redirect.cnd, - SLING-INF/nodetypes/mapping.cnd - </Sling-Nodetypes> - </instructions> - </configuration> - </plugin> </plugins> </build> @@ -113,30 +86,26 @@ <!-- OSGi --> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> + <artifactId>org.osgi.framework</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.versioning</artifactId> - <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> - <version>1.3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.metatype.annotations</artifactId> - <version>1.3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component</artifactId> - <version>1.3.0</version> <scope>provided</scope> </dependency> <!-- Jackrabbit / Oak --> @@ -214,7 +183,6 @@ <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> - <version>16.0.2</version> <scope>provided</scope> </dependency> @@ -251,6 +219,11 @@ </dependency> <dependency> <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> <scope>test</scope> </dependency>
