From 6b0040497f73ebe89abbd7d5b5b20ebdc27540f7 Mon Sep 17 00:00:00 2001
From: Steffen Holzer <steffen.holzer@capgemini.com>
Date: Thu, 27 Apr 2017 14:32:14 +0200
Subject: [PATCH] #120 #124 fixed oomph dev product and oasp4j-ide (contained
 invalid p2 artifacts). Removed mylyn wikitext_feature (requested a
 not-satisfyable dependency)

---
 docs/oomph/products/OASP4J.setup   | 10 +++++++---
 docs/oomph/products/OomphDev.setup | 18 +++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/docs/oomph/products/OASP4J.setup b/docs/oomph/products/OASP4J.setup
index 74a77d4..1ba9283 100644
--- a/docs/oomph/products/OASP4J.setup
+++ b/docs/oomph/products/OASP4J.setup
@@ -933,8 +933,6 @@
         name="org.eclipse.mylyn.team_feature.feature.group"/>
     <requirement
         name="org.eclipse.mylyn.versions.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
     <requirement
         name="org.eclipse.oomph.p2.feature.group"/>
     <requirement
@@ -1097,7 +1095,7 @@
     <repository
         url="http://www.nodeclipse.org/updates/"/>
     <repository
-        url="http://www.objectaid.com/update"/>
+        url="http://www.objectaid.com/update/current"/>
     <repository
         url="http://zipeditor.sourceforge.net/update/"/>
   </setupTask>
@@ -1175,6 +1173,8 @@
           url="http://download.oracle.com/otn_software/oepe/12.2.1.2.1/neon/repository/dependencies"/>
       <repository
           url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/bluemixAdapter/neon/"/>
+      <repository
+          url="http://download.eclipse.org/mylyn/releases/neon"/>
     </setupTask>
     <description>OASP4J for Neon (Experimental)</description>
   </version>
@@ -1201,6 +1201,8 @@
           url="http://download.oracle.com/otn_software/oepe/12.2.1.2.1/mars/repository/dependencies"/>
       <repository
           url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/bluemixAdapter/mars/"/>
+      <repository
+          url="http://download.eclipse.org/mylyn/releases/mars"/>
     </setupTask>
     <description>OASP4J for Mars.</description>
   </version>
@@ -1225,6 +1227,8 @@
           url="http://download.jboss.org/jbosstools/updates/webtools/luna"/>
       <repository
           url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/bluemixAdapter/luna/"/>
+      <repository
+          url="http://download.eclipse.org/mylyn/releases/luna"/>
     </setupTask>
     <description>OASP4J for Luna</description>
   </version>
diff --git a/docs/oomph/products/OomphDev.setup b/docs/oomph/products/OomphDev.setup
index 64dbc6c..7537b47 100644
--- a/docs/oomph/products/OomphDev.setup
+++ b/docs/oomph/products/OomphDev.setup
@@ -286,8 +286,6 @@
         name="org.eclipse.mylyn.team_feature.feature.group"/>
     <requirement
         name="org.eclipse.mylyn.versions.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
     <requirement
         name="org.eclipse.oomph.p2.feature.group"/>
     <requirement
@@ -450,7 +448,7 @@
     <repository
         url="http://www.nodeclipse.org/updates/"/>
     <repository
-        url="http://www.objectaid.com/update"/>
+        url="http://www.objectaid.com/update/current"/>
     <repository
         url="http://zipeditor.sourceforge.net/update/"/>
   </setupTask>
@@ -557,7 +555,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="settings.location"
-        value="${workspaces.location/cobigen-master}"
+        value="${workspaces.location/main}"
         storageURI="scope://Installation"/>
     <setupTask
         xsi:type="setup:VariableTask"
@@ -593,6 +591,10 @@
         xsi:type="setup:PreferenceTask"
         key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
         value="true"/>
+    <setupTask
+        xsi:type="setup:PreferenceTask"
+        key="/instance/org.eclipse.oomph.setup.ui/showProgressInWizard"
+        value="true"/>
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"
@@ -942,7 +944,8 @@
       label="Neon"
       requiredJavaVersion="1.7">
     <setupTask
-        xsi:type="setup.p2:P2Task">
+        xsi:type="setup.p2:P2Task"
+        label="OASP4J Neon">
       <repository
           url="http://download.eclipse.org/releases/neon"/>
       <repository
@@ -954,7 +957,7 @@
       <repository
           url="http://download.eclipse.org/eclipse/updates/4.6/"/>
       <repository
-          url="http://download.eclipse.org/mylyn/releases/3.20"/>
+          url="http://download.eclipse.org/mylyn/releases/neon"/>
       <repository
           url="http://download.jboss.org/jbosstools/updates/webtools/neon"/>
       <repository
@@ -990,7 +993,8 @@
       label="Mars"
       requiredJavaVersion="1.7">
     <setupTask
-        xsi:type="setup.p2:P2Task">
+        xsi:type="setup.p2:P2Task"
+        label="OASP4J Mars">
       <repository
           url="http://download.eclipse.org/mylyn/releases/3.17"/>
       <repository