You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/09/07 09:26:08 UTC
[sling-org-apache-sling-fsresource] branch master updated: Update
to latest parent pom
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
The following commit(s) were added to refs/heads/master by this push:
new e5ca56f Update to latest parent pom
e5ca56f is described below
commit e5ca56f58c00f913ef99fb93e154afeba5aaf1dd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Sep 7 11:23:30 2020 +0200
Update to latest parent pom
---
bnd.bnd | 2 ++
pom.xml | 20 +++-----------------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..5cb1719
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Packages: !org.apache.sling.jcr.contentparser,*
+-includeresource: @org.apache.sling.jcr.contentparser-[0-9.]*.jar
diff --git a/pom.xml b/pom.xml
index b474ef2..79d0fc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>39</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.fsresource</artifactId>
- <packaging>bundle</packaging>
<version>2.1.17-SNAPSHOT</version>
<name>Apache Sling File System Resource Provider</name>
@@ -46,7 +45,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>
@@ -58,19 +57,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- Embed fscontentparser -->
- <Embed-Dependency>
- org.apache.sling.jcr.contentparser;scope=compile;inline=false
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>