From 240e181a50f47996b289776a697a24385a6477dc Mon Sep 17 00:00:00 2001
From: Paul Leacu <pleacu@redhat.com>
Date: Fri, 20 May 2016 15:08:37 -0400
Subject: [PATCH] JBTIS-711 - sync with JBT 4.4.0.Alpha2 and updated
 4.60.0.Alpha1-SNAPSHOT

---
 target-platform/pom.xml                       |   8 +-
 target-platform/src/targets/community.target  |   8 +-
 target-platform/src/targets/core-base.target  | 100 +++++++++---------
 .../targets/integration-stack-base-ea.target  |  82 +++++++-------
 .../src/targets/integration-stack-base.target |  16 +--
 5 files changed, 108 insertions(+), 106 deletions(-)

diff --git a/target-platform/pom.xml b/target-platform/pom.xml
index 4927df92..aefcd856 100644
--- a/target-platform/pom.xml
+++ b/target-platform/pom.xml
@@ -34,9 +34,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tychoVersion>0.23.1</tychoVersion>
+    <tychoVersion>0.25.0</tychoVersion>
     <tychoExtrasVersion>${tychoVersion}</tychoExtrasVersion>
-    <jboss-tycho-version>0.23.1</jboss-tycho-version>
+    <jbossTychoPluginsVersion>0.25.0-SNAPSHOT</jbossTychoPluginsVersion>
     <JBTCoreTPVersion>4.60.0.Alpha1-SNAPSHOT</JBTCoreTPVersion>
   </properties>
 
@@ -85,7 +85,7 @@
       <plugin>
 	<groupId>org.jboss.tools.tycho-plugins</groupId>
 	<artifactId>target-platform-utils</artifactId>
-        <version>${jboss-tycho-version}</version>
+        <version>${jbossTychoPluginsVersion}</version>
 
 	<!-- Merge:
 	     1. released integration-stack specific target dependencies:   integration-stack-base.target
@@ -467,7 +467,7 @@
 	  <plugin>
 	    <groupId>org.jboss.tools.tycho-plugins</groupId>
 	    <artifactId>target-platform-utils</artifactId>
-            <version>${jboss-tycho-version}</version>
+            <version>${jbossTychoPluginsVersion}</version>
 
 	    <executions>
 
diff --git a/target-platform/src/targets/community.target b/target-platform/src/targets/community.target
index 9106401e..f418e0e5 100644
--- a/target-platform/src/targets/community.target
+++ b/target-platform/src/targets/community.target
@@ -10,14 +10,14 @@
 
     <!-- JBoss Tools Core Community Dependencies -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.jboss.tools.community.central.feature.feature.group" version="2.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.community.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160427-0310-B849"/>
+      <unit id="org.jboss.tools.community.central.feature.feature.group" version="2.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.community.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160510-1913-B866"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/core/4.3.1.Beta2"/>  -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/stable/updates/core/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha1/"/>
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha2/"/>
     </location>
 
   </locations>
diff --git a/target-platform/src/targets/core-base.target b/target-platform/src/targets/core-base.target
index 4dbdce71..496fe6e0 100644
--- a/target-platform/src/targets/core-base.target
+++ b/target-platform/src/targets/core-base.target
@@ -10,65 +10,67 @@
     <!-- JBoss Tools Core Base Dependencies
          ref: <repository loc>/site.properties -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.hibernate.eclipse.feature.feature.group" version="5.1.0.Alpha1-v20160422-2306-B1244"/>
-      <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="3.6.100.Alpha1-v20160428-0033-B952"/>
-      <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.0.Alpha1-v20160428-0033-B952"/>
+      <unit id="org.hibernate.eclipse.feature.feature.group" version="5.1.0.Alpha1-v20160512-1506-B1267"/>
+      <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="3.6.100.Alpha1-v20160519-0029-B970"/>
+      <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.0.Alpha1-v20160519-0029-B970"/>
       <unit id="org.jboss.ide.eclipse.freemarker.feature.feature.group" version="1.5.100.Alpha1-v20160428-0625-B361"/>
