You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/22 11:24:39 UTC

[sling-org-apache-sling-rewriter] 02/02: SLING-7420 Use bnd Maven plugins

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-rewriter.git

commit 8c4463e1918a590eefd1edb2f6ddc66a3ccd89f2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 12:24:29 2018 +0100

    SLING-7420 Use bnd Maven plugins
---
 bnd.bnd | 23 +++++++++++++++++++++++
 pom.xml | 22 ++++++----------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..7dcd3be
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,23 @@
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+Import-Package:\
+  org.apache.cocoon.components.serializers.util;resolution:=optional,\
+  *
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-removeheaders:\
+  Embed-Dependency,\
+  Embed-Transitive,\
+  Include-Resource,\
+  Private-Package
diff --git a/pom.xml b/pom.xml
index d71295e..4065597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
 
     <artifactId>org.apache.sling.rewriter</artifactId>
     <version>1.2.3-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Rewriter</name>
     <description>
@@ -51,8 +50,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
+                <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.sling</groupId>
@@ -68,19 +71,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Category>sling</Bundle-Category>
-                        <Import-Package>
-                            org.apache.cocoon.components.serializers.util;resolution:=optional,*
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.