Merge branch 'eclipse-pde:master' into issue-1626_githubLinkInPlugInSpy

Author: amelodev

.github/copilot-instructions.md

@@ -82,6 +82,28 @@ mvn clean verify -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 
 **Docs:** `docs/API_Tools.md` for comprehensive API Tools documentation.
 
+## OSGi Semantic Versioning
+
+**PDE follows OSGi semantic versioning principles** (https://docs.osgi.org/whitepaper/semantic-versioning/):
+
+**Version Format:** `major.minor.micro.qualifier`
+- **Major:** Breaking changes (incompatible API changes)
+- **Minor:** Backward-compatible API additions
+- **Micro:** Backward-compatible bug fixes
+- **Qualifier:** Build metadata (e.g., timestamps, commit hashes)
+
+**Version Ranges for Dependencies:**
+- Use version ranges to specify compatible dependency versions
+- **Inclusive lower bound:** `[1.2.3,2.0.0)` includes 1.2.3
+- **Exclusive upper bound:** `[1.2.3,2.0.0)` excludes 2.0.0
+- **Best practice:** Lower bound inclusive, upper bound at next major (exclusive)
+  - Example: For version `1.2.3`, use `[1.2.3,2.0.0)` to accept any 1.x version
+  - Example: For version `2.5.0`, use `[2.5.0,3.0.0)` to accept any 2.x version
+
+**Why exclude next major?** Major version changes indicate breaking changes, so dependencies should not automatically upgrade across major versions.
+
+**PDE Support:** PDE manifest editor and dialogs should help users create proper version ranges following these principles when adding or updating bundle/package dependencies.
+
 ## Key Notes
 
 **Tycho:** Eclipse-specific Maven extension managing OSGi dependencies, P2 repos, Eclipse metadata (MANIFEST.MF, plugin.xml, feature.xml).

ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF

@@ -7,13 +7,17 @@ Bundle-Activator: org.eclipse.pde.internal.ds.tests.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.pde.ds.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)"
+ org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
+ junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
+ junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
+ junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.pde.internal.ds.tests;x-internal:=true
-Import-Package: org.junit.jupiter.api;version="[5.13.0,6.0.0)",
- org.junit.platform.suite.api;version="[1.13.0,2.0.0)"
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.pde.ds.tests

e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF

@@ -16,5 +16,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
  junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
  junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
  junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
- junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)"
+ junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
 Bundle-ActivationPolicy: lazy

e4tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF

@@ -17,5 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
  junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
  junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
- junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)"
+ junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
 Bundle-ActivationPolicy: lazy 

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/JUnitLaunchRequirements.java

