diff --git a/biz.aQute.bnd.maven/bnd.bnd b/biz.aQute.bnd.maven/bnd.bnd index 2b36cca2ac..f73e43d38b 100644 --- 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 index 897b7e10ac..7521039c5d 100644 --- 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},\ *