Skip to content

Add version constraint [5.0.0,6.0.0) to junit-jupiter-api when adding JUnit 5 bundles #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add version constraint [5.0.0,6.0.0) to junit-jupiter-api when adding JUnit 5 bundles #58

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c95ddf
Initial plan
Copilot Oct 24, 2025
9b6a560
Add version constraint [5,6) to junit-jupiter-api bundle
Copilot Oct 24, 2025
131a305
Use explicit version format [5.0.0,6.0.0) for consistency
Copilot Oct 24, 2025
db1bb68
Refactor to use structured bundle info with versions for JUnit 5
Copilot Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 51 additions & 4 deletions ...eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,15 @@ protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws Co
if (!(model instanceof IPluginModelBase base)) {
return;
}
String[] pluginIdStrings = null;
if ("JUnit 5 bundles".equals(getChangeObject())) { //$NON-NLS-1$
pluginIdStrings = getJUnit5Bundles();
if (!isUndo()) {
addJUnit5Bundles(base);
} else {
removeJUnit5Bundles(base);
}
return;
}
String[] pluginIdStrings = null;
if (getChangeObject() instanceof ExportPackageDescription) {
pluginIdStrings = new String[1];
pluginIdStrings[0] = ((ExportPackageDescription) getChangeObject()).getSupplier()
Expand Down Expand Up @@ -235,8 +240,50 @@ protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws Co
}
}

private String[] getJUnit5Bundles() {
return new String[] { "org.junit", "junit-jupiter-api" }; //$NON-NLS-1$ //$NON-NLS-2$
private void addJUnit5Bundles(IPluginModelBase base) throws CoreException {
String[][] bundles = getJUnit5Bundles();
for (String[] bundleInfo : bundles) {
String pluginId = bundleInfo[0];
String version = bundleInfo.length > 1 ? bundleInfo[1] : null;

IPluginImport[] imports = base.getPluginBase().getImports();
boolean duplicate = false;
for (IPluginImport iPluginImport : imports) {
if (iPluginImport.getId().equals(pluginId)) {
duplicate = true;
break;
}
}
if (duplicate) {
continue;
}
IPluginImport impt = base.getPluginFactory().createImport();
impt.setId(pluginId);
if (version != null) {
impt.setVersion(version);
}
base.getPluginBase().add(impt);
}
}

private void removeJUnit5Bundles(IPluginModelBase base) throws CoreException {
String[][] bundles = getJUnit5Bundles();
for (String[] bundleInfo : bundles) {
String pluginId = bundleInfo[0];
IPluginImport[] imports = base.getPluginBase().getImports();
for (IPluginImport pluginImport : imports) {
if (pluginImport.getId().equals(pluginId)) {
base.getPluginBase().remove(pluginImport);
}
}
}
}

private String[][] getJUnit5Bundles() {
return new String[][] {
{ "org.junit" }, //$NON-NLS-1$
{ "junit-jupiter-api", "[5.0.0,6.0.0)" } //$NON-NLS-1$ //$NON-NLS-2$
};
}
}, new NullProgressMonitor());

Expand Down