[sling-org-apache-sling-resourceresolver] branch master updated: SLING-7665 Use bnd Maven plugins

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 85c1913  SLING-7665 Use bnd Maven plugins
85c1913 is described below

commit 85c19139cfe5f174b65b2daf3791bc4af650ce1b
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Thu Aug 9 22:04:44 2018 +0200

    SLING-7665 Use bnd Maven plugins
---
 bnd.bnd | 17 +++++++++++++++++
 pom.xml | 27 +++++++--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..6e8ad2b
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,17 @@
+Import-Package:\
+  javax.jcr;resolution:=optional,\
+  *
+
+Provide-Capability:\
+  osgi.service;objectClass=javax.servlet.Servlet,\
+  
osgi.service;objectClass=org.apache.sling.api.resource.ResourceResolverFactory,\
+  
osgi.service;objectClass=org.apache.sling.api.resource.observation.ResourceChangeListener,\
+  
osgi.service;objectClass=org.apache.sling.api.resource.runtime.RuntimeService,\
+  
osgi.service;objectClass=org.apache.sling.spi.resource.provider.ResourceProvider
+
+Require-Capability:\
+  
osgi.service;filter:="(objectClass=org.osgi.service.event.EventHandler)";effective:=active;resolution:=optional
+
+-removeheaders:\
+  Include-Resource,\
+  Private-Package
diff --git a/pom.xml b/pom.xml
index a9d1fd6..9bd4eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>33</version>
+        <version>34</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.resourceresolver</artifactId>
     <version>1.6.5-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Resource Resolver</name>
     <description>
@@ -64,24 +63,12 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            javax.jcr;resolution:=optional,
-                            *
-                        </Import-Package>
-                        <Provide-Capability>
-                            osgi.service;objectClass=javax.servlet.Servlet,
-                            
osgi.service;objectClass=org.apache.sling.api.resource.ResourceResolverFactory,
-                            
osgi.service;objectClass=org.apache.sling.api.resource.observation.ResourceChangeListener,
-                            
osgi.service;objectClass=org.apache.sling.api.resource.runtime.RuntimeService,
-                            
osgi.service;objectClass=org.apache.sling.spi.resource.provider.ResourceProvider
-                        </Provide-Capability>
-                    </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>