diff options
author | Martin Oberhuber | 2017-06-15 13:52:39 +0000 |
---|---|---|
committer | Martin Oberhuber | 2017-06-15 13:52:39 +0000 |
commit | 6aaa47eccd8d123557276530fef317978b1f11dc (patch) | |
tree | 7e3c7f8923e00822056f1d44eae7fa0e324db66a | |
parent | 45df774ca7406b81d7a1c86da4678c05604b1e67 (diff) | |
download | org.eclipse.tcf-6aaa47eccd8d123557276530fef317978b1f11dc.tar.gz org.eclipse.tcf-6aaa47eccd8d123557276530fef317978b1f11dc.tar.xz org.eclipse.tcf-6aaa47eccd8d123557276530fef317978b1f11dc.zip |
Bug 459873 - Releng: Update to Tycho-0.23.1, Unify Target Platforms
- Tycho-0.23 makes multiple Hudson builds in parallel more robust
- Use SWTbot-2.2.1 on Eclipse-3.8 to keep target dependencies clean
- Bring *.target files in sync with pom-config.xml for interactive use
- Add OSX .DS_Store to .gitignore
Change-Id: I9784e6cc4820662c885930858894f9fba82fdcfe
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | admin/.project | 16 | ||||
-rw-r--r-- | admin/pom-build.xml | 89 | ||||
-rw-r--r-- | admin/pom-config.xml | 29 | ||||
-rw-r--r-- | admin/target-defs/eclipse-3.8.2-juno.target | 27 | ||||
-rw-r--r-- | admin/target-defs/eclipse-4.3.x-kepler.target | 13 | ||||
-rw-r--r-- | admin/target-defs/eclipse-4.4.x-luna.target | 11 | ||||
-rw-r--r-- | admin/target-defs/eclipse-4.5.x-mars.target | 9 | ||||
-rw-r--r-- | admin/target-defs/eclipse-4.6.x-neon.target | 2 |
9 files changed, 114 insertions, 85 deletions
diff --git a/.gitignore b/.gitignore index bd4a84fe0..0751d5c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ target/ coverage/ artifacts/ /ManifestValidationResult.html + +# MacOSX +.DS_Store diff --git a/admin/.project b/admin/.project index cc07dcfcf..2833b5226 100644 --- a/admin/.project +++ b/admin/.project @@ -20,24 +20,24 @@ <locationURI>PARENT-1-PROJECT_LOC/CodeStyle.xml</locationURI> </link> <link> - <name>master.gitignore</name> + <name>pom.xml</name> <type>1</type> - <locationURI>PARENT-1-PROJECT_LOC/.gitignore</locationURI> + <locationURI>PARENT-1-PROJECT_LOC/pom.xml</locationURI> </link> <link> - <name>master.mailmap</name> + <name>readme.txt</name> <type>1</type> - <locationURI>PARENT-1-PROJECT_LOC/.mailmap</locationURI> + <locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI> </link> <link> - <name>pom.xml</name> + <name>toplevel.gitignore</name> <type>1</type> - <locationURI>PARENT-1-PROJECT_LOC/pom.xml</locationURI> + <locationURI>PARENT-1-PROJECT_LOC/.gitignore</locationURI> </link> <link> - <name>readme.txt</name> + <name>toplevel.mailmap</name> <type>1</type> - <locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI> + <locationURI>PARENT-1-PROJECT_LOC/.mailmap</locationURI> </link> </linkedResources> </projectDescription> diff --git a/admin/pom-build.xml b/admin/pom-build.xml index a0b1e3b92..5febbd4f9 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -5,10 +5,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.tcf</groupId> - <artifactId>org.eclipse.tcf.maven-config</artifactId> - <version>1.5.0-SNAPSHOT</version> - <relativePath>pom-config.xml</relativePath> + <groupId>org.eclipse.tcf</groupId> + <artifactId>org.eclipse.tcf.maven-config</artifactId> + <version>1.5.0-SNAPSHOT</version> + <relativePath>pom-config.xml</relativePath> </parent> <groupId>org.eclipse.tcf</groupId> @@ -37,9 +37,8 @@ <profiles> <profile> <id>sign</id> - <!-- Uses the new jarsigner from the CBI platform --> + <!-- Uses the new jarsigner from the CBI platform --> <!-- Works only if the build runs at a Eclipse build server --> - <build> <plugins> <plugin> @@ -61,10 +60,9 @@ </plugins> </build> </profile> - + <profile> <id>findbugs</id> - <build> <plugins> <plugin> @@ -89,48 +87,47 @@ </plugins> </build> </profile> + <profile> <id>tests</id> - <build> <plugins> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <dependency-resolution> - <extraRequirements> - <!-- product IU under test --> - <requirement> - <type>p2-installable-unit</type> - <id>org.eclipse.platform.ide</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.sdk</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.cdt.platform</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.remote</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.swtbot.eclipse</id> - <versionRange>0.0.0</versionRange> - </requirement> - </extraRequirements> - </dependency-resolution> - </configuration> - </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <!-- product IU under test --> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.platform.ide</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.sdk</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.cdt.platform</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.remote</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.swtbot.eclipse</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 0b6fb4e0d..486786dfe 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -19,6 +19,14 @@ <name>Eclipse Public License</name> <url>http://www.eclipse.org/legal/epl-v10.html</url> <distribution>repo</distribution> + <comments> + All rights reserved. + + This program and the accompanying materials are made + available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.htm + </comments> </license> </licenses> @@ -29,9 +37,11 @@ <properties> <!-- Define version id's to be used in the plugins section --> - <!-- We stick to tycho-0.22 since it supports Java 7 for building --> + <!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 --> + <!-- We cannot use tycho-0.25 or later since it doesn't support Java 7 for building --> + <!-- Using Java 8 for Tycho with a Java 7 target should be possible but takes some config --> <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference --> - <tycho-version>0.22.0</tycho-version> + <tycho-version>0.23.1</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <maven-resources-version>2.7</maven-resources-version> <maven-antrun-version>1.8</maven-antrun-version> @@ -44,7 +54,6 @@ <!-- Common global properties --> <adminDir>${env.WORKSPACE}/admin</adminDir> - <tcf-stream>development</tcf-stream> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- JaCoCo global properties --> @@ -52,6 +61,7 @@ <jacoco.output>file</jacoco.output> <jacoco.dumpOnExit>true</jacoco.dumpOnExit> + <tcf-stream>development</tcf-stream> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git</tycho.scmUrl> <!-- P2 repository URL's --> @@ -63,9 +73,12 @@ <terminal-site>http://download.eclipse.org/tm/terminal/updates/4.0</terminal-site> <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site> <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site> - <!-- SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer --> - <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/</orbit-site> - <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.5.0/</swtbot-site> + <!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 --> + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site> + <!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: --> + <!-- See http://wiki.eclipse.org/SWTBot/Releases --> + <!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer --> + <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site> </properties> <repositories> @@ -165,6 +178,7 @@ <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository</orbit-site> <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site> + <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.5.0</swtbot-site> </properties> </profile> @@ -180,8 +194,8 @@ <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.1</remote-site> <terminal-site>http://download.eclipse.org/tm/terminal/updates/4.2</terminal-site> <tm-site>http://download.eclipse.org/tm/updates/4.2</tm-site> + <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.5.0</swtbot-site> </properties> - <repositories> <repository> <id>cdt-launchbar</id> @@ -205,7 +219,6 @@ <tm-site>http://download.eclipse.org/tm/updates/4.3milestones</tm-site> <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site> </properties> - <repositories> <repository> <id>cdt-launchbar</id> diff --git a/admin/target-defs/eclipse-3.8.2-juno.target b/admin/target-defs/eclipse-3.8.2-juno.target index d6beb1d5d..ef3189bf3 100644 --- a/admin/target-defs/eclipse-3.8.2-juno.target +++ b/admin/target-defs/eclipse-3.8.2-juno.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Eclipse 3.8.x (Juno)" sequenceNumber="39"> +<?pde version="3.8"?><target name="Eclipse 3.8.x (Juno)" sequenceNumber="47"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> @@ -20,18 +20,23 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> -<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/> -<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/> -<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/> -<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/> +<unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/> +<unit id="org.eclipse.swtbot.forms.feature.group" version="2.2.1.201402241301"/> +<unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> -<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> -<repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/> +<unit id="org.hamcrest.library" version="1.3.0.v201305281000"/> +<repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.rse.feature.group" version="3.5.0.201406091451"/> -<unit id="org.eclipse.tm.terminal.core.sdk.feature.group" version="3.3.300.201406060905"/> -<repository location="http://download.eclipse.org/tm/updates/3.4"/> +<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<unit id="org.eclipse.tm.terminal.view.rse.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/> +<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201505221634"/> +<repository location="http://download.eclipse.org/tm/updates/4.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.feature.group" version="8.3.0.201402142303"/> @@ -41,7 +46,7 @@ <unit id="com.google.gson" version="2.2.4.v201311231704"/> <unit id="org.apache.commons.net" version="3.2.0.v201305141515"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> +<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.remote.feature.group" version="2.0.0.201507010000"/> diff --git a/admin/target-defs/eclipse-4.3.x-kepler.target b/admin/target-defs/eclipse-4.3.x-kepler.target index 60807c7a5..ca91b86e6 100644 --- a/admin/target-defs/eclipse-4.3.x-kepler.target +++ b/admin/target-defs/eclipse-4.3.x-kepler.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Eclipse 4.3.x (Kepler)" sequenceNumber="38"> +<?pde version="3.8"?><target name="Eclipse 4.3.x (Kepler)" sequenceNumber="39"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> @@ -29,9 +29,14 @@ <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.rse.feature.group" version="3.5.0.201406091451"/> -<unit id="org.eclipse.tm.terminal.core.sdk.feature.group" version="3.3.300.201406060905"/> -<repository location="http://download.eclipse.org/tm/updates/3.5"/> +<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<unit id="org.eclipse.tm.terminal.view.rse.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/> +<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201505221634"/> +<repository location="http://download.eclipse.org/tm/updates/4.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.feature.group" version="8.3.0.201402142303"/> diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target index 4a71c30ca..d927fc666 100644 --- a/admin/target-defs/eclipse-4.4.x-luna.target +++ b/admin/target-defs/eclipse-4.4.x-luna.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="65"> +<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="76"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> @@ -29,9 +29,14 @@ <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<unit id="org.eclipse.tm.terminal.view.rse.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/> -<unit id="org.eclipse.tm.terminal.core.sdk.feature.group" version="3.3.300.201406060905"/> -<repository location="http://download.eclipse.org/tm/updates/3.6"/> +<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201505221634"/> +<repository location="http://download.eclipse.org/tm/updates/4.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.feature.group" version="8.6.0.201502131403"/> diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target index 2f0251169..58b50acd1 100644 --- a/admin/target-defs/eclipse-4.5.x-mars.target +++ b/admin/target-defs/eclipse-4.5.x-mars.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Eclipse 4.5.x (Mars)" sequenceNumber="72"> +<?pde version="3.8"?><target name="Eclipse 4.5.x (Mars)" sequenceNumber="97"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> @@ -30,11 +30,12 @@ </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.0.0.201506040610"/> +<unit id="org.eclipse.tm.terminal.view.rse.sdk.feature.feature.group" version="4.0.0.201506040610"/> <repository location="http://download.eclipse.org/tm/terminal/updates/4.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.rse.feature.group" version="3.7.2.201610260947"/> -<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201610260947"/> +<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/> +<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201505221634"/> <repository location="http://download.eclipse.org/tm/updates/4.0"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -48,7 +49,7 @@ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.remote.feature.group" version="2.0.2.201601261800"/> +<unit id="org.eclipse.remote.feature.group" version="2.0.2.201604010301"/> <repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.0.2"/> </location> </locations> diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target index f05b97796..c656cc1b6 100644 --- a/admin/target-defs/eclipse-4.6.x-neon.target +++ b/admin/target-defs/eclipse-4.6.x-neon.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="Eclipse 4.6.x (Neon)" sequenceNumber="107"> +<?pde version="3.8"?><target name="Eclipse 4.6.x (Neon)" sequenceNumber="112"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> |