You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/12/05 15:28:18 UTC

[sling-org-apache-sling-feature-analyser] 01/01: SLING-8878 - org.apache.sling.feature.analyser - upgrade to parent 35

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

rombert pushed a commit to branch feature/SLING-8878
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git

commit 2bce7a0e184f87a68c74a2356984b37e5e11868d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Dec 5 16:27:36 2019 +0100

    SLING-8878 - org.apache.sling.feature.analyser - upgrade to parent 35
---
 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..945b08b
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Conditional-Package: org.apache.felix.utils.*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 925019c..419d542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
         <relativePath />
     </parent>
 
@@ -29,7 +29,6 @@
         A feature describes an OSGi system
     </description>
 
-    <packaging>bundle</packaging>
     <properties>
         <sling.java.version>8</sling.java.version>
     </properties>
@@ -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>