[Build] Unify bnd-maven-plugin and maven-jar-plugin invocations (#509)

Keep the 'bnd' configuration for the bnd-maven-plugin at plugin level to simplify overwrites in sub-modules (avoid the need to re-specify the execution there). Additionally update to bnd-maven-plugin 6.4.0 Co-authored-by: Hannes Wellmann <hannes.wellmann@iils.de>
apache · Jun 21, 2024 · 7466cae · 7466cae
1 parent 6e6bf7e
commit 7466cae
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 221 deletions.
diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml
@@ -60,19 +60,6 @@
  <groupId>com.github.siom79.japicmp</groupId>
  <artifactId>japicmp-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml
@@ -92,19 +92,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -74,18 +74,6 @@
  </dependency>
  </dependencies>
 
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!-- This is needed to prevent jar plugin to fail based on wrong automatic module name. -->
- <archive combine.self="override" />
- </configuration>
- </plugin>
- </plugins>
- </build>
  <profiles>
  <profile>
  <id>run-its</id>

diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml
@@ -37,14 +37,20 @@
  <module>maven-resolver-demo-maven-plugin</module>
  </modules>
 
+ <properties>
+ <!-- the child modules are just source code demos and not to be shared as artifacts -->
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <bnd.skip>true</bnd.skip>
+ </properties>
  <build>
  <pluginManagement>
  <plugins>
  <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
  <configuration>
- <!-- the child modules are just source code demos and not to be shared as artifacts -->
- <skip>true</skip>
+ <!-- This is needed to prevent jar plugin to fail due to a missing manifest and wrong automatic module name. -->
+ <archive combine.self="override" />
  </configuration>
  </plugin>
  </plugins>

diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
@@ -113,19 +113,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-named-locks-hazelcast/pom.xml b/maven-resolver-named-locks-hazelcast/pom.xml
@@ -95,19 +95,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 

diff --git a/maven-resolver-named-locks-redisson/pom.xml b/maven-resolver-named-locks-redisson/pom.xml
@@ -119,19 +119,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-assembly-plugin</artifactId>

diff --git a/maven-resolver-named-locks/pom.xml b/maven-resolver-named-locks/pom.xml
@@ -79,19 +79,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml
@@ -59,19 +59,6 @@
  <groupId>com.github.siom79.japicmp</groupId>
  <artifactId>japicmp-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-supplier/pom.xml b/maven-resolver-supplier/pom.xml
@@ -133,21 +133,4 @@
  </dependency>
  </dependencies>
 
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
 </project>
diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml
@@ -57,21 +57,4 @@
  </dependency>
  </dependencies>
 
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
 </project>
diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml
@@ -83,19 +83,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml
@@ -88,19 +88,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml
@@ -152,19 +152,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml
@@ -118,19 +118,6 @@
  <groupId>org.eclipse.sisu</groupId>
  <artifactId>sisu-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml
@@ -64,19 +64,6 @@
  <groupId>com.github.siom79.japicmp</groupId>
  <artifactId>japicmp-maven-plugin</artifactId>
  </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
  </plugins>
  </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -468,28 +468,23 @@
  <plugin>
  <groupId>biz.aQute.bnd</groupId>
  <artifactId>bnd-maven-plugin</artifactId>
- <version>6.3.1</version>
- <executions>
- <execution>
- <id>bnd-process</id>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- <configuration>
- <bnd>Bundle-SymbolicName: ${Bundle-SymbolicName}
- # Export packages not containing the substring 'internal'
- -exportcontents: ${removeall;${packages};${packages;NAMED;*internal*}}
- # Reproducible build
- -noextraheaders: true</bnd>
- </configuration>
- </execution>
- </executions>
+ <version>6.4.0</version>
+ <configuration>
+ <bnd><![CDATA[
+ Bundle-SymbolicName: ${Bundle-SymbolicName}
+ # Export packages not containing the substring 'internal'
+ -exportcontents: ${removeall;${packages};${packages;NAMED;*internal*}}
+ # Reproducible build
+ -noextraheaders: true
+ ]]></bnd>
+ </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
  <configuration>
  <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
  <manifestEntries>
  <Automatic-Module-Name>${Automatic-Module-Name}</Automatic-Module-Name>
  </manifestEntries>
@@ -499,6 +494,18 @@
  </plugins>
  </pluginManagement>
  <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.codehaus.mojo</groupId>
  <artifactId>animal-sniffer-maven-plugin</artifactId>