mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

Bug 572552 - CDT releng: update baseline to 2021-03

Browse source 
Updated baseline to 2021-03 for
* cdt-baseline.target
* CDT.setup
* parent pom is not changed


Updated target to 2021-03 where it was pointing to older versions for
* cdt.target
* CDT.setup

Change-Id: Ie8117b4cb6f86c8ad105710d14dde6222380d289
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
This commit is contained in:
Alexander Fedorov 2021-04-02 12:15:24 +03:00
parent 466c20618b
commit 212084cc6d
4 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -48,7 +48,7 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs> <base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
<comparator.repo>https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0</comparator.repo> <comparator.repo>https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/</comparator.repo>
<!-- these parameters are to control baseline replace and compare. On a local build you want <!-- these parameters are to control baseline replace and compare. On a local build you want
to avoid baseline replace and compare, especially if you have different versions of Java than to avoid baseline replace and compare, especially if you have different versions of Java than
the baseline was built with. This is the default. the baseline was built with. This is the default.

26
releng/CDT.setup
View file

@ -75,7 +75,7 @@
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="eclipse.target.platform" name="eclipse.target.platform"
defaultValue="2020-12" defaultValue="2021-03"
storageURI="scope://Workspace"/> storageURI="scope://Workspace"/>
<setupTask <setupTask
xsi:type="setup.targlets:TargletTask" xsi:type="setup.targlets:TargletTask"
@ -166,15 +166,15 @@
<repositoryList <repositoryList
name="CDT Latest Released"> name="CDT Latest Released">
<repository <repository
url="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/> url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
<repository <repository
url="https://download.eclipse.org/egit/updates-5.9/"/> url="https://download.eclipse.org/egit/updates-5.11/"/>
<repository <repository
url="https://download.eclipse.org/linuxtools/update-2020-12-docker/"/> url="https://download.eclipse.org/linuxtools/update-2021-03-rc2/"/>
<repository <repository
url="https://download.eclipse.org/lsp4e/releases/0.17.0/"/> url="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
<repository <repository
url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23/"/> url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
<repository <repository
url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/> url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
<repository <repository
@ -182,7 +182,7 @@
<repository <repository
url="https://download.eclipse.org/tm4e/releases/0.4.1/"/> url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
<repository <repository
url="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0"> url="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0">
<annotation> <annotation>
<detail <detail
key="description"> key="description">
@ -194,7 +194,7 @@
</annotation> </annotation>
</repository> </repository>
<repository <repository
url="https://download.eclipse.org/tools/orbit/downloads/2020-12/"/> url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
<repository <repository
url="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/> url="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/>
</repositoryList> </repositoryList>
@ -309,11 +309,11 @@
rootFolder="${git.clone.cdt.location}" rootFolder="${git.clone.cdt.location}"
locateNestedProjects="true"/> locateNestedProjects="true"/>
<repositoryList <repositoryList
name="2020-12"> name="2021-03">
<repository <repository
url="https://download.eclipse.org/cbi/updates/license/"/> url="https://download.eclipse.org/cbi/updates/license/"/>
<repository <repository
url="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/> url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
<repository <repository
url="https://download.eclipse.org/egit/updates/"/> url="https://download.eclipse.org/egit/updates/"/>
<repository <repository
@ -321,7 +321,7 @@
<repository <repository
url="https://download.eclipse.org/wildwebdeveloper/snapshots/"/> url="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
<repository <repository
url="https://download.eclipse.org/lsp4e/releases/0.17.0/"/> url="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
<repository <repository
url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/> url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
<repository <repository
@ -333,7 +333,7 @@
<repository <repository
url="https://download.eclipse.org/tm4e/releases/0.4.1/"/> url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
<repository <repository
url="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/"> url="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0/">
<annotation> <annotation>
<detail <detail
key="description"> key="description">
@ -342,7 +342,7 @@
</annotation> </annotation>
</repository> </repository>
<repository <repository
url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository"/> url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
<repository <repository
url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/> url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
</repositoryList> </repositoryList>

27
releng/org.eclipse.cdt.target/cdt-baseline.target
View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="cdt-baseline" sequenceNumber="26"> <target name="cdt-baseline" sequenceNumber="27">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.18/"/> <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/egit/updates-5.9/"/> <repository location="https://download.eclipse.org/egit/updates-5.11"/>
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/> <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/linuxtools/update-2020-12-docker/"/> <repository location="https://download.eclipse.org/linuxtools/update-2021-03-rc2/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4e" version="0.0.0"/> <unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/> <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.16.0/"/> <repository location="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23"/> <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/> <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
@ -71,13 +71,13 @@
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/"/> <repository location="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/> <unit id="com.google.gson" version="0.0.0"/>
<unit id="com.sun.xml.bind" version="0.0.0"/> <unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.activation" version="0.0.0"/> <unit id="javax.activation" version="1.2.2.v20201119-1642"/>
<unit id="javax.xml.bind" version="0.0.0"/> <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.xml.stream" version="0.0.0"/> <unit id="javax.xml.stream" version="0.0.0"/>
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/> <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
<unit id="org.antlr.runtime" version="0.0.0"/> <unit id="org.antlr.runtime" version="0.0.0"/>
@ -91,13 +91,16 @@
<unit id="org.junit.jupiter.api" version="0.0.0"/> <unit id="org.junit.jupiter.api" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/> <unit id="org.mockito" version="0.0.0"/>
<unit id="org.slf4j.impl.log4j12" version="0.0.0"/> <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository"/> <unit id="org.yaml.snakeyaml" version="0.0.0"/>
<unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
<unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/> <repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
</location> </location>
</locations> </locations>
</target> </target>

10
releng/org.eclipse.cdt.target/cdt.target
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="cdt" sequenceNumber="103"> <target name="cdt" sequenceNumber="104">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/> <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@ -12,7 +12,7 @@
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.test.feature.group" version="0.0.0"/> <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
<unit id="org.eclipse.unittest.ui" version="0.0.0"/> <unit id="org.eclipse.unittest.ui" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/> <repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/egit/updates"/> <repository location="https://download.eclipse.org/egit/updates"/>
@ -25,7 +25,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4e" version="0.0.0"/> <unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/> <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.17.0/"/> <repository location="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/> <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/> <repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/"/> <repository location="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0/"/>
<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. --> <!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/> <unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
</location> </location>
@ -76,7 +76,7 @@
<unit id="org.yaml.snakeyaml" version="0.0.0"/> <unit id="org.yaml.snakeyaml" version="0.0.0"/>
<unit id="com.sun.jna" version="5.6.0.v20200716-0148"/> <unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
<unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/> <unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/> <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>