From 2003c99b63081afa55f9298cc190fee703b8e6ba Mon Sep 17 00:00:00 2001
From: Paul Leacu <pleacu@redhat.com>
Date: Thu, 18 Aug 2016 15:17:50 -0400
Subject: [PATCH] JBTIS-837 - sync w/ AM3

---
 target-platform/pom.xml                       |  8 +++--
 target-platform/src/targets/community.target  |  4 +--
 target-platform/src/targets/core-base.target  | 30 +++++++++----------
 .../targets/integration-stack-base-ea.target  |  4 +--
 .../src/targets/integration-stack-base.target |  4 +--
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/target-platform/pom.xml b/target-platform/pom.xml
index a72cf9a9..60b901d1 100644
--- a/target-platform/pom.xml
+++ b/target-platform/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.jboss.tools.integration-stack</groupId>
   <artifactId>target-platform</artifactId>
-  <version>4.4.0.Alpha1</version>
+  <version>4.4.0.Alpha2-SNAPSHOT</version>
 
   <name>JBoss Tools Integration Stack Target Platform</name>
   <description>
@@ -21,6 +21,8 @@
     Build -P mirror to get:
        target-platform-ea.target.repo
        target-platform.target.repo
+
+    Build -Dp2diff.skip to turn off p2 differentiation.
   </description>
 
   <packaging>pom</packaging>
@@ -33,12 +35,12 @@
   </parent>
 
   <properties>
-    <baseRepositoryUrl>http://download.jboss.org/jbosstools/targetplatforms/jbtistarget/${version}/jbtis/</baseRepositoryUrl>
+    <baseRepositoryUrl>http://download.jboss.org/jbosstools/targetplatforms/jbtistarget/4.4.0.Alpha1/jbtis/</baseRepositoryUrl>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <tychoVersion>0.25.0</tychoVersion>
     <tychoExtrasVersion>${tychoVersion}</tychoExtrasVersion>
     <jbossTychoPluginsVersion>0.25.1-SNAPSHOT</jbossTychoPluginsVersion>
-    <JBTCoreTPVersion>4.60.1.AM1-SNAPSHOT</JBTCoreTPVersion>
+    <JBTCoreTPVersion>4.60.1.AM3-SNAPSHOT</JBTCoreTPVersion>
     <p2diff.skip>false</p2diff.skip>
   </properties>
 
diff --git a/target-platform/src/targets/community.target b/target-platform/src/targets/community.target
index fff56f71..26887891 100644
--- a/target-platform/src/targets/community.target
+++ b/target-platform/src/targets/community.target
@@ -12,12 +12,12 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="org.jboss.tools.community.central.feature.feature.group" version="2.1.1.v20160614-2133"/>
       <unit id="org.jboss.tools.community.project.examples.feature.feature.group" version="3.1.1.v20160614-2134"/>
-      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.1.v20160614-2134"/>
+      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.1.v20160812-0234"/>
 
       <!-- <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/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.1.AM2/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM3/"/>
     </location>
 
   </locations>
diff --git a/target-platform/src/targets/core-base.target b/target-platform/src/targets/core-base.target
index 3b4f1989..28586c90 100644
--- a/target-platform/src/targets/core-base.target
+++ b/target-platform/src/targets/core-base.target
@@ -10,14 +10,14 @@
     <!-- 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.1.v20160716-0902"/>
+      <unit id="org.hibernate.eclipse.feature.feature.group" version="5.1.1.v20160730-2332"/>
       <unit id="org.jboss.ide.eclipse.archives.feature.feature.group" version="3.6.101.v20160607-2122"/>
-      <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.1.v20160722-0641"/>
-      <unit id="org.jboss.ide.eclipse.freemarker.feature.feature.group" version="1.5.101.v20160718-0829"/>
+      <unit id="org.jboss.ide.eclipse.as.feature.feature.group" version="3.2.1.v20160812-0023"/>
+      <unit id="org.jboss.ide.eclipse.freemarker.feature.feature.group" version="1.5.101.v20160809-0015"/>
       <unit id="org.jboss.tools.cdi.deltaspike.feature.feature.group" version="1.8.1.v20160607-2131"/>
-      <unit id="org.jboss.tools.cdi.feature.feature.group" version="1.8.1.v20160701-0417"/>
+      <unit id="org.jboss.tools.cdi.feature.feature.group" version="1.8.1.v20160812-0202"/>
       <unit id="org.jboss.tools.cdi.seam.feature.feature.group" version="1.8.1.v20160607-2131"/>
-      <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.1.v20160711-1005"/>
+      <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.1.v20160808-1619"/>
       <unit id="org.jboss.tools.discovery.core" version="1.2.1.v20160614-2135"/>
       <unit id="org.jboss.tools.common.core.feature.feature.group" version="3.8.1.v20160607-2053"/>
       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.1.v20160624-2216"/>
@@ -27,20 +27,20 @@
       <unit id="org.jboss.tools.common.ui.feature.feature.group" version="3.8.1.v20160607-2053"/>
       <unit id="org.jboss.tools.common.verification.feature.feature.group" version="3.8.1.v20160607-2053"/>
       <unit id="org.jboss.tools.common.feature.feature.group" version="3.8.1.v20160624-2216"/>
-      <unit id="org.jboss.tools.forge.feature.feature.group" version="2.0.101.v20160714-1748"/>
+      <unit id="org.jboss.tools.forge.feature.feature.group" version="2.0.101.v20160811-1815"/>
       <unit id="org.jboss.tools.forge.ext.feature.feature.group" version="2.0.101.v20160607-1332"/>
