From 7ae38e4237ff0b528130550450262cbee23ee781 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Fri, 5 Jan 2024 15:21:34 +0100 Subject: [PATCH] Use RepositoryHelper.getWorkspaceBundlePools to find all workspace pools Guard the use such that -Dpde.usePoolsInfo=false can be used to disable the behavior. https://github.com/eclipse-equinox/p2/issues/410 --- .../eclipse/pde/internal/core/target/P2TargetUtils.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java index 0fd0fe13511..8bec9c6006c 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java @@ -1452,6 +1452,14 @@ private Collection getArtifactRepositories(ITargetDefinition target) throws * @param additionalRepos the set to which additional repos are added. */ private void findWorkspaceRepos(Set additionalRepos) { + if (Boolean.parseBoolean(System.getProperty("pde.usePoolsInfo", "true"))) { //$NON-NLS-1$ //$NON-NLS-2$ + try { + additionalRepos.addAll(RepositoryHelper.getWorkspaceBundlePools().stream().map(Path::toUri).toList()); + } catch (Exception e) { + //$FALL-THROUGH$ + } + } + IPreferencesService prefs = getPreferences(); if (prefs == null) { return;