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 2019/10/01 18:08:09 UTC
[sling-org-apache-sling-servlets-post] branch master updated:
SLING-8756 : Upgrade to parent pom 35
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-servlets-post.git
The following commit(s) were added to refs/heads/master by this push:
new 34977de SLING-8756 : Upgrade to parent pom 35
34977de is described below
commit 34977deaadd96f767664fe4465819819f31fb15d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 1 20:07:52 2019 +0200
SLING-8756 : Upgrade to parent pom 35
---
bnd.bnd | 22 ++++++++++++++++++++++
pom.xml | 55 +++++++++++++++++++++++++------------------------------
2 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..5dc7f5b
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,22 @@
+Import-Package: javax.jcr;resolution:=optional,\
+ javax.jcr.nodetype;resolution:=optional,\
+ javax.jcr.version;resolution:=optional,\
+ org.apache.sling.jcr.contentloader;resolution:=optional,\
+ *
+
+Sling-Bundle-Resources: /system/sling.js
+
+Sling-Namespaces: sling=http://sling.apache.org/jcr/sling/1.0
+
+Sling-Nodetypes: SLING-INF/nodetypes/chunk.cnd
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource:\
+ @jackrabbit-jcr-commons-*.jar!/org/apache/jackrabbit/util/ISO8601.class,\
+ @jackrabbit-jcr-commons-*.jar!/org/apache/jackrabbit/util/Text.class,\
+ @org.apache.sling.jcr.contentparser-*.jar!/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.class
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c484334..dab35ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>32</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.servlets.post</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>2.3.33-SNAPSHOT</version>
<name>Apache Sling Default POST Servlets</name>
@@ -49,33 +49,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- javax.jcr;resolution:=optional,
- javax.jcr.nodetype;resolution:=optional,
- javax.jcr.version;resolution:=optional,
- org.apache.sling.jcr.contentloader;resolution:=optional,
- *
- </Import-Package>
- <Sling-Bundle-Resources>
- /system/sling.js
- </Sling-Bundle-Resources>
- <Embed-Dependency>
- jackrabbit-jcr-commons;inline=org/apache/jackrabbit/util/ISO8601.class|org/apache/jackrabbit/util/Text.class,
- org.apache.sling.jcr.contentparser;inline=org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.class
- </Embed-Dependency>
- <Sling-Namespaces>
- sling=http://sling.apache.org/jcr/sling/1.0
- </Sling-Namespaces>
- <Sling-Nodetypes>
- SLING-INF/nodetypes/chunk.cnd
- </Sling-Nodetypes>
- </instructions>
- </configuration>
+ <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>
@@ -130,9 +109,25 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>