update settings and make them consistent

This commit is contained in:
Eyck Jentzsch 2020-09-20 17:38:09 +02:00
parent 2975db1fd7
commit 25730020c0

View File

@ -25,8 +25,19 @@
xsi:type="setup.p2:P2Task"> xsi:type="setup.p2:P2Task">
<requirement <requirement
name="org.eclipse.oomph.setup.feature.group"/> name="org.eclipse.oomph.setup.feature.group"/>
<requirement
name="org.eclipse.egit.gitflow.feature.feature.group"/>
<requirement
name="net.resheim.eclipse.launcher.feature.group"
filter="(osgi.os=macosx)"/>
<requirement
name="com.eclipserunner.feature.feature.group"/>
<repository <repository
url="${oomph.update.url}"/> url="${oomph.update.url}"/>
<repository
url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
<repository
url="https://resheim.net/p2/eclipse-launcher/"/>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:CompoundTask" xsi:type="setup:CompoundTask"
@ -347,8 +358,6 @@
<requirement <requirement
name="org.eclipse.linuxtools.callgraph.feature.feature.group" name="org.eclipse.linuxtools.callgraph.feature.feature.group"
filter="(osgi.os=linux)"/> filter="(osgi.os=linux)"/>
<requirement
name="org.eclipse.egit.gitflow.feature.feature.group"/>
<requirement <requirement
name="org.eclipse.cdt.mylyn.feature.group"/> name="org.eclipse.cdt.mylyn.feature.group"/>
<requirement <requirement
@ -365,19 +374,10 @@
name="de.marw.cdt.cmake.feature.group"/> name="de.marw.cdt.cmake.feature.group"/>
<requirement <requirement
name="com.cthing.cmakeed.feature.feature.group"/> name="com.cthing.cmakeed.feature.feature.group"/>
<requirement
name="net.resheim.eclipse.launcher.feature.group"
filter="(osgi.os=macosx)"/>
<requirement <requirement
name="net.mihai-nita.ansicon.feature.group"/> name="net.mihai-nita.ansicon.feature.group"/>
<requirement
name="com.eclipserunner.feature.feature.group"/>
<repository <repository
url="http://www.mihai-nita.net/eclipse"/> url="http://www.mihai-nita.net/eclipse"/>
<repository
url="https://resheim.net/p2/eclipse-launcher/"/>
<repository
url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/> url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/>
<repository <repository
@ -932,8 +932,6 @@
<requirement <requirement
name="org.eclipse.linuxtools.callgraph.feature.feature.group" name="org.eclipse.linuxtools.callgraph.feature.feature.group"
filter="(osgi.os=linux)"/> filter="(osgi.os=linux)"/>
<requirement
name="org.eclipse.egit.gitflow.feature.feature.group"/>
<requirement <requirement
name="org.eclipse.cdt.mylyn.feature.group"/> name="org.eclipse.cdt.mylyn.feature.group"/>
<requirement <requirement
@ -954,21 +952,12 @@
name="de.marw.cdt.cmake.feature.group"/> name="de.marw.cdt.cmake.feature.group"/>
<requirement <requirement
name="com.cthing.cmakeed.feature.feature.group"/> name="com.cthing.cmakeed.feature.feature.group"/>
<requirement
name="net.resheim.eclipse.launcher.feature.group"
filter="(osgi.os=macosx)"/>
<requirement <requirement
name="net.mihai-nita.ansicon.feature.group"/> name="net.mihai-nita.ansicon.feature.group"/>
<requirement
name="com.eclipserunner.feature.feature.group"/>
<repository <repository
url="http://www.pydev.org/updates"/> url="http://www.pydev.org/updates"/>
<repository <repository
url="http://www.mihai-nita.net/eclipse"/> url="http://www.mihai-nita.net/eclipse"/>
<repository
url="https://resheim.net/p2/eclipse-launcher/"/>
<repository
url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
<repository <repository
url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/> url="https://raw.githubusercontent.com/15knots/cmake4eclipse/master/releng/comp-update/"/>
<repository <repository
@ -1191,8 +1180,6 @@
name="org.codehaus.groovy.headless.feature.feature.group"/> name="org.codehaus.groovy.headless.feature.feature.group"/>
<requirement <requirement
name="org.codehaus.groovy.m2eclipse.feature.feature.group"/> name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
<requirement
name="org.eclipse.egit.gitflow.feature.feature.group"/>
<requirement <requirement
name="org.eclipse.linuxtools.javadocs.feature.feature.group"/> name="org.eclipse.linuxtools.javadocs.feature.feature.group"/>
<requirement <requirement
@ -1279,17 +1266,8 @@
filter="(&amp;(|(osgi.arch=x86)(osgi.arch=x86_64))(|(osgi.os=linux)(osgi.os=macosx)(osgi.os=win32)))"/> filter="(&amp;(|(osgi.arch=x86)(osgi.arch=x86_64))(|(osgi.os=linux)(osgi.os=macosx)(osgi.os=win32)))"/>
<requirement <requirement
name="org.sf.feeling.decompiler.procyon.feature.group"/> name="org.sf.feeling.decompiler.procyon.feature.group"/>
<requirement
name="com.eclipserunner.feature.feature.group"/>
<requirement
name="net.resheim.eclipse.launcher.feature.group"
filter="(osgi.os=macosx)"/>
<repository
url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
<repository <repository
url="https://ecd-plugin.github.io/update"/> url="https://ecd-plugin.github.io/update"/>
<repository
url="https://resheim.net/p2/eclipse-launcher/"/>
</setupTask> </setupTask>
<version <version
name="2020-09" name="2020-09"
@ -1495,11 +1473,6 @@
filter="(&amp;(|(osgi.arch=x86)(osgi.arch=x86_64))(|(osgi.os=linux)(osgi.os=macosx)(osgi.os=win32)))"/> filter="(&amp;(|(osgi.arch=x86)(osgi.arch=x86_64))(|(osgi.os=linux)(osgi.os=macosx)(osgi.os=win32)))"/>
<requirement <requirement
name="org.sf.feeling.decompiler.procyon.feature.group"/> name="org.sf.feeling.decompiler.procyon.feature.group"/>
<requirement
name="com.eclipserunner.feature.feature.group"/>
<requirement
name="net.resheim.eclipse.launcher.feature.group"
filter="(osgi.os=macosx)"/>
<requirement <requirement
name="org.scala-ide.sdt.weaving.feature.feature.group"/> name="org.scala-ide.sdt.weaving.feature.feature.group"/>
<requirement <requirement
@ -1518,82 +1491,11 @@
name="org.scala-ide.sdt.scalatest.feature.feature.group"/> name="org.scala-ide.sdt.scalatest.feature.feature.group"/>
<requirement <requirement
name="org.scala-ide.zinc.feature.feature.group"/> name="org.scala-ide.zinc.feature.feature.group"/>
<repository
url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
<repository <repository
url="https://ecd-plugin.github.io/update"/> url="https://ecd-plugin.github.io/update"/>
<repository
url="https://resheim.net/p2/eclipse-launcher/"/>
<repository <repository
url="http://download.scala-ide.org/sdk/lithium/e47/scala212/stable/site"/> url="http://download.scala-ide.org/sdk/lithium/e47/scala212/stable/site"/>
</setupTask> </setupTask>
<version
name="2020-06"
label="2020-06"
requiredJavaVersion="1.8">
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse IDE for Java Developers (2020-03)">
<requirement
name="epp.package.java"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
name="org.eclipse.eclemma.feature.feature.group"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"/>
<requirement
name="org.eclipse.epp.mpc.feature.group"/>
<requirement
name="org.eclipse.jdt.feature.group"/>
<requirement
name="org.eclipse.jgit.feature.group"/>
<requirement
name="org.eclipse.m2e.feature.feature.group"/>
<requirement
name="org.eclipse.m2e.logback.feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.context_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.git.feature.group"/>
<requirement
name="org.eclipse.mylyn.hudson.feature.group"/>
<requirement
name="org.eclipse.mylyn.ide_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.java_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn_feature.feature.group"/>
<requirement
name="org.eclipse.tips.feature.feature.group"/>
<requirement
name="org.eclipse.wst.xml_ui.feature.feature.group"/>
<requirement
name="202001230951.org.eclipse.wb"/>
<repository
url="http://download.eclipse.org/technology/epp/packages/2020-06"/>
<repository
url="http://download.eclipse.org/releases/2020-06/202006171000">
<annotation
source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
</repository>
<repository
url="https://download.eclipse.org/windowbuilder/latest/"/>
</setupTask>
</version>
<version <version
name="2020-12" name="2020-12"
label="2020-12" label="2020-12"
@ -1714,6 +1616,73 @@
</repository> </repository>
</setupTask> </setupTask>
</version> </version>
<version
name="2020-06"
label="2020-06"
requiredJavaVersion="1.8">
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse IDE for Java Developers (2020-03)">
<requirement
name="epp.package.java"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.16.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
name="org.eclipse.eclemma.feature.feature.group"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"/>
<requirement
name="org.eclipse.epp.mpc.feature.group"/>
<requirement
name="org.eclipse.jdt.feature.group"/>
<requirement
name="org.eclipse.jgit.feature.group"/>
<requirement
name="org.eclipse.m2e.feature.feature.group"/>
<requirement
name="org.eclipse.m2e.logback.feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.context_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.git.feature.group"/>
<requirement
name="org.eclipse.mylyn.hudson.feature.group"/>
<requirement
name="org.eclipse.mylyn.ide_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.java_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
<requirement
name="org.eclipse.mylyn_feature.feature.group"/>
<requirement
name="org.eclipse.tips.feature.feature.group"/>
<requirement
name="org.eclipse.wst.xml_ui.feature.feature.group"/>
<requirement
name="202001230951.org.eclipse.wb"/>
<repository
url="http://download.eclipse.org/technology/epp/packages/2020-06"/>
<repository
url="http://download.eclipse.org/releases/2020-06/202006171000">
<annotation
source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
</repository>
<repository
url="https://download.eclipse.org/windowbuilder/latest/"/>
</setupTask>
</version>
<version <version
name="2020-03" name="2020-03"
label="2020-03" label="2020-03"