From 2b12960dd05e666843179982ed46cba8496f03e8 Mon Sep 17 00:00:00 2001
From: Paul Leacu <pleacu@redhat.com>
Date: Thu, 4 May 2017 17:08:54 -0400
Subject: [PATCH] JBTIS-1046 - update for oxy

---
 target-platform/src/targets/community.target  |  6 +--
 target-platform/src/targets/core-base.target  |  7 +--
 .../targets/integration-stack-base-ea.target  | 24 ---------
 .../src/targets/integration-stack-base.target | 49 +++----------------
 4 files changed, 10 insertions(+), 76 deletions(-)

diff --git a/target-platform/src/targets/community.target b/target-platform/src/targets/community.target
index 7b663d96..dc31a16b 100644
--- a/target-platform/src/targets/community.target
+++ b/target-platform/src/targets/community.target
@@ -14,11 +14,9 @@
       <unit id="org.jboss.tools.community.project.examples.feature.feature.group" version="3.1.3.v20161214-0939"/>
       <unit id="org.jboss.tools.project.examples.feature.feature.group" version="3.1.3.v20170210-2258"/>
       <unit id="org.jboss.tools.central.feature.feature.group" version="2.1.3.v20170116-1347"/>
-      <!-- <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/oxygen/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <repository id="jbt-core-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/core/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
-      <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
-      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
+      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/oxygen/development/updates/core/4.4.3.AM2/"/> -->
     </location>
 
   </locations>
diff --git a/target-platform/src/targets/core-base.target b/target-platform/src/targets/core-base.target
index ba2b7e44..34bf55d9 100644
--- a/target-platform/src/targets/core-base.target
+++ b/target-platform/src/targets/core-base.target
@@ -59,12 +59,9 @@
        <unit id="org.jboss.tools.vpe.feature.feature.group" version="3.8.3.v20170117-2000"/>
        <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/oxygen/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <repository id="jbt-core-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/core/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
-      <!-- <repository location="http://download.jboss.org/jbosstools/neon/snapshots/updates/core/master"/> -->
-      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.3.Final/"/> -->
-      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
+      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/oxygen/development/updates/core/4.4.3.AM2/"/> -->
     </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 651d3311..86696ad0 100644
--- a/target-platform/src/targets/integration-stack-base-ea.target
+++ b/target-platform/src/targets/integration-stack-base-ea.target
@@ -8,34 +8,10 @@
 <target name="integration-stack-base-ea-target" sequenceNumber="7">
   <locations>
 
-   <!-- JBoss Tools Core Tests -->
-   <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-
-      <!-- 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.7.3.v20161213-1258"/>
-      <unit id="org.jboss.tools.tests" version="3.7.3.v20161213-1258"/>
-      <unit id="org.jboss.tools.as.test.core" version="3.3.0.v20170310-1550"/>
-      <unit id="org.jboss.tools.common.base.test" version="3.9.0.v20170316-1838"/>
-      <unit id="org.jboss.tools.common.test" version="3.9.0.v20170316-1838"/>
-      <unit id="org.jboss.tools.jmx.core.test" version="1.10.0.v20170329-1654"/>
-
-      <!-- <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 id="jbt-coretests-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/coretests/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-coretests-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.3.AM2/"/> -->
-      <!-- <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/> -->
-   </location>
-
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="org.jboss.tools.common" version="3.9.0.v20170316-1838"/>
 
-      <!-- <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 id="jbt-core-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/core/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.3.AM2/"/> -->
-      <!-- <repository location="http://download.jboss.org/jbosstools/neon/staging/updates/core/4.4.2.Final/"/> -->
-      <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
-      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
    </location>
 
   </locations>
diff --git a/target-platform/src/targets/integration-stack-base.target b/target-platform/src/targets/integration-stack-base.target
index 0705a29b..321a5367 100644
--- a/target-platform/src/targets/integration-stack-base.target
+++ b/target-platform/src/targets/integration-stack-base.target
@@ -30,12 +30,6 @@
       <repository id="jbt-bpel" location="http://download.jboss.org/jbosstools/updates/requirements/bpel/1.1.0.Final/"/>
     </location>
 
-    <!-- Reddeer - QE -->
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-       <unit id="org.jboss.reddeer.graphiti.feature.feature.group" version="1.2.1.Final"/>
-      <repository id="jbt-reddeer" location="http://download.jboss.org/jbosstools/neon/stable/updates/reddeer/1.2.1/"/>
-    </location>
-
     <!-- JBoss Tools Locus - objects either not in Eclipse Orbit or needed sooner than scheduled. -->
     <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="org.apache.servicemix.bundles.aopalliance" version="1.0.0.3"/>