-      <unit id="org.jboss.tools.cdi.deltaspike.feature.feature.group" version="1.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.cdi.feature.feature.group" version="1.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.cdi.seam.feature.feature.group" version="1.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.discovery.core" version="1.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.common.core.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.jdt.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.mylyn.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.text.ext.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.ui.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.verification.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.forge.feature.feature.group" version="2.0.100.Alpha1-v20160415-2246-B1003"/>
-      <unit id="org.jboss.tools.forge.ext.feature.feature.group" version="2.0.100.Alpha1-v20160415-2246-B1003"/>
-      <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.foundation.security.linux.feature.feature.group" version="1.3.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.foundation.help.ui" version="1.3.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.foundation.license.feature.feature.group" version="1.3.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.8.0.Alpha1-v20160428-0033-B952"/>
-      <unit id="org.jboss.tools.jsf.feature.feature.group" version="3.8.0.Alpha1-v20160421-2020-B942"/>
+      <unit id="org.jboss.tools.cdi.deltaspike.feature.feature.group" version="1.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.cdi.feature.feature.group" version="1.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.cdi.seam.feature.feature.group" version="1.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.discovery.core" version="1.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.common.core.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.jdt.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.mylyn.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.text.ext.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.ui.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.verification.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.forge.feature.feature.group" version="2.0.100.Alpha1-v20160513-2246-B1041"/>
+      <unit id="org.jboss.tools.forge.ext.feature.feature.group" version="2.0.100.Alpha1-v20160513-2246-B1041"/>
+      <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.foundation.security.linux.feature.feature.group" version="1.3.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.foundation.help.ui" version="1.3.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.foundation.license.feature.feature.group" version="1.3.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.8.0.Alpha1-v20160519-0029-B970"/>
+      <unit id="org.jboss.tools.jsf.feature.feature.group" version="3.8.0.Alpha1-v20160519-1941-B957"/>
       <unit id="org.jboss.tools.jst.feature.feature.group" version="3.8.0.Alpha1-v20160307-1156-B1014"/>
-      <unit id="org.jboss.tools.livereload.feature.feature.group" version="1.4.0.Alpha1-v20160401-2041-B449"/>
+      <unit id="org.jboss.tools.livereload.feature.feature.group" version="1.4.0.Alpha1-v20160519-2351-B473"/>
       <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.2.0.201601252104"/>
-      <unit id="org.jboss.tools.maven.cdi.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.hibernate.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.jbosspackaging.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.jdt.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.portlet.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.seam.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.maven.sourcelookup.feature.feature.group" version="1.8.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.openshift.egit.integration.feature.feature.group" version="3.2.0.Alpha1-v20160429-0333-B1268"/>
-      <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.2.0.Alpha1-v20160429-0333-B1268"/>
+      <unit id="org.jboss.tools.maven.cdi.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.hibernate.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.jbosspackaging.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.jdt.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.portlet.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.seam.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.maven.sourcelookup.feature.feature.group" version="1.8.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.openshift.egit.integration.feature.feature.group" version="3.2.0.Alpha1-v20160519-2357-B1307"/>
+      <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.2.0.Alpha1-v20160519-2357-B1307"/>
       <unit id="org.jboss.tools.portlet.feature.feature.group" version="1.6.0.Final-v20141209-0339-B20"/>
