Update PDE.setup to use github URI for eclipse.pde.build
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/144
Signed-off-by: Ed Merks <ed.merks@gmail.com>
Change-Id: I29913924777c467f2263f07798daf7b8d94e6df3
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/192271
diff --git a/releng/org.eclipse.pde.ui.setup/PDE.setup b/releng/org.eclipse.pde.ui.setup/PDE.setup
index c98eeeb..5388e3a 100644
--- a/releng/org.eclipse.pde.ui.setup/PDE.setup
+++ b/releng/org.eclipse.pde.ui.setup/PDE.setup
@@ -86,7 +86,7 @@
xsi:type="setup.targlets:TargletTask">
<targlet
name="PDE"
- activeRepositoryList="CBI">
+ activeRepositoryList="CBI+Orbit">
<requirement
name="org.eclipse.platform.feature.group"/>
<requirement
@@ -96,13 +96,13 @@
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<repositoryList
- name="CBI">
+ name="CBI+Orbit">
<repository
url="https://download.eclipse.org/cbi/updates/license"/>
<repository
- url="https://download.eclipse.org/reddeer/releases/3.5.0"/>
- <repository
url="https://download.eclipse.org/reddeer/releases/latest"/>
+ <repository
+ url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
</repositoryList>
</targlet>
</setupTask>
@@ -177,7 +177,8 @@
</targlet>
</setupTask>
<setupTask
- xsi:type="setup.workingsets:WorkingSetTask">
+ xsi:type="setup.workingsets:WorkingSetTask"
+ id="pde.ui.workingsets">
<workingSet
name="PDE UI">
<predicate
@@ -187,7 +188,7 @@
project="org.eclipse.pde"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@projects[name='ui']/@setupTasks.2/@workingSets[name='PDE%20API%20Tools'] //@projects[name='ui']/@setupTasks.2/@workingSets[name='PDE%20Tests']"/>
+ excludedWorkingSet="//'pde.ui.workingsets'/@workingSets[name='PDE%20API%20Tools'] //'pde.ui.workingsets'/@workingSets[name='PDE%20Tests']"/>
</predicate>
</workingSet>
<workingSet
@@ -202,7 +203,7 @@
pattern=".*\.api\..*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@projects[name='ui']/@setupTasks.2/@workingSets[name='PDE%20Tests']"/>
+ excludedWorkingSet="//'pde.ui.workingsets'/@workingSets[name='PDE%20Tests']"/>
</predicate>
</workingSet>
<workingSet
@@ -235,13 +236,13 @@
label="Build">
<setupTask
xsi:type="git:GitCloneTask"
- id="git.clone.pde.build"
- remoteURI="pde/eclipse.pde.build">
+ id="github.clone.pde.build"
+ remoteURI="eclipse-pde/eclipse.pde.build">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
- <value>eclipse.git.gerrit.remoteURIs</value>
+ <value>github.remoteURIs</value>
</detail>
<detail
key="label">
@@ -252,12 +253,6 @@
<value>remoteURI</value>
</detail>
</annotation>
- <configSections
- name="gerrit">
- <properties
- key="createchangeid"
- value="true"/>
- </configSections>
<description>PDE Core</description>
</setupTask>
<setupTask
@@ -268,11 +263,12 @@
<requirement
name="*"/>
<sourceLocator
- rootFolder="${git.clone.pde.build.location}"/>
+ rootFolder="${github.clone.pde.build.location}"/>
</targlet>
</setupTask>
<setupTask
- xsi:type="setup.workingsets:WorkingSetTask">
+ xsi:type="setup.workingsets:WorkingSetTask"
+ id="pde.build.workingsets">
<workingSet
name="PDE Build">
<predicate