@@ -103,7 +97,7 @@
       <unit id="org.jsoup" version="1.7.2.v201411291515"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
 
-      <!-- Graphiti - BPMN2 Modeler, Fuse Tooling, SwitchYard -->
+      <!-- Graphiti - BPMN2 Modeler, SwitchYard -->
       <unit id="org.eclipse.graphiti.feature.feature.group" version="0.14.0.201701312008"/>
       <unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.14.0.201701312008"/>
       <unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>
@@ -156,15 +150,6 @@
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 
-      <!-- Fuse Tooling Data Transformation -->
-      <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-      <unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.6.2.v20161117-2150"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.6.2.v20161117-2150"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.6.2.v20161117-2150"/>
-      <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
-      <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
-      
       <!-- Teiid -->
       <unit id="org.codehaus.jackson.core" version="1.6.0.v20101005-0925"/>
       <unit id="org.codehaus.jackson.mapper" version="1.6.0.v20101005-0925"/>
@@ -172,23 +157,6 @@
       <repository id="jbt-orbit" location="http://download.jboss.org/jbosstools/updates/requirements/orbit/S20170306214312/"/>
     </location>
 
-    <!-- transitive dependencies for Fuse Tooling -->
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.springframework.aop" version="3.1.4.RELEASE"/>
-      <unit id="org.springframework.beans" version="3.1.4.RELEASE"/>
-      <unit id="org.springframework.context" version="3.1.4.RELEASE"/>
-      <unit id="org.springframework.core" version="3.1.4.RELEASE"/>
-      <unit id="org.springframework.expression" version="3.1.4.RELEASE"/>
-      <unit id="org.springframework.transaction" version="3.1.4.RELEASE"/>
-      <repository id="jbt-springide-3.2.0.201303060654-RELEASE-e4.3" location="http://download.jboss.org/jbosstools/updates/requirements/springide/3.2.0.201303060654-RELEASE-e4.3/"/>
-    </location>
-
-    <!-- Fuse Tooling -->
-    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.eclipse.gemini.management" version="2.0.0.RELEASE"/>
-      <repository id="jbt-gemini" location="http://download.jboss.org/jbosstools/updates/requirements/gemini/2.0.0.RELEASE/"/>
-    </location>
-    
     <!-- -->
     <!-- Apache Directory support for Teiid Designer -->
     <!-- -->
@@ -254,23 +222,18 @@
       <unit id="org.jboss.tools.common.test" version="3.9.0.v20170316-1838"/>
       <unit id="org.jboss.tools.jmx.core.test" version="1.10.0.v20170329-1654"/>
 
-      <!-- <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.2.Final/"/> -->
+      <!-- <repository location="http://download.jboss.org/jbosstools/oxygen/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/oxygen/stable/updates/coretests/4.5.0.Final/"/> -->
+      <!-- <repository location="http://download.jboss.org/jbosstools/oxygen/staging/updates/coretests/4.4.2.Final/"/> -->
       <repository id="jbt-coretests-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/coretests/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/coretests/4.4.3.AM2/"/> -->
-      <!-- <repository id="jbt-coretests-4.4.3.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.3.Final/"/> -->
-      <!-- <repository id="jbt-coretests-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/coretests/4.4.2.Final/"/> -->
    </location>
 
    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="org.jboss.tools.common" version="3.9.0.v20170316-1838"/>
 
-      <!-- <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/oxygen/snapshots/builds/jbosstools-build-sites.aggregate.site_master/2016-04-22_12-52-32-B12137/all/repo/"/> -->
       <repository id="jbt-core-4.5.0.AM0" location="http://download.jboss.org/jbosstools/oxygen/staging/updates/core/4.5.0.AM0/"/>
-      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/neon/development/updates/core/4.4.4.AM1/"/> -->
-      <!-- <repository id="jbt-core-4.4.3.Final" location="http://download.jboss.org/jbosstools/neon/stable/updates/core/"/> -->
-      <!-- <repository id="jbt-core-4.4.2.Final" location="http://download.jboss.org/jbosstools/static/neon/stable/updates/core/4.4.2.Final/"/> -->
+      <!-- <repository id="jbt-core-4.4.3.AM2" location="http://download.jboss.org/jbosstools/static/oxygen/development/updates/core/4.4.4.AM1/"/> -->
    </location>
 
   </locations>