-      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160427-0310-B849"/>
-      <unit id="org.jboss.tools.richfaces.feature.feature.group" version="3.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.runtime.seam.detector.feature.feature.group" version="3.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.seam.feature.feature.group" version="3.8.0.Alpha1-v20160421-2020-B942"/>
-      <unit id="org.jboss.tools.stacks.core.feature.feature.group" version="1.3.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.usage" version="2.2.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.browsersim.feature.feature.group" version="3.8.0.Alpha1-v20160322-1311-B291"/>
-      <unit id="org.jboss.tools.vpe.feature.feature.group" version="3.8.0.Alpha1-v20151213-0637-B806"/>
-      <unit id="org.jboss.tools.ws.feature.feature.group" version="1.9.0.Alpha1-v20160329-0951-B850"/>
-      <unit id="org.jboss.tools.ws.jaxrs.feature.feature.group" version="1.9.0.Alpha1-v20160329-0951-B850"/>
-      <unit id="org.jboss.tools.wtp.runtimes.tomcat.feature.feature.group" version="1.3.100.Alpha1-v20160428-0033-B952"/>
+      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.0.Alpha1-v20160510-1913-B866"/>
+      <unit id="org.jboss.tools.richfaces.feature.feature.group" version="3.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.runtime.seam.detector.feature.feature.group" version="3.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.seam.feature.feature.group" version="3.8.0.Alpha1-v20160519-1941-B957"/>
+      <unit id="org.jboss.tools.stacks.core.feature.feature.group" version="1.3.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.usage" version="2.2.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.browsersim.feature.feature.group" version="3.8.0.Alpha1-v20160519-2325-B332"/>
+      <unit id="org.jboss.tools.vpe.feature.feature.group" version="3.8.0.Alpha1-v20160510-2042-B855"/>
+      <unit id="org.jboss.tools.ws.feature.feature.group" version="1.9.0.Alpha1-v20160519-0955-B871"/>
+      <unit id="org.jboss.tools.ws.jaxrs.feature.feature.group" version="1.9.0.Alpha1-v20160519-0955-B871"/>
+      <unit id="org.jboss.tools.wtp.runtimes.tomcat.feature.feature.group" version="1.3.100.Alpha1-v20160519-0029-B970"/>
       <unit id="org.mozilla.xpcom" version="1.9.2.16"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/core/4.3.1.Beta2"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/staging/updates/core/4.3.1.CR1a/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha1/"/>
+
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha2/"/>
+      <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/updates/core/master"/> -->
    </location>
 
   </locations>
diff --git a/target-platform/src/targets/integration-stack-base-ea.target b/target-platform/src/targets/integration-stack-base-ea.target
index 9589f73f..67a6da4f 100644
--- a/target-platform/src/targets/integration-stack-base-ea.target
+++ b/target-platform/src/targets/integration-stack-base-ea.target
@@ -44,33 +44,33 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 
       <!-- Eclipse EMF -->
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.2.0.201602020703"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201602020703"/>
-      <unit id="org.eclipse.emf.compare.rcp" version="2.4.0.201602020703"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui" version="4.2.0.201602020703"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.rcp" version="2.4.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui" version="4.2.0.201604280603"/>
 
       <!-- Eclipse EMF/OCL + deps like EMF Query and UML2 -->
-      <unit id="org.eclipse.emf.validation.ocl.feature.group" version="1.10.0.201512142118"/>
-      <unit id="org.eclipse.emf.query.ocl.feature.group" version="1.10.0.201512142117"/>
-      <unit id="org.eclipse.emf.query.feature.group" version="1.10.0.201512142117"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.10.0.201512152038"/>
-      <unit id="org.eclipse.emf.validation.feature.group" version="1.10.0.201512142118"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.10.0.201512152038"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160128-0808"/>
-      <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.12.0.v20160201-0859"/>
+      <unit id="org.eclipse.emf.validation.ocl.feature.group" version="1.10.0.201605030103"/>
+      <unit id="org.eclipse.emf.query.ocl.feature.group" version="1.10.0.201605030032"/>
+      <unit id="org.eclipse.emf.query.feature.group" version="1.10.0.201605030032"/>
+      <unit id="org.eclipse.emf.transaction.feature.group" version="1.10.0.201605031913"/>
+      <unit id="org.eclipse.emf.validation.feature.group" version="1.10.0.201605030103"/>
+      <unit id="org.eclipse.emf.workspace.feature.group" version="1.10.0.201605031913"/>
+      <unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>
+      <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.12.0.v20160429-0808"/>
 
-      <unit id="org.eclipse.uml2.feature.group" version="5.2.0.v20160201-0937"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.2.0.v20160502-0821"/>
 
       <!-- Google Guava : Eclipse EMF -->
       <unit id="com.google.guava" version="15.0.0.v201403281430"/>
 
       <!-- Eclipse OCL/ALL -->
