You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/10/02 17:34:41 UTC
[maven-resolver] 01/01: [MRESOLVER-136] Migrate from
maven-bundle-plugin to bnd-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-136
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 69241af3a7066a62f9fa6138d61362428d18462b
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Sep 14 21:06:03 2020 +0200
[MRESOLVER-136] Migrate from maven-bundle-plugin to bnd-maven-plugin
This closes #71
---
maven-resolver-api/pom.xml | 6 ++--
maven-resolver-connector-basic/pom.xml | 6 ++--
maven-resolver-impl/pom.xml | 6 ++--
maven-resolver-spi/pom.xml | 6 ++--
maven-resolver-synccontext-global/pom.xml | 6 ++--
maven-resolver-synccontext-redisson/pom.xml | 6 ++--
maven-resolver-test-util/pom.xml | 6 ++--
maven-resolver-transport-classpath/pom.xml | 6 ++--
maven-resolver-transport-file/pom.xml | 6 ++--
maven-resolver-transport-http/pom.xml | 6 ++--
maven-resolver-transport-wagon/pom.xml | 6 ++--
maven-resolver-util/pom.xml | 6 ++--
pom.xml | 53 +++++++++++++++++++----------
13 files changed, 71 insertions(+), 54 deletions(-)
diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml
index b9a69cf..5421a43 100644
--- a/maven-resolver-api/pom.xml
+++ b/maven-resolver-api/pom.xml
@@ -62,15 +62,15 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml
index 497df82..aba0bf0 100644
--- a/maven-resolver-connector-basic/pom.xml
+++ b/maven-resolver-connector-basic/pom.xml
@@ -98,15 +98,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index 2fb75d1..88ebb4e 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -110,15 +110,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml
index 2978a08..81450cf 100644
--- a/maven-resolver-spi/pom.xml
+++ b/maven-resolver-spi/pom.xml
@@ -60,15 +60,15 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-synccontext-global/pom.xml b/maven-resolver-synccontext-global/pom.xml
index 91a33de..01f274d 100644
--- a/maven-resolver-synccontext-global/pom.xml
+++ b/maven-resolver-synccontext-global/pom.xml
@@ -74,15 +74,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-synccontext-redisson/pom.xml b/maven-resolver-synccontext-redisson/pom.xml
index 78cf7f4..4a90e3d 100644
--- a/maven-resolver-synccontext-redisson/pom.xml
+++ b/maven-resolver-synccontext-redisson/pom.xml
@@ -83,15 +83,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml
index cb88fbf..9e36ce3 100644
--- a/maven-resolver-test-util/pom.xml
+++ b/maven-resolver-test-util/pom.xml
@@ -64,15 +64,15 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml
index d6a4ddf..0336ff4 100644
--- a/maven-resolver-transport-classpath/pom.xml
+++ b/maven-resolver-transport-classpath/pom.xml
@@ -89,15 +89,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml
index 24665a8..8a04feb 100644
--- a/maven-resolver-transport-file/pom.xml
+++ b/maven-resolver-transport-file/pom.xml
@@ -94,15 +94,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml
index 8e6f7ac..83df3be 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -147,15 +147,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml
index f97fe3b..127ac96 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -120,15 +120,15 @@
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml
index 58e23b0..88b66b8 100644
--- a/maven-resolver-util/pom.xml
+++ b/maven-resolver-util/pom.xml
@@ -65,15 +65,15 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <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.directory}/osgi/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index eb1d592..eafd5f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,28 +349,24 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.1</version>
- <!-- 4.0/4.1 depends on bndlib that contains aQute/bnd/osgi/Analyzer Java 8 classes
- 4.2.0 requires Maven 3+ and Java 8 -->
- <configuration>
- <manifestLocation>${project.build.directory}/osgi</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${Bundle-SymbolicName}</Bundle-SymbolicName>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <_removeheaders>Bnd-LastModified,Include-Resource</_removeheaders>
- <!-- Export all packages except those with "internal" in their names -->
- <_exportcontents>!*internal*,*</_exportcontents>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.1.2</version>
<executions>
<execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
+ <id>bnd-process</id>
<goals>
- <goal>manifest</goal>
+ <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>
</plugin>
@@ -387,6 +383,27 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-minimum-java-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.8.0</version><!-- for bnd-maven-plugin -->
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>