Merge pull request #5418 from timothyjward/fix/m2e-version

[m2e] Expand bundle version ranges for M2E imports
bndtools · Nov 8, 2022 · 334a811 · 334a811
2 parents e9ffa01 + 0cc2c27
commit 334a811
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/biz.aQute.bnd.maven/bnd.bnd b/biz.aQute.bnd.maven/bnd.bnd
@@ -6,9 +6,9 @@ Bundle-Description:	    Shared logic used by bnd maven plugins
 -includepackage: aQute.bnd.maven.lib.*
 
 Import-Package: \
-	org.apache.maven.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,+);${@bundleversion}}";version=!,\
-	org.eclipse.aether.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,+);${@bundleversion}}";version=!,\
-	org.codehaus.plexus.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,+);${@bundleversion}}";version=!,\
+	org.apache.maven.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,4);${@bundleversion}}";version=!,\
+	org.eclipse.aether.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,4);${@bundleversion}}";version=!,\
+	org.codehaus.plexus.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,4);${@bundleversion}}";version=!,\
 	*
 
 # Decorate maven runtime dependencies

diff --git a/bndtools.m2e/bnd.bnd b/bndtools.m2e/bnd.bnd
@@ -43,7 +43,8 @@ Bundle-SymbolicName: ${p};singleton:=true
 Bundle-ActivationPolicy: lazy
 
 Import-Package: \
-	org.apache.maven.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,+);${@bundleversion}}";version=!,\
+	org.apache.maven.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,4);${@bundleversion}}";version=!,\
+	org.eclipse.aether.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,4);${@bundleversion}}";version=!,\
 	${eclipse.importpackage},\
 	*