-      <unit id="org.eclipse.ocl.all.feature.group" version="5.1.100.v20160105-1617"/>
+      <unit id="org.eclipse.ocl.all.feature.group" version="5.2.0.v20160224-1849"/>
 
       <unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
 
       <!-- transitive dependencies -->
-      <unit id="com.ibm.icu" version="54.1.1.v201511091919"/>
+      <unit id="com.ibm.icu" version="56.1.0.v201601250100"/>
       <unit id="javax.xml" version="1.3.4.v201005080400"/>
       <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
       <unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
@@ -78,15 +78,15 @@
       <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
       <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
 
-      <unit id="org.eclipse.draw2d" version="3.10.100.201602010304"/>
+      <unit id="org.eclipse.draw2d" version="3.10.100.201605020204"/>
       <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
       <unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
       <unit id="org.jsoup" version="1.7.2.v201411291515"/>
       <unit id="org.junit" version="4.11.0.v201303080030"/>
 
       <!-- Graphiti - BPMN2 Modeler, Fuse Tooling, SwitchYard -->
-      <unit id="org.eclipse.graphiti.feature.feature.group" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.13.0.v20160203-1129"/>
+      <unit id="org.eclipse.graphiti.feature.feature.group" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.13.0.v20160504-0920"/>
       <unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>
       <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
       <unit id="org.apache.batik.ext.awt" version="1.7.0.v201011041433"/>
@@ -94,23 +94,23 @@
       <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
       <unit id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
       <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
-      <unit id="org.eclipse.graphiti" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.doc" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.export.batik" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.mm" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.pattern" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.tools.newprojectwizard" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.ui" version="0.13.0.v20160203-1129"/>
-      <unit id="org.eclipse.graphiti.ui.capabilities" version="0.13.0.v20160203-1129"/>
+      <unit id="org.eclipse.graphiti" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.doc" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.export.batik" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.mm" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.pattern" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.tools.newprojectwizard" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.ui" version="0.13.0.v20160504-0920"/>
+      <unit id="org.eclipse.graphiti.ui.capabilities" version="0.13.0.v20160504-0920"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
       <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
 
-      <unit id="org.eclipse.core.net" version="1.2.300.v20141118-1725"/>
-      <unit id="org.eclipse.equinox.cm" version="1.1.200.v20151106-2040"/>
-      <unit id="org.eclipse.zest.feature.group" version="1.7.0.201602010304"/>
+      <unit id="org.eclipse.core.net" version="1.3.0.v20160418-1534"/>
+      <unit id="org.eclipse.equinox.cm" version="1.1.200.v20160324-1850"/>
+      <unit id="org.eclipse.zest.feature.group" version="1.7.0.201605020204"/>
       
-      <repository location="http://download.jboss.org/jbosstools/updates/requirements/neon/201602051000-M5/"/>
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/neon/201605061000-M7/"/>
     </location>
 
     <!-- Birt Report - Teiid -->
@@ -130,9 +130,9 @@
       <repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/4.6.0.v201602022206/"/>
     </location>
 
-    <!-- TM and RSE are in Luna site but this way we get sources too -->
+    <!-- TM and RSE including sources. -->
     <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <repository location="http://download.jboss.org/jbosstools/updates/requirements/tm/4.0.0.RC4/"/>
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/tm/4.1.0.201603190914/"/>
       <unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/>
       <unit id="org.eclipse.rse.core.feature.group" version="3.7.0.201505221634"/>
       <unit id="org.eclipse.rse.ssh.feature.group" version="3.7.0.201505221634"/>
@@ -157,7 +157,7 @@
       <unit id="org.codehaus.jackson.core" version="1.6.0.v20101005-0925"/>
       <unit id="org.codehaus.jackson.mapper" version="1.6.0.v20101005-0925"/>
       <unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
-      <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20150519210750/"/>
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/S20160501200945/"/>
     </location>
 
     <!-- transitive dependencies for org.springframework.* (Fuse Tooling) -->