@@ -37,13 +37,15 @@
 
 public class JUnitLaunchRequirements {
 
-	public static final String JUNIT4_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit4.runtime"; //$NON-NLS-1$
-	public static final String JUNIT5_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit5.runtime"; //$NON-NLS-1$
-	public static void addRequiredJunitRuntimePlugins(ILaunchConfiguration configuration, Map<String, List<IPluginModelBase>> allBundles, Map<IPluginModelBase, String> allModels) throws CoreException {
+	private static final String PDE_JUNIT_RUNTIME = "org.eclipse.pde.junit.runtime"; //$NON-NLS-1$
+	private static final String JUNIT4_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit4.runtime"; //$NON-NLS-1$
+	private static final String JUNIT5_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit5.runtime"; //$NON-NLS-1$
+
+	public static void addRequiredJunitRuntimePlugins(ILaunchConfiguration configuration, Map<String, List<IPluginModelBase>> collectedModels, Map<IPluginModelBase, String> startLevelMap) throws CoreException {
 		Collection<String> runtimePlugins = getRequiredJunitRuntimeEclipsePlugins(configuration);
-		Set<BundleDescription> addedRuntimeBundles = addAbsentRequirements(runtimePlugins, allBundles, allModels);
+		Set<BundleDescription> addedRuntimeBundles = addAbsentRequirements(runtimePlugins, collectedModels, startLevelMap);
 		Set<BundleDescription> runtimeRequirements = DependencyManager.findRequirementsClosure(addedRuntimeBundles);
-		addAbsentRequirements(runtimeRequirements, allBundles, allModels);
+		addAbsentRequirements(runtimeRequirements, collectedModels, startLevelMap);
 	}
 
 	@SuppressWarnings("restriction")
@@ -52,40 +54,42 @@ public static Collection<String> getRequiredJunitRuntimeEclipsePlugins(ILaunchCo
 		if (testKind.isNull()) {
 			return List.of();
 		}
-		List<String> plugins = new ArrayList<>();
-		plugins.add("org.eclipse.pde.junit.runtime"); //$NON-NLS-1$
 		switch (testKind.getId()) {
 			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT3_TEST_KIND_ID -> {
+				return List.of(PDE_JUNIT_RUNTIME);
 			} // Nothing to add for JUnit-3
-			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT4_TEST_KIND_ID -> plugins.add(JUNIT4_JDT_RUNTIME_PLUGIN);
-			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT5_TEST_KIND_ID -> plugins.add(JUNIT5_JDT_RUNTIME_PLUGIN);
+			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT4_TEST_KIND_ID -> {
+				return List.of(PDE_JUNIT_RUNTIME,JUNIT4_JDT_RUNTIME_PLUGIN);
+			}
+			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT5_TEST_KIND_ID -> {
+				return List.of(PDE_JUNIT_RUNTIME, JUNIT5_JDT_RUNTIME_PLUGIN);
+			}
 			default -> throw new IllegalArgumentException("Unsupported junit test kind: " + testKind.getId()); //$NON-NLS-1$
 		}
-		return plugins;
 	}
 
-	private static Set<BundleDescription> addAbsentRequirements(Collection<String> requirements, Map<String, List<IPluginModelBase>> allBundles, Map<IPluginModelBase, String> allModels) throws CoreException {
+	private static Set<BundleDescription> addAbsentRequirements(Collection<String> requirements, Map<String, List<IPluginModelBase>> collectedModels, Map<IPluginModelBase, String> startLevelMap) throws CoreException {
 		Set<BundleDescription> addedRequirements = new LinkedHashSet<>();
 		for (String id : requirements) {
-			List<IPluginModelBase> models = allBundles.computeIfAbsent(id, k -> new ArrayList<>());
+			List<IPluginModelBase> models = collectedModels.computeIfAbsent(id, k -> new ArrayList<>());
 			if (models.stream().noneMatch(p -> p.getBundleDescription().isResolved())) {
 				IPluginModelBase model = findRequiredPluginInTargetOrHost(PluginRegistry.findModel(id), plugins -> plugins.max(PDECore.VERSION), id);
 				models.add(model);
-				BundleLauncherHelper.addDefaultStartingBundle(allModels, model);
+				BundleLauncherHelper.addDefaultStartingBundle(startLevelMap, model);
 				addedRequirements.add(model.getBundleDescription());
 			}
 		}
 		return addedRequirements;
 	}
 
-	private static void addAbsentRequirements(Set<BundleDescription> requirements, Map<String, List<IPluginModelBase>> allBundles, Map<IPluginModelBase, String> allModels) throws CoreException {
+	private static void addAbsentRequirements(Set<BundleDescription> requirements, Map<String, List<IPluginModelBase>> collectedModels, Map<IPluginModelBase, String> startLevelMap) throws CoreException {
 		for (BundleRevision bundle : requirements) {
 			String id = bundle.getSymbolicName();
-			List<IPluginModelBase> models = allBundles.computeIfAbsent(id, k -> new ArrayList<>());
+			List<IPluginModelBase> models = collectedModels.computeIfAbsent(id, k -> new ArrayList<>());
 			if (models.stream().map(IPluginModelBase::getBundleDescription).noneMatch(b -> b.isResolved() && b.getVersion().equals(bundle.getVersion()))) {
 				IPluginModelBase model = findRequiredPluginInTargetOrHost(PluginRegistry.findModel(bundle), plgs -> plgs.filter(p -> p.getBundleDescription() == bundle).findFirst(), id);
 				models.add(model);
-				BundleLauncherHelper.addDefaultStartingBundle(allModels, model);
+				BundleLauncherHelper.addDefaultStartingBundle(startLevelMap, model);
 			}
 		}
 	}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java

@@ -82,7 +82,10 @@ protected void buttonSelected(Button button, int index) {
 			IStructuredSelection selection = getTableViewer().getStructuredSelection();
 			if (selection.size() == 1) {
 				String version = getVersion(selection.getFirstElement());
-				setVersion(version, ""); //$NON-NLS-1$
+				// Compute upper bound following OSGi semantic versioning
+				// Preserve existing upper bound if present and major version hasn't changed
+				String upperBound = computeUpperBound(version, getCurrentUpperBound());
+				setVersion(version, upperBound);
 			} else {
 				// plug-ins come back in a sorted order so we assume min/max
 				String minVersion;
@@ -105,7 +108,9 @@ protected void buttonSelected(Button button, int index) {
 					maxVersion = poMax.getVersion();
 
 				}
-				setVersion(minVersion, maxVersion);
+				// Compute upper bound based on max version following OSGi semantic versioning
+				String upperBound = computeUpperBound(maxVersion, getCurrentUpperBound());
+				setVersion(minVersion, upperBound);
 			}
 		}
 
@@ -117,6 +122,53 @@ private String getVersion(Object firstElement) {
 			PackageObject po = (PackageObject) firstElement;
 			return po.getVersion();
 		}
+
+		/**
+		 * Gets the current upper bound from the existing version range, if any.
+		 * 
+		 * @return the current upper bound version, or null if none exists
+		 */
+		private Version getCurrentUpperBound() {
+			if (fVersionRange != null) {
+				return fVersionRange.getRight();
+			}
+			return null;
+		}
+
+		/**
+		 * Computes the upper bound for a version range following OSGi semantic versioning.
+		 * If an existing upper bound is present, it will be adjusted based on the new lower bound's major version.
+		 * Otherwise, a new upper bound excluding the next major version is created.
+		 * 
+		 * @param newLowerBound the new lower bound version
+		 * @param existingUpperBound the existing upper bound (may be null)
+		 * @return the upper bound version (next major version as a string)
+		 */
+		private String computeUpperBound(String newLowerBound, Version existingUpperBound) {
+			try {
+				Version lowerVersion = Version.parseVersion(newLowerBound);
+				int newMajor = lowerVersion.getMajor();
+				
+				if (existingUpperBound != null) {
+					// Existing upper bound present - adjust it if major version changed
+					int existingUpperMajor = existingUpperBound.getMajor();
+					
+					// If the new lower bound has the same major version as the existing upper bound,
+					// keep the existing upper bound
+					if (newMajor < existingUpperMajor) {
+						return existingUpperBound.toString();
+					}
+					// If the new lower bound's major version changed, update to next major
+				}
+				
+				// No existing upper bound or major version changed - compute next major version
+				Version nextMajor = new Version(newMajor + 1, 0, 0);
+				return nextMajor.toString();
+			} catch (IllegalArgumentException e) {
+				// If version parsing fails, return empty string to maintain backward compatibility
+				return ""; //$NON-NLS-1$
+			}
+		}
 	}
 
 	private static class PluginVersionContentProvider implements IStructuredContentProvider {