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


The following commit(s) were added to refs/heads/master by this push:
     new e841441  @releng Update to parent pom 38
e841441 is described below

commit e841441193a35079959500566f5fef0817d4fd47
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Fri Feb 21 07:13:58 2020 +0100

    @releng Update to parent pom 38
---
 bnd.bnd |  1 +
 pom.xml | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..9a633d8
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+-conditionalpackage: org.apache.felix.utils.*
diff --git a/pom.xml b/pom.xml
index ca979b3..8e1e726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>38</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.feature</artifactId>
     <version>1.1.3-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Feature</name>
     <description>
@@ -44,18 +43,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Conditional-Package>
-                            org.apache.felix.utils.*,
-                        </Conditional-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>

Reply via email to