Updated Sphinx Oxygen target wrt Oxygen M7, upgraded all Sphinx targets
to latest Orbit release and Guava 21.0.0
diff --git a/tools/org.eclipse.sphinx.targets/mars/mars.target b/tools/org.eclipse.sphinx.targets/mars/mars.target
index 0244943..615ab16 100644
--- a/tools/org.eclipse.sphinx.targets/mars/mars.target
+++ b/tools/org.eclipse.sphinx.targets/mars/mars.target
@@ -17,7 +17,7 @@
<repository location="http://download.eclipse.org/technology/nebula/snapshot"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
@@ -25,7 +25,7 @@
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.easymock" version="2.4.0.v20090202-0900"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/tools/org.eclipse.sphinx.targets/neon/neon.target b/tools/org.eclipse.sphinx.targets/neon/neon.target
index 92af776..bf83e2e 100644
--- a/tools/org.eclipse.sphinx.targets/neon/neon.target
+++ b/tools/org.eclipse.sphinx.targets/neon/neon.target
@@ -17,7 +17,7 @@
<repository location="http://download.eclipse.org/technology/nebula/snapshot"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
@@ -25,7 +25,7 @@
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.easymock" version="2.4.0.v20090202-0900"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/tools/org.eclipse.sphinx.targets/oxygen/oxygen.target b/tools/org.eclipse.sphinx.targets/oxygen/oxygen.target
index cafd874..b0a459e 100644
--- a/tools/org.eclipse.sphinx.targets/oxygen/oxygen.target
+++ b/tools/org.eclipse.sphinx.targets/oxygen/oxygen.target
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sphinx Oxygen Target" sequenceNumber="38">
+<?pde version="3.8"?><target name="Sphinx Oxygen Target" sequenceNumber="40">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170126-1030"/>
-<unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20170126-1030"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170111-1955"/>
+<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170512-0500"/>
+<unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20170512-0500"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170511-1520"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -17,7 +17,7 @@
<repository location="http://download.eclipse.org/technology/nebula/snapshot"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
@@ -25,28 +25,28 @@
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.easymock" version="2.4.0.v20090202-0900"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.0.201701271543"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
-<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20161031-0603"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.0.v201701262152"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201705111548"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201703131642"/>
+<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20170505-0338"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.0.v201608061824"/>
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="3.0.0.N20170216-0410"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201606071900"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201606071713"/>
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="3.0.6.201703111926"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.11.0.201705111354"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.11.0.201705100939"/>
<unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170123-0457"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170504-0807"/>
<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.20.v201605261103"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.11.0.v20170201-0242"/>
-<unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170123-0457"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170130-0907"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170427-1113"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170504-0807"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201703131640"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170309-1408"/>
<repository location="http://download.eclipse.org/staging/oxygen"/>
</location>
</locations>
