You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/01/27 10:21:53 UTC

[sling-org-apache-sling-jcr-packageinit] 23/25: SLING-10089 - updating to latest parent pom including switch to bnd plugin

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

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

commit ee9561d7f629a2a91036bcfa82f3147081873c02
Author: Dominik Suess <su...@adobe.com>
AuthorDate: Tue Jan 26 16:24:34 2021 +0100

    SLING-10089 - updating to latest parent pom including switch to bnd plugin
---
 pom.xml | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index f897480..9ff07d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
 
   <parent>
     <groupId>org.apache.sling</groupId>
-    <artifactId>sling</artifactId>
-    <version>34</version>
+    <artifactId>sling-bundle-parent</artifactId>
+    <version>40</version>
     <relativePath />
   </parent>
 
   <artifactId>org.apache.sling.jcr.packageinit</artifactId>
-  <packaging>bundle</packaging>
   <version>1.0.1-SNAPSHOT</version>
   <name>Apache Sling JCR Package Initializer module</name>
   <description>
@@ -42,37 +41,14 @@
     </scm>
     <build>
         <plugins>
+         <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before unit test runs -->
-                    <execution>
-                        <id>scr-metadata</id>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                        <configuration>
-                            <supportIncrementalBuild>true</supportIncrementalBuild>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- Export SCR metadata to classpath to have them available in unit tests -->
-                    <exportScr>true</exportScr>
-                    <instructions>
-                        <!-- Enable processing of OSGI DS component annotations -->
-                        <_dsannotations>*</_dsannotations>
-                        <!-- Enable processing of OSGI metatype annotations -->
-                        <_metatypeannotations>*</_metatypeannotations>
-                        <Private-Package>
-                            org.apache.sling.jcr.packageinit.impl
-                        </Private-Package>
-                    </instructions>
-                 </configuration>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
             </plugin>
-          
         </plugins>
     </build>