@@ -240,27 +240,27 @@
       <!-- Required by BPEL, ESB, and any projects w/ UI tests -->
       <!-- TODO: consider migrating UI tests to https://github.com/jbosstools/jbosstools-integration-tests/ so they're built downstream instead of within the components' builds -->
       <!-- <unit id="org.jboss.tools.test.feature.feature.group" version="3.6.0.Final-v20150924-2213-B38"/> -->
-      <unit id="org.jboss.tools.tests" version="3.7.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.as.test.core" version="3.2.0.Alpha1-v20160428-0033-B952"/>
-      <unit id="org.jboss.tools.common.base.test" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.test" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.jmx.core.test" version="1.8.0.Alpha1-v20160428-0033-B952"/>
+      <unit id="org.jboss.tools.tests" version="3.7.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.as.test.core" version="3.2.0.Alpha1-v20160519-0029-B970"/>
+      <unit id="org.jboss.tools.common.base.test" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.test" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.jmx.core.test" version="1.8.0.Alpha1-v20160519-0029-B970"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.coretests-site_master/2016-04-22_12-52-32-B5049/all/repo/"/>-->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/coretests/4.3.1.Beta2/"/>  -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/stable/updates/coretests/4.3.0.Final/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/staging/updates/coretests/4.3.1.CR1a/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.0.Alpha1/"/>
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.0.Alpha2/"/>
    </location>
 
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.jboss.tools.common" version="3.8.0.Alpha1-v20160429-0158-B920"/>
+      <unit id="org.jboss.tools.common" version="3.8.0.Alpha1-v20160511-2035-B942"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/core/4.3.1.Beta2"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/staging/updates/core/4.3.1.CR1a/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha1/"/>
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha2/"/>
    </location>
 
   </locations>
diff --git a/target-platform/src/targets/integration-stack-base.target b/target-platform/src/targets/integration-stack-base.target
index ee4cc14f..e2f6acff 100644
--- a/target-platform/src/targets/integration-stack-base.target
+++ b/target-platform/src/targets/integration-stack-base.target
@@ -16,27 +16,27 @@
       <!-- Required by BPEL, ESB, and any projects w/ UI tests -->
       <!-- TODO: consider migrating UI tests to https://github.com/jbosstools/jbosstools-integration-tests/ so they're built downstream instead of within the components' builds -->
       <!-- <unit id="org.jboss.tools.test.feature.feature.group" version="3.6.0.Final-v20150924-2213-B38"/> -->
-      <unit id="org.jboss.tools.tests" version="3.7.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.as.test.core" version="3.2.0.Alpha1-v20160428-0033-B952"/>
-      <unit id="org.jboss.tools.common.base.test" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.common.test" version="3.8.0.Alpha1-v20160429-0158-B920"/>
-      <unit id="org.jboss.tools.jmx.core.test" version="1.8.0.Alpha1-v20160428-0033-B952"/>
+      <unit id="org.jboss.tools.tests" version="3.7.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.as.test.core" version="3.2.0.Alpha1-v20160519-0029-B970"/>
+      <unit id="org.jboss.tools.common.base.test" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.common.test" version="3.8.0.Alpha1-v20160511-2035-B942"/>
+      <unit id="org.jboss.tools.jmx.core.test" version="1.8.0.Alpha1-v20160519-0029-B970"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.coretests-site_master/2016-04-22_12-52-32-B5049/all/repo/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/coretests/4.3.1.Beta2/"/>  -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/stable/updates/coretests/4.3.0.Final/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/staging/updates/coretests/4.3.1.CR1a/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.0.Alpha1/"/>
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.0.Alpha2/"/>
    </location>
 
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.jboss.tools.common" version="3.8.0.Alpha1-v20160429-0158-B920"/>
+      <unit id="org.jboss.tools.common" version="3.8.0.Alpha1-v20160511-2035-B942"/>
 
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/static/mars/development/updates/core/4.3.1.Beta2"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/staging/updates/core/4.3.1.CR1a/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha1/"/>
+      <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.0.Alpha2/"/>
    </location>
 
   </locations>