Attachment #152205 for bug #292691

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 292691 | Differences between

and this patch

Collapse All | Expand All

Lines 57-63 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
57	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	57	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",
58	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	58	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
59	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",	59	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
60	org.eclipse.equinox.p2.engine;bundle-version="[1.0.100,2.0.0)",	60	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
61	org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",	61	org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",
62	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	62	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
63	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",	63	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",




import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
import org.eclipse.equinox.p2.engine.IProvisioningPlan;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.target.provisional.*;

			return new IResolvedBundle[0];
		}

		IProvisioningPlan plan = planner.getProvisioningPlan(request, context, new SubProgressMonitor(subMonitor, 10));
		IStatus status = plan.getStatus();
		if (!status.isOK()) {
			throw new CoreException(status);
		}
		IProvisioningPlan installerPlan = plan.getInstallerPlan();
		if (installerPlan != null) {
			// this plan requires an update to the installer first, log the fact and attempt
			// to continue, we don't want to update the running SDK while provisioning a target

Lines 96-102 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
96	org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)",	96	org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)",
97	org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",	97	org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",
98	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	98	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
99	org.eclipse.equinox.p2.engine;bundle-version="[1.0.100,2.0.0)",	99	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
100	org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",	100	org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",
101	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",	101	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
102	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",	102	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",

Return to bug 292691

Lines 18-30 Link Here

(-)src/org/eclipse/pde/internal/core/target/IUBundleContainer.java (-3 / +5 lines)
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;	19	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
21	import org.eclipse.equinox.internal.provisional.p2.director.*;	21	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
		22	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
22	import org.eclipse.equinox.internal.provisional.p2.engine.*;	23	import org.eclipse.equinox.internal.provisional.p2.engine.*;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
27	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;	28	import org.eclipse.equinox.internal.provisional.p2.repository.IRepositoryManager;
		29	import org.eclipse.equinox.p2.engine.IProvisioningPlan;
28	import org.eclipse.osgi.util.NLS;	30	import org.eclipse.osgi.util.NLS;
29	import org.eclipse.pde.internal.core.PDECore;	31	import org.eclipse.pde.internal.core.PDECore;
30	import org.eclipse.pde.internal.core.target.provisional.*;	32	import org.eclipse.pde.internal.core.target.provisional.*;
Lines 218-229 Link Here
218	return new IResolvedBundle[0];	220	return new IResolvedBundle[0];
219	}	221	}
220		222
221	ProvisioningPlan plan = planner.getProvisioningPlan(request, context, new SubProgressMonitor(subMonitor, 10));	223	IProvisioningPlan plan = planner.getProvisioningPlan(request, context, new SubProgressMonitor(subMonitor, 10));
222	IStatus status = plan.getStatus();	224	IStatus status = plan.getStatus();
223	if (!status.isOK()) {	225	if (!status.isOK()) {
224	throw new CoreException(status);	226	throw new CoreException(status);
225	}	227	}
226	ProvisioningPlan installerPlan = plan.getInstallerPlan();	228	IProvisioningPlan installerPlan = plan.getInstallerPlan();
227	if (installerPlan != null) {	229	if (installerPlan != null) {
228	// this plan requires an update to the installer first, log the fact and attempt	230	// this plan requires an update to the installer first, log the fact and attempt
229	// to continue, we don't want to update the running SDK while provisioning a target	231	// to continue, we don't want to update the running SDK while provisioning a target