Merge "[526972] Update setups for Photon"
diff --git a/plugins/org.eclipse.oomph.setup.editor/templates/@EclipseProjectTemplate@.setup b/plugins/org.eclipse.oomph.setup.editor/templates/@EclipseProjectTemplate@.setup
index 0e622cd..b7fb22e 100644
--- a/plugins/org.eclipse.oomph.setup.editor/templates/@EclipseProjectTemplate@.setup
+++ b/plugins/org.eclipse.oomph.setup.editor/templates/@EclipseProjectTemplate@.setup
@@ -186,6 +186,13 @@
rootFolder="$${git.clone.${project.name}.location}"
locateNestedProjects="true"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/releases/photon"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/releases/oxygen"/>
diff --git a/plugins/org.eclipse.oomph.setup.editor/templates/@GithubProjectTemplate@.setup b/plugins/org.eclipse.oomph.setup.editor/templates/@GithubProjectTemplate@.setup
index ac86471..e7a7601 100644
--- a/plugins/org.eclipse.oomph.setup.editor/templates/@GithubProjectTemplate@.setup
+++ b/plugins/org.eclipse.oomph.setup.editor/templates/@GithubProjectTemplate@.setup
@@ -167,6 +167,11 @@
rootFolder="$${git.clone.${project.name}.location}"
locateNestedProjects="true"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/releases/photon"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/releases/oxygen"/>
diff --git a/plugins/org.eclipse.oomph.setup.editor/templates/@ProjectCatalogTemplate@.setup b/plugins/org.eclipse.oomph.setup.editor/templates/@ProjectCatalogTemplate@.setup
index 64b9efa..01b2889 100644
--- a/plugins/org.eclipse.oomph.setup.editor/templates/@ProjectCatalogTemplate@.setup
+++ b/plugins/org.eclipse.oomph.setup.editor/templates/@ProjectCatalogTemplate@.setup
@@ -76,6 +76,9 @@
<annotation
source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
<choice
+ value="Photon"
+ label="Eclipse Photon - 4.8"/>
+ <choice
value="Oxygen"
label="Eclipse Oxygen - 4.7"/>
<choice
@@ -116,6 +119,9 @@
<annotation
source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
<choice
+ value="Photon"
+ label="Eclipse Photon - 4.8"/>
+ <choice
value="Oxygen"
label="Eclipse Oxygen - 4.7"/>
<choice
@@ -171,9 +177,14 @@
<repositoryList
name="None"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/eclipse/updates/4.8-I-builds"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
- url="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
+ url="http://download.eclipse.org/eclipse/updates/4.7"/>
</repositoryList>
<repositoryList
name="Neon">
@@ -229,9 +240,14 @@
<repositoryList
name="None"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/eclipse/updates/4.8-I-builds"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
- url="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
+ url="http://download.eclipse.org/eclipse/updates/4.7"/>
</repositoryList>
<repositoryList
name="Neon">
diff --git a/plugins/org.eclipse.oomph.setup.editor/templates/@UserProductTemplate@.setup b/plugins/org.eclipse.oomph.setup.editor/templates/@UserProductTemplate@.setup
index e1a7beb..2e533ab 100644
--- a/plugins/org.eclipse.oomph.setup.editor/templates/@UserProductTemplate@.setup
+++ b/plugins/org.eclipse.oomph.setup.editor/templates/@UserProductTemplate@.setup
@@ -60,6 +60,9 @@
storageURI="scope://Workspace"
label="Eclipse release train">
<choice
+ value="Photon"
+ label="Eclipse Photon - 4.8"/>
+ <choice
value="Oxygen"
label="Eclipse Oxygen - 4.7"/>
<choice
diff --git a/setups/interim/E4Tools.setup b/setups/interim/E4Tools.setup
index eb83b03..9c69cd1 100644
--- a/setups/interim/E4Tools.setup
+++ b/setups/interim/E4Tools.setup
@@ -182,6 +182,26 @@
<sourceLocator
rootFolder="${git.clone.e4.tools.location}"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/releases/photon"/>
+ </repositoryList>
+ <repositoryList
+ name="Oxygen">
+ <repository
+ url="http://download.eclipse.org/releases/oxygen"/>
+ </repositoryList>
+ <repositoryList
+ name="Neon">
+ <repository
+ url="http://download.eclipse.org/releases/neon"/>
+ </repositoryList>
+ <repositoryList
+ name="Mars">
+ <repository
+ url="http://download.eclipse.org/releases/mars"/>
+ </repositoryList>
+ <repositoryList
name="Luna">
<repository
url="http://download.eclipse.org/releases/luna"/>
diff --git a/setups/interim/EMFCompare.setup b/setups/interim/EMFCompare.setup
index e34711b..b902d6b 100644
--- a/setups/interim/EMFCompare.setup
+++ b/setups/interim/EMFCompare.setup
@@ -200,6 +200,20 @@
rootFolder="${git.clone.emfcompare.location}"
locateNestedProjects="true"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/releases/photon"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
+ name="Oxygen">
+ <repository
+ url="http://download.eclipse.org/releases/oxygen"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
name="Mars">
<repository
url="http://download.eclipse.org/releases/mars"/>
diff --git a/setups/interim/Equinox.setup b/setups/interim/Equinox.setup
index 2d1d06e..ec7c3c0 100644
--- a/setups/interim/Equinox.setup
+++ b/setups/interim/Equinox.setup
@@ -70,6 +70,11 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/cbi/updates/license"/>
@@ -319,6 +324,11 @@
<sourceLocator
rootFolder="${git.clone.equinox.bundles.location}"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/tools/ajdt/44/dev/update"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/tools/ajdt/44/dev/update"/>
diff --git a/setups/interim/JDT.setup b/setups/interim/JDT.setup
index 83a0367..f6bd0aa 100644
--- a/setups/interim/JDT.setup
+++ b/setups/interim/JDT.setup
@@ -87,6 +87,11 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/cbi/updates/license"/>
@@ -157,6 +162,8 @@
<sourceLocator
rootFolder="${git.clone.jdt.location}"/>
<repositoryList
+ name="Photon"/>
+ <repositoryList
name="Oxygen"/>
<repositoryList
name="Neon"/>
@@ -230,6 +237,8 @@
<sourceLocator
rootFolder="${git.clone.jdt.core.location}"/>
<repositoryList
+ name="Photon"/>
+ <repositoryList
name="Oxygen"/>
<repositoryList
name="Neon"/>
diff --git a/setups/interim/PDE.setup b/setups/interim/PDE.setup
index 82a6105..4dc4d43 100644
--- a/setups/interim/PDE.setup
+++ b/setups/interim/PDE.setup
@@ -84,6 +84,11 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
+ name="Photon">
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ </repositoryList>
+ <repositoryList
name="Oxygen">
<repository
url="http://download.eclipse.org/cbi/updates/license"/>
