This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git
The following commit(s) were added to refs/heads/master by this push:
new bceb36f SLING-9605 Upgrade to parent 39
new d1a2c81 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager
bceb36f is described below
commit bceb36f28e3f0ad0ecec2d17c5f6b2b66f422dcd
Author: Eric Norman <[email protected]>
AuthorDate: Sun Jul 26 12:58:40 2020 -0700
SLING-9605 Upgrade to parent 39
---
bnd.bnd | 7 +++++++
pom.xml | 36 +++++++++++++++++++-----------------
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..005c796
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,7 @@
+-includeresource:\
+
@org.apache.sling.servlets.post-*.jar!/org/apache/sling/servlets/post/impl/helper/(RequestProperty*|DateParser*|MediaRangeList*),\
+ ${project.build.directory}/adapter-plugin-generated
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index f978f36..fed51cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,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.jcr.jackrabbit.usermanager</artifactId>
- <packaging>bundle</packaging>
<version>2.2.9-SNAPSHOT</version>
<name>Apache Sling Jackrabbit UserManager Support</name>
<description>
@@ -47,7 +46,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,26 +57,29 @@
</execution>
</executions>
</plugin>
+
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>
-
org.apache.sling.servlets.post;inline="org/apache/sling/servlets/post/impl/helper/RequestProperty*
-
|org/apache/sling/servlets/post/impl/helper/DateParser*
-
|org/apache/sling/servlets/post/impl/helper/JSONResponse*
-
|org/apache/sling/servlets/post/impl/helper/MediaRangeList*"
- </Embed-Dependency>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