-      <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.1.v20160725-1257"/>
+      <unit id="org.jboss.tools.foundation.feature.feature.group" version="1.3.1.v20160812-0215"/>
       <unit id="org.jboss.tools.foundation.security.linux.feature.feature.group" version="1.3.1.v20160607-2053"/>
       <unit id="org.jboss.tools.foundation.help.ui" version="1.3.1.v20160607-2053"/>
       <unit id="org.jboss.tools.foundation.license.feature.feature.group" version="1.3.1.v20160607-2053"/>
-      <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.8.1.v20160629-0432"/>
+      <unit id="org.jboss.tools.jmx.feature.feature.group" version="1.8.1.v20160805-2259"/>
       <unit id="org.jboss.tools.jsf.feature.feature.group" version="3.8.1.v20160607-2131"/>
-      <unit id="org.jboss.tools.jst.feature.feature.group" version="3.8.1.v20160628-0959"/>
+      <unit id="org.jboss.tools.jst.feature.feature.group" version="3.8.1.v20160812-0201"/>
       <unit id="org.jboss.tools.livereload.feature.feature.group" version="1.4.1.v20160707-1435"/>
       <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.1.v20160614-2136"/>
       <unit id="org.jboss.tools.maven.feature.feature.group" version="1.8.1.v20160614-2136"/>
-      <unit id="org.jboss.tools.maven.hibernate.feature.feature.group" version="1.8.1.v20160614-2136"/>
+      <unit id="org.jboss.tools.maven.hibernate.feature.feature.group" version="1.8.1.v20160727-1413"/>
       <unit id="org.jboss.tools.maven.jbosspackaging.feature.feature.group" version="1.8.1.v20160614-2136"/>
       <unit id="org.jboss.tools.maven.jdt.feature.feature.group" version="1.8.1.v20160614-2136"/>
       <unit id="org.jboss.tools.maven.portlet.feature.feature.group" version="1.8.1.v20160614-2136"/>
@@ -48,17 +48,17 @@
       <unit id="org.jboss.tools.maven.seam.feature.feature.group" version="1.8.1.v20160614-2136"/>
       <unit id="org.jboss.tools.maven.sourcelookup.feature.feature.group" version="1.8.1.v20160614-2136"/>
       <unit id="org.jboss.tools.openshift.egit.integration.feature.feature.group" version="3.3.0.v20160607-2011"/>
-      <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.3.0.v20160721-1330"/>
+      <unit id="org.jboss.tools.openshift.express.feature.feature.group" version="3.3.0.v20160811-1941"/>
       <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.1.v20160614-2134"/>
+      <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.1.v20160812-0234"/>
       <unit id="org.jboss.tools.richfaces.feature.feature.group" version="3.8.1.v20160607-2131"/>
-      <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.1.v20160607-2053"/>
+      <unit id="org.jboss.tools.runtime.core.feature.feature.group" version="3.2.1.v20160812-0025"/>
       <unit id="org.jboss.tools.runtime.seam.detector.feature.feature.group" version="3.8.1.v20160607-2131"/>
       <unit id="org.jboss.tools.seam.feature.feature.group" version="3.8.1.v20160607-2131"/>
       <unit id="org.jboss.tools.stacks.core.feature.feature.group" version="1.3.1.v20160607-2053"/>
       <unit id="org.jboss.tools.usage" version="2.2.1.v20160607-2053"/>
       <unit id="org.jboss.tools.browsersim.feature.feature.group" version="3.8.1.v20160610-2137"/>
-      <unit id="org.jboss.tools.vpe.feature.feature.group" version="3.8.1.v20160629-1520"/>
+      <unit id="org.jboss.tools.vpe.feature.feature.group" version="3.8.1.v20160727-2110"/>
       <unit id="org.jboss.tools.ws.feature.feature.group" version="1.9.1.v20160608-0648"/>
       <unit id="org.jboss.tools.ws.jaxrs.feature.feature.group" version="1.9.1.v20160608-0648"/>
       <unit id="org.jboss.tools.wtp.runtimes.tomcat.feature.feature.group" version="1.3.101.v20160607-2122"/>
@@ -68,7 +68,7 @@
       <!-- <repository location="http://download.jboss.org/jbosstools/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.1.AM2/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/updates/core/master"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM3/"/>
    </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 0bf6b421..18b97186 100644
--- a/target-platform/src/targets/integration-stack-base-ea.target
+++ b/target-platform/src/targets/integration-stack-base-ea.target
@@ -250,7 +250,7 @@
       <!-- <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/stable/updates/coretests/4.3.0.Final/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.1.AM2/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.1.AM3/"/>
    </location>
 
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -259,7 +259,7 @@
       <!-- <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/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.1.AM2/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM3/"/>
    </location>
 
   </locations>
diff --git a/target-platform/src/targets/integration-stack-base.target b/target-platform/src/targets/integration-stack-base.target
index dca0c350..6fd56916 100644
--- a/target-platform/src/targets/integration-stack-base.target
+++ b/target-platform/src/targets/integration-stack-base.target
@@ -25,7 +25,7 @@
       <!-- <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/stable/updates/coretests/4.3.0.Final/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/coretests/4.4.1.AM2/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.1.AM3/"/>
    </location>
 
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -34,7 +34,7 @@
       <!-- <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/mars/stable/updates/core/"/> -->
       <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.1.AM2/"/> -->
-      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM2/"/>
+      <repository location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.1.AM3/"/>
    </location>
 
   </locations>