diff --git a/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF index e1e109ccf..ba45528f1 100644 --- a/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti org.eclipse.oomph.setup.mylyn.edit;bundle-version="[1.11.0,2.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.oomph.setup.p2;bundle-version="[1.17.0,2.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.oomph.setup.p2.edit;bundle-version="[1.13.0,2.0.0)";resolution:=optional;visibility:=reexport, - org.eclipse.oomph.setup.pde;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport, + org.eclipse.oomph.setup.pde;bundle-version="[1.13.0,2.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.oomph.setup.pde.edit;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.oomph.setup.projects;bundle-version="[1.14.0,2.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.oomph.setup.projects.edit;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport, diff --git a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF index ec2b9a2af..c2c2384e1 100644 --- a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.oomph.setup.pde;singleton:=true -Bundle-Version: 1.12.0.qualifier +Bundle-Version: 1.13.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.oomph.setup.internal.pde.PDEPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.oomph.setup.internal.pde;version="1.12.0";x-internal:=true, - org.eclipse.oomph.setup.pde;version="1.12.0";x-internal:=true, - org.eclipse.oomph.setup.pde.impl;version="1.12.0";x-internal:=true, - org.eclipse.oomph.setup.pde.util;version="1.12.0";x-internal:=true +Export-Package: org.eclipse.oomph.setup.internal.pde;version="1.13.0";x-internal:=true, + org.eclipse.oomph.setup.pde;version="1.13.0";x-internal:=true, + org.eclipse.oomph.setup.pde.impl;version="1.13.0";x-internal:=true, + org.eclipse.oomph.setup.pde.util;version="1.13.0";x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, - org.eclipse.oomph.setup;bundle-version="[1.18.0,2.0.0)";visibility:=reexport, + org.eclipse.oomph.setup;bundle-version="[1.22.0,2.0.0)";visibility:=reexport, org.eclipse.oomph.util.pde;bundle-version="[1.11.0,2.0.0)", org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)", org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)" diff --git a/plugins/org.eclipse.oomph.setup.pde/pom.xml b/plugins/org.eclipse.oomph.setup.pde/pom.xml index ad8a98b3b..25c1b2b46 100644 --- a/plugins/org.eclipse.oomph.setup.pde/pom.xml +++ b/plugins/org.eclipse.oomph.setup.pde/pom.xml @@ -20,7 +20,7 @@ org.eclipse.oomph org.eclipse.oomph.setup.pde - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.oomph.setup.pde/src/org/eclipse/oomph/setup/pde/impl/TargetPlatformTaskImpl.java b/plugins/org.eclipse.oomph.setup.pde/src/org/eclipse/oomph/setup/pde/impl/TargetPlatformTaskImpl.java index 9d9e8497f..6b14f0b2f 100644 --- a/plugins/org.eclipse.oomph.setup.pde/src/org/eclipse/oomph/setup/pde/impl/TargetPlatformTaskImpl.java +++ b/plugins/org.eclipse.oomph.setup.pde/src/org/eclipse/oomph/setup/pde/impl/TargetPlatformTaskImpl.java @@ -268,8 +268,7 @@ public boolean isNeeded(SetupTaskContext context) throws Exception targetDefinition = TargetPlatformUtil.getTargetDefinition(name); ITargetDefinition activeTargetDefinition = TargetPlatformUtil.getActiveTargetDefinition(); - if (targetDefinition == null || !targetDefinition.isResolved() || !isActivate() || activeTargetDefinition == null - || !targetDefinition.getHandle().equals(activeTargetDefinition.getHandle())) + if (targetDefinition == null || !isActivate() || activeTargetDefinition == null || !targetDefinition.getHandle().equals(activeTargetDefinition.getHandle())) { SetupUtil.getResolvingTargetDefinitions(context).add(name);