[mina-sshd] branch master updated: Simplify maven-bundle-plugin configuration

[tw...@apache.org]

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 922214683 Simplify maven-bundle-plugin configuration
922214683 is described below

commit 922214683c68cc5515f93d1c67cfad1b0d7520c0
Author: Hannes Wellmann <we...@gmx.net>
AuthorDate: Sat Mar 18 00:58:09 2023 +0100

    Simplify maven-bundle-plugin configuration
    
    Instead of the 'maven-bundle-plugin:cleanVersions' goal, use
    BND-lib's range macro:
    https://bnd.bndtools.org/macros/range.html
    
    Additionally use angular brackets for BND-macros
    (https://bnd.bndtools.org/chapters/850-macros.html) and make the
    version-ranges for imported sshd packages more strict.
---
 pom.xml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56e40be6c..aa4e0693a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1457,18 +1457,6 @@
                 <inherited>true</inherited>
                 <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>
@@ -1476,12 +1464,13 @@
                             <goal>manifest</goal>
                         </goals>
                         <configuration>
+                            <supportIncrementalBuild>true</supportIncrementalBuild>
                             <instructions>
                                 <Import-Package><![CDATA[
-                                  org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))",
-                                  org.slf4j*;version="${range;[==,${slf4j.upper.bound})}",
+                                  org.apache.sshd*;version="$<range;[===,=+);$<maven_version;${project.version}>>",
+                                  org.slf4j*;version="$<range;[==,${slf4j.upper.bound})>",
                                   *
-                                  ]]></Import-Package>
+                                ]]></Import-Package>
                                 <Export-Package>*;-noimport:=true</Export-Package>
                             </instructions>
                             <noWarningProjectTypes>pom</noWarningProjectTypes>