[459625] [Mars M5] Oomph still load setup models at startup time even if "Skip auto task..." checked

https://bugs.eclipse.org/bugs/show_bug.cgi?id=459625

3 files changed, 11 insertions, 10 deletions

diff --git a/plugins/org.eclipse.oomph.p2.ui/plugin.xml b/plugins/org.eclipse.oomph.p2.ui/plugin.xml
index d3a03c5a3..d267bdfe2 100644
--- a/plugins/org.eclipse.oomph.p2.ui/plugin.xml
+++ b/plugins/org.eclipse.oomph.p2.ui/plugin.xml
@@ -68,7 +68,8 @@
                class="org.eclipse.oomph.p2.internal.ui.ExploreRepositoryHandler">
          </class>
          <activeWhen>
-             <iterate>
+             <iterate
+                   ifEmpty="false">
                 <adapt
                       type="org.eclipse.oomph.p2.Repository">
                 </adapt>
diff --git a/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch b/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
index b70f49a9a..84a26c103 100644
--- a/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
+++ b/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
 <setAttribute key="additional_plugins">
-<setEntry value="org.eclipse.equinox.p2.artifact.repository.source:1.1.300.v20131211-1531:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.artifact.repository:1.1.300.v20131211-1531:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.artifact.repository.source:1.1.300.v20150123-1500:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.artifact.repository:1.1.300.v20150123-1500:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.console.source:1.0.300.v20131113-1212:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.console:1.0.300.v20131113-1212:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.core.source:2.4.0.v20141112-1524:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.core:2.4.0.v20141112-1524:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.director.app.source:1.0.300.v20140228-1829:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.director.app:1.0.300.v20140228-1829:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.director.app.source:1.0.300.v20150123-0816:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.director.app:1.0.300.v20150123-0816:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.director.source:2.3.100.v20140224-1921:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.director:2.3.100.v20140224-1921:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.directorywatcher.source:1.1.0.v20131211-1531:default:true"/>
@@ -57,12 +57,12 @@
 <setEntry value="org.eclipse.equinox.p2.ui.sdk.scheduler:1.2.0.v20140422-1847:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.ui.sdk.source:1.0.300.v20140407-1803:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.ui.sdk:1.0.300.v20140407-1803:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.ui.source:2.4.0.v20141208-2105:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.ui:2.4.0.v20141208-2105:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.ui.source:2.4.0.v20150108-0934:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.ui:2.4.0.v20150108-0934:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.updatechecker.source:1.1.200.v20131119-0908:default:true"/>
 <setEntry value="org.eclipse.equinox.p2.updatechecker:1.1.200.v20131119-0908:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.updatesite.source:1.0.400.v20140629-1744:default:true"/>
-<setEntry value="org.eclipse.equinox.p2.updatesite:1.0.400.v20140629-1744:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.updatesite.source:1.0.400.v20150127-0451:default:true"/>
+<setEntry value="org.eclipse.equinox.p2.updatesite:1.0.400.v20150127-0451:default:true"/>
 </setAttribute>
 <booleanAttribute key="append.args" value="true"/>
 <booleanAttribute key="askclear" value="true"/>
diff --git a/plugins/org.eclipse.oomph.ui/IDE.launch b/plugins/org.eclipse.oomph.ui/IDE.launch
index cc539a1b8..64dcefdc0 100644
--- a/plugins/org.eclipse.oomph.ui/IDE.launch
+++ b/plugins/org.eclipse.oomph.ui/IDE.launch
@@ -21,7 +21,7 @@
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog&#13;&#10;-clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Doomph.redirection.setups=http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/-&gt;${file_uri:${resource_loc:/setups}}/&#13;&#10;-Xms1024m&#13;&#10;-Xmx4000m&#13;&#10;-XX:MaxPermSize=512m&#13;&#10;-Doomph.setup.skip=true&#13;&#10;-Doomph.questionnaire.skip=true&#13;&#10;-Doomph.setup.show.perform.startup=true&#13;&#10;-Dosgi.checkConfiguration=false"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/../ws-IDE"/>