mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
Update Eclipse/CDT versions, switch over to CDT TM.
Change-Id: I25560417af00e8e26b93ba9b7cdd4ae4fa57e8f3 Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson
parent
7ef3f914d6
commit
edfa7ea1b1
20 changed files with 70 additions and 148 deletions
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Bundle-Name: %bundleName
|
|||
Bundle-SymbolicName: org.eclipse.remote.serial.ui;singleton:=true
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Activator: org.eclipse.remote.serial.internal.ui.Activator
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Bundle-Name: %bundleName
|
|||
Bundle-SymbolicName: org.eclipse.remote.telnet.ui;singleton:=true
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Activator: org.eclipse.remote.telnet.internal.ui.Activator
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<feature
|
||||
id="org.eclipse.remote"
|
||||
label="%featureName"
|
||||
version="3.0.1.qualifier"
|
||||
version="3.0.2.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.license"
|
||||
license-feature-version="0.0.0">
|
||||
|
||||
<description url="http://eclipse.org/ptp">
|
||||
<description url="http://eclipse.org/remote">
|
||||
%description
|
||||
</description>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<feature
|
||||
id="org.eclipse.remote.console"
|
||||
label="%featureName"
|
||||
version="3.0.1.qualifier"
|
||||
version="3.0.2.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.license"
|
||||
license-feature-version="0.0.0">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<feature
|
||||
id="org.eclipse.remote.proxy"
|
||||
label="%featureName"
|
||||
version="3.0.1.qualifier"
|
||||
version="3.0.2.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.license"
|
||||
license-feature-version="0.0.0">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<feature
|
||||
id="org.eclipse.remote.serial"
|
||||
label="%featureName"
|
||||
version="3.0.1.qualifier"
|
||||
version="3.0.2.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.license"
|
||||
license-feature-version="0.0.0">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<feature
|
||||
id="org.eclipse.remote.telnet"
|
||||
label="%featureName"
|
||||
version="3.0.1.qualifier"
|
||||
version="3.0.2.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.license"
|
||||
license-feature-version="0.0.0">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,20 +10,23 @@
|
|||
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Remote Parent</name>
|
||||
|
||||
<properties>
|
||||
<remote-release>nightly</remote-release>
|
||||
<tycho-version>1.6.0</tycho-version>
|
||||
<!-- Maven 3.6.1 and 3.6.2 do not work with Tycho, see Bug 551674
|
||||
CDT enforces a minimum of 3.6.3 because that is what CDT's CI
|
||||
runs with. It may work with older versions, but this is not
|
||||
tested or supported. -->
|
||||
<required-maven-version>3.6.3</required-maven-version>
|
||||
<tycho-version>2.3.0</tycho-version>
|
||||
<tycho-extras-version>${tycho-version}</tycho-extras-version>
|
||||
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl>
|
||||
<platform-version>4.5</platform-version>
|
||||
<platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}/</platform-site>
|
||||
<license-site>http://download.eclipse.org/cbi/updates/license/</license-site>
|
||||
<tm-site>http://download.eclipse.org/tm/terminal/builds/development/nightly/</tm-site>
|
||||
<cdt-site>http://download.eclipse.org/tools/cdt/builds/master/nightly/</cdt-site>
|
||||
<remote-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/remote/${remote-release}</remote-install-dir>
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
</properties>
|
||||
|
|
@ -103,6 +106,32 @@
|
|||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<inherited>true</inherited>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>3.0.0-M3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>enforce-maven-version</id>
|
||||
<goals>
|
||||
<goal>enforce</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<rules>
|
||||
<requireMavenVersion>
|
||||
<version>${required-maven-version}</version>
|
||||
</requireMavenVersion>
|
||||
<requireJavaVersion>
|
||||
<version>11</version>
|
||||
</requireJavaVersion>
|
||||
</rules>
|
||||
<fail>true</fail>
|
||||
<failFast>true</failFast>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>flatten-maven-plugin</artifactId>
|
||||
|
|
@ -167,8 +196,8 @@
|
|||
<artifact>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>org.eclipse.remote.target</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<classifier>photon</classifier>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<classifier>remote</classifier>
|
||||
</artifact>
|
||||
</target>
|
||||
</configuration>
|
||||
|
|
@ -328,11 +357,11 @@
|
|||
<profile>
|
||||
<id>eclipse-sign</id>
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>m2e-cbi</id>
|
||||
<url>http://download.eclipse.org/technology/m2e/maven/</url>
|
||||
<pluginRepository>
|
||||
<id>cbi</id>
|
||||
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
</pluginRepositories>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
@ -344,49 +373,20 @@
|
|||
<includePackedArtifacts>true</includePackedArtifacts>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-normalize</id>
|
||||
<goals>
|
||||
<goal>normalize</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<version>${cbi-plugins.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-pack</id>
|
||||
<goals>
|
||||
<goal>pack</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-plugin</artifactId>
|
||||
|
|
@ -397,7 +397,7 @@
|
|||
<goals>
|
||||
<goal>p2-metadata</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<phase>verify</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-core</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.eclipse.remote.proxy.server.product</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>1.0.0</version>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?><target name="remote-mars" sequenceNumber="0">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.5/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.mockito" version="0.0.0"/>
|
||||
<unit id="org.hamcrest" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.core" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?>
|
||||
<target name="remote-neon" sequenceNumber="0">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
|
||||
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.mockito" version="0.0.0"/>
|
||||
<unit id="org.hamcrest" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.core" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?><target name="remote-oxygen" sequenceNumber="0">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.hamcrest" version="0.0.0"/>
|
||||
<unit id="org.mockito" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.cdt.core" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/ptp/builds/remote/nightly/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>photon.target</file>
|
||||
<file>remote.target</file>
|
||||
<type>target</type>
|
||||
<classifier>remote-photon</classifier>
|
||||
</artifact>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?><target name="remote-photon" sequenceNumber="1">
|
||||
<?pde version="3.8"?>
|
||||
<target name="remote" sequenceNumber="1">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
|
||||
|
|
@ -8,22 +9,20 @@
|
|||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.hamcrest" version="0.0.0"/>
|
||||
<unit id="org.mockito" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
|
||||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.14/"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.cdt.core" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
|
||||
<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
|
||||
<repository location="https://download.eclipse.org/tm/updates/4.5.102-SNAPSHOT/repository/"/>
|
||||
<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"/>
|
||||
<repository location="https://download.eclipse.org/tools/cdt/releases/10.3/cdt-10.3.0/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>org.eclipse.remote</groupId>
|
||||
<artifactId>remote-parent</artifactId>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<version>3.0.2-SNAPSHOT</version>
|
||||
<relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue