You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2020/10/20 14:50:10 UTC
[mina-sshd] branch master updated: [SSHD-1092] Remove OSGi metadata
from sshd-common and sshd-core
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 b38674a [SSHD-1092] Remove OSGi metadata from sshd-common and sshd-core
b38674a is described below
commit b38674a4f27a673ee88670914866765b862f5c4d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Oct 20 16:49:51 2020 +0200
[SSHD-1092] Remove OSGi metadata from sshd-common and sshd-core
---
pom.xml | 13 +++++++++++++
sshd-common/pom.xml | 14 ++++++++++++++
sshd-core/pom.xml | 19 +++++++++++++++++++
3 files changed, 46 insertions(+)
diff --git a/pom.xml b/pom.xml
index 08b8463..03639d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1351,6 +1351,18 @@
<extensions>true</extensions>
<executions>
<execution>
+ <id>versions</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <sshd.osgi.version.clean>${project.version}</sshd.osgi.version.clean>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
@@ -1358,6 +1370,7 @@
</goals>
<configuration>
<instructions>
+ <Import-Package>org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))"</Import-Package>
<Export-Package>*;-noimport:=true</Export-Package>
</instructions>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 4b9a505..f9211ff 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -95,6 +95,20 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <configuration>
+ <instructions>
+ <_removeheaders>Import-Package,Export-Package,Require-Capability,Private-Package,Include-Resource,Bundle*</_removeheaders>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- publish the test-jar since it contains some classes used by other
artifacts tests -->
<plugin>
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 8b4db65..90f2343 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -146,11 +146,30 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <configuration>
+ <instructions>
+ <_removeheaders>Import-Package,Export-Package,Require-Capability,Private-Package,Include-Resource,Bundle*</_removeheaders>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- publish the test-jar since it contains some classes used by other
artifacts tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile/>
+ </archive>
+ </configuration>
<executions>
<execution>
<id>small-test-jar</id>