Skip to content

Fix build order computation if project and bundle name are not equals #2258

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

Merged
HannesWell merged 1 commit into from
Mar 13, 2026
Merged

Fix build order computation if project and bundle name are not equals #2258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 12 additions & 16 deletions ...rg.eclipse.pde.core/src/org/eclipse/pde/internal/core/DynamicPluginProjectReferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Andrey Loskutov <loskutov@gmx.de> and others.
* Copyright (c) 2018, 2026 Andrey Loskutov <loskutov@gmx.de> and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -13,46 +13,42 @@
*******************************************************************************/
package org.eclipse.pde.internal.core;

import static java.util.Collections.singleton;
import static java.util.stream.Collectors.toList;

import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Set;

import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IDynamicReferenceProvider;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;

/**
* Project references provider for JDT build to compute right build order with
* indirect plug-in dependencies
*/
public class DynamicPluginProjectReferences implements IDynamicReferenceProvider {

public DynamicPluginProjectReferences() {
super();
}

@Override
public List<IProject> getDependentProjects(IBuildConfiguration buildConfiguration) throws CoreException {
IProject input = buildConfiguration.getProject();
IJavaProject javaProject = JavaCore.create(input);
if (javaProject != null) {
IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(javaProject.getProject());
if (model != null) {
BundleDescription currentBundle = model.getBundleDescription();
if (currentBundle != null) {
IWorkspaceRoot root = PDECore.getWorkspace().getRoot();
return BuildDependencyCollector.collectBuildRelevantDependencies(singleton(currentBundle)).stream()
.filter(dependency -> dependency != currentBundle)
.map(dependency -> root.getProject(dependency.getName())).filter(IProject::exists)
.distinct().collect(toList());
BundleDescription bundle = model.getBundleDescription();
if (bundle != null) {
return BuildDependencyCollector.collectBuildRelevantDependencies(Set.of(bundle)).stream()
.map(b -> (org.osgi.resource.Resource) b) //
.filter(dependency -> dependency != bundle).map(PluginRegistry::findModel)
.map(IPluginModelBase::getUnderlyingResource).filter(Objects::nonNull)
.map(IResource::getProject).distinct().toList();
}
}
}
Expand Down
Loading