This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new abbbe23 Revert "[SSHD-1092] Keep osgi metadata only for sshd-osgi"
abbbe23 is described below
commit abbbe232ffc4b6293d3011cc83d073e32d162396
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Oct 20 16:34:50 2020 +0200
Revert "[SSHD-1092] Keep osgi metadata only for sshd-osgi"
This reverts commit a06cc51cf1abed7f20aecc781d7bfd61e6a8537f.
---
pom.xml | 23 +++++++++++++++++++++++
sshd-osgi/pom.xml | 30 ------------------------------
2 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index faf3ee2..08b8463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1347,6 +1347,23 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+
<Export-Package>*;-noimport:=true</Export-Package>
+ </instructions>
+ <noWarningProjectTypes>pom</noWarningProjectTypes>
+ </configuration>
+ </execution>
+ </executions>
<!-- NOTE: do not upgrade maven-archiver plugin
dependency for this plugin in order to avoid
@@ -1363,6 +1380,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
+ <inherited>true</inherited>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml
index 0e1e978..0ad75fb 100644
--- a/sshd-osgi/pom.xml
+++ b/sshd-osgi/pom.xml
@@ -101,36 +101,6 @@
</executions>
</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.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
-
<Export-Package>*;-noimport:=true</Export-Package>
- </instructions>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- We need special build instructions for the sources JAR
since this is a 'shaded' JAR constructed from the already
compiled classes of its component modules -->
