From b4a88664ee428401536cb06d2bde0a516d1bb208 Mon Sep 17 00:00:00 2001 From: Yadira Cervantes Date: Tue, 12 Nov 2024 13:26:09 -0800 Subject: [PATCH 1/2] Added jface and swt dependencies for plug-ins that contribute to the UI. Dependencies aren't added for plug-ins that generate an activator file or use a template. Fixes https://github.com/eclipse-pde/eclipse.pde/issues/1306 --- .../ui/wizards/plugin/NewProjectCreationOperation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java index 57faee4b1a..7bcd5ac124 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java @@ -84,6 +84,7 @@ import org.eclipse.pde.ui.IFragmentFieldData; import org.eclipse.pde.ui.IPluginContentWizard; import org.eclipse.pde.ui.IPluginFieldData; +import org.eclipse.pde.ui.templates.PluginReference; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; @@ -553,6 +554,10 @@ private IPluginReference[] getDependencies() { if (fGenerator != null) { IPluginReference[] refs = fGenerator.getDependencies(); Collections.addAll(result, refs); + } else if (fContentWizard == null && fData instanceof IPluginFieldData pluginData && pluginData.isUIPlugin()) { + // a plug-in project is being created and makes contributions to UI + result.add(new PluginReference("org.eclipse.swt")); //$NON-NLS-1$ + result.add(new PluginReference("org.eclipse.jface")); //$NON-NLS-1$ } if (fContentWizard != null) { From 582b33153e08b91c28b43879b0a67125af6f15eb Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Wed, 27 Nov 2024 17:45:44 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.35 stream --- ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF index 1cb90287e4..bf220bd5e8 100644 --- a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF +++ b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %name Bundle-SymbolicName: org.eclipse.pde.ui; singleton:=true -Bundle-Version: 3.15.400.qualifier +Bundle-Version: 3.15.500.qualifier Bundle-Activator: org.eclipse.pde.internal.ui.PDEPlugin Bundle-Vendor: %provider-name Bundle-Localization: plugin