You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tw...@apache.org on 2023/03/29 19:31:13 UTC

[mina-sshd] branch master updated: Better Automatic-Module-Name in MANIFEST.MF

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

twolf 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 c1163a66b Better Automatic-Module-Name in MANIFEST.MF
c1163a66b is described below

commit c1163a66b567ab9fa732017e5c9efcf7ac5dd2a1
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Wed Mar 29 21:09:51 2023 +0200

    Better Automatic-Module-Name in MANIFEST.MF
    
    Use the same as the symbolic bundle name.
---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a41a60c6f..fed8a2fc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1466,7 +1466,13 @@
                         <configuration>
                             <supportIncrementalBuild>true</supportIncrementalBuild>
                             <instructions>
-                                <Automatic-Module-Name>${project.groupId}.${project.artifactId}</Automatic-Module-Name>
+                                <!--
+                                    maven-symbolicname is the Bundle-SymbolicName as computed by maven-bundle-plugin, exposed as
+                                    a bnd variable. With the default behavior, we get "org.apache.sshd.xxx" instead of
+                                    "org.apache.sshd.sshd-xxxx", which ${project.groupId}.${project.artifactId} would give.
+                                    See https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
+                                -->
+                                <Automatic-Module-Name>$(maven-symbolicname)</Automatic-Module-Name>
                                 <Import-Package><![CDATA[
                                   org.apache.sshd*;version="$<range;[===,=+);$<maven_version;${project.version}>>",
                                   org.slf4j*;version="$<range;[==,${slf4j.upper.bound})>",