You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2022/04/29 12:42:00 UTC

[sling-parent] 01/01: make use of bnd:jar goal (introduced with bnd 6.2.0) move bnd plugin configuration out of executions section to apply it to both executions

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

sseifert pushed a commit to branch feature/SLING-11291-bnd-jar-goal
in repository https://gitbox.apache.org/repos/asf/sling-parent.git

commit b0e7d56687fef96065ddb56051a4f65c31652a20
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Apr 29 14:21:10 2022 +0200

    make use of bnd:jar goal (introduced with bnd 6.2.0)
    move bnd plugin configuration out of executions section to apply it to both executions
---
 sling-bundle-parent/pom.xml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml
index 21f161e..9ab900e 100644
--- a/sling-bundle-parent/pom.xml
+++ b/sling-bundle-parent/pom.xml
@@ -55,14 +55,9 @@
                     <groupId>biz.aQute.bnd</groupId>
                     <artifactId>bnd-maven-plugin</artifactId>
                     <version>${bnd.version}</version>
-                    <executions>
-                        <execution>
-                            <id>bnd-process</id>
-                            <goals>
-                                <goal>bnd-process</goal>
-                            </goals>
-                            <configuration>
-                                <bnd><![CDATA[
+                    <extensions>true</extensions>
+                    <configuration>
+                        <bnd><![CDATA[
 # a lot of bundle header are generated from pom elements by default: https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin#default-bundle-headers
 Bundle-Category: sling
 
@@ -82,8 +77,20 @@ Bundle-DocURL: https://sling.apache.org
 -fixupmessages:"Export *,  has \\d+,  private references"; \
     restrict:=warning; \
     is:=error
-                                ]]></bnd>
-                            </configuration>
+                        ]]></bnd>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>bnd-process</id>
+                            <goals>
+                                <goal>bnd-process</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>bnd-jar</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
                         </execution>
                     </executions>
                 </plugin>
@@ -108,14 +115,6 @@ Bundle-DocURL: https://sling.apache.org
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        </archive>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>