Skip to content

Commit

Permalink
Exclude upper-bound in version ranges when adding Package-imports
Browse files Browse the repository at this point in the history
This was done wrong in
#1007

And fix wrong version ranges in PDE introduced by that bug.
  • Loading branch information
HannesWell committed Mar 25, 2024
1 parent db64ee8 commit ff3a88b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
28 changes: 14 additions & 14 deletions ui/org.eclipse.pde.bnd.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ Import-Package: aQute.bnd.build;version="4.5.0",
aQute.bnd.exceptions;version="3.0.0",
aQute.bnd.header;version="2.6.0",
aQute.bnd.http;version="2.0.0",
aQute.bnd.maven;version="[3.4.0,4.0.0]",
aQute.bnd.memoize;version="[2.0.0,3.0.0]",
aQute.bnd.maven;version="[3.4.0,4.0.0)",
aQute.bnd.memoize;version="[2.0.0,3.0.0)",
aQute.bnd.osgi;version="[7.0.0,8.0.0)",
aQute.bnd.osgi.repository;version="[3.1.0,4.0.0]",
aQute.bnd.osgi.repository;version="[3.1.0,4.0.0)",
aQute.bnd.osgi.resource;version="[5.0.0,6)",
aQute.bnd.repository.osgi;version="[1.1.1,2)",
aQute.bnd.result;version="2.0.0",
aQute.bnd.service;version="4.8.0",
aQute.bnd.service.clipboard;version="[1.0.0,2.0.0]",
aQute.bnd.service.progress;version="[1.3.0,2.0.0]",
aQute.bnd.service.repository;version="[1.6.0,2.0.0]",
aQute.bnd.version;version="[2.3.0,3.0.0]",
aQute.bnd.service.clipboard;version="[1.0.0,2.0.0)",
aQute.bnd.service.progress;version="[1.3.0,2.0.0)",
aQute.bnd.service.repository;version="[1.6.0,2.0.0)",
aQute.bnd.version;version="[2.3.0,3.0.0)",
aQute.service.reporter;version="[1.2.0,2.0.0)",
jakarta.xml.bind;version="[4.0.0,5.0.0)",
jakarta.xml.bind.annotation;version="[4.0.0,5.0.0)",
org.bndtools.api;version="[3.1.0,4.0.0]",
org.bndtools.headless.build.manager.api;version="[1.1.0,2.0.0]",
org.bndtools.api;version="[3.1.0,4.0.0)",
org.bndtools.headless.build.manager.api;version="[1.1.0,2.0.0)",
org.bndtools.templating;version="[2.0.0,3.0.0)",
org.bndtools.templating.util;version="[1.0.0,2.0.0)",
org.bndtools.versioncontrol.ignores.manager.api;version="[1.0.0,2.0.0]",
org.osgi.namespace.contract;version="[1.0.0,2.0.0]",
org.osgi.namespace.extender;version="[1.0.0,2.0.0]",
org.osgi.namespace.service;version="[1.0.0,2.0.0]",
org.osgi.service.event;version="[1.4.0,2.0.0]",
org.bndtools.versioncontrol.ignores.manager.api;version="[1.0.0,2.0.0)",
org.osgi.namespace.contract;version="[1.0.0,2.0.0)",
org.osgi.namespace.extender;version="[1.0.0,2.0.0)",
org.osgi.namespace.service;version="[1.0.0,2.0.0)",
org.osgi.service.event;version="[1.4.0,2.0.0)",
org.osgi.service.metatype;version="[1.4.1,2)",
org.osgi.service.repository;version="[1.1.0,2.0.0)",
org.osgi.util.function;version="[1.2.0,2)",
Expand Down
6 changes: 3 additions & 3 deletions ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ Import-Package: aQute.bnd.build;version="[4.4.0,5.0.0)",
aQute.bnd.osgi.resource;version="[4.3.0,6.0.0)",
aQute.bnd.properties;version="[2.0.0,3.0.0)",
aQute.bnd.service;version="[4.7.0,5.0.0)",
aQute.bnd.service.clipboard;version="[1.0.0,2.0.0]",
aQute.bnd.service.progress;version="[1.3.0,2.0.0]",
aQute.bnd.service.clipboard;version="[1.0.0,2.0.0)",
aQute.bnd.service.progress;version="[1.3.0,2.0.0)",
aQute.bnd.version;version="[2.2.0,3.0.0)",
aQute.service.reporter;version="[1.2.0,2.0.0)",
org.bndtools.versioncontrol.ignores.manager.api;version="[1.0.0,2.0.0]",
org.bndtools.versioncontrol.ignores.manager.api;version="[1.0.0,2.0.0)",
org.eclipse.equinox.internal.p2.publisher.eclipse,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.publisher.eclipse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private static String getVersion(ExportPackageDescription desc) {
Version version = desc.getVersion();
if (version != null && !Version.emptyVersion.equals(version)) {
return new VersionRange(
"[" + version.getMajor() + "." + version.getMinor() + "," + (version.getMajor() + 1) + "]") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
"[" + version.getMajor() + "." + version.getMinor() + "," + (version.getMajor() + 1) + ")") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
.toString();
}
return null;
Expand Down

0 comments on commit ff3a88b

Please sign in to comment.