From 6aaa47eccd8d123557276530fef317978b1f11dc Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Thu, 15 Jun 2017 15:52:39 +0200 Subject: 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 --- .gitignore | 3 + admin/.project | 16 ++--- admin/pom-build.xml | 89 +++++++++++++-------------- admin/pom-config.xml | 29 ++++++--- admin/target-defs/eclipse-3.8.2-juno.target | 27 ++++---- admin/target-defs/eclipse-4.3.x-kepler.target | 13 ++-- admin/target-defs/eclipse-4.4.x-luna.target | 11 +++- admin/target-defs/eclipse-4.5.x-mars.target | 9 +-- 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 @@ PARENT-1-PROJECT_LOC/CodeStyle.xml - master.gitignore + pom.xml 1 - PARENT-1-PROJECT_LOC/.gitignore + PARENT-1-PROJECT_LOC/pom.xml - master.mailmap + readme.txt 1 - PARENT-1-PROJECT_LOC/.mailmap + PARENT-1-PROJECT_LOC/readme.txt - pom.xml + toplevel.gitignore 1 - PARENT-1-PROJECT_LOC/pom.xml + PARENT-1-PROJECT_LOC/.gitignore - readme.txt + toplevel.mailmap 1 - PARENT-1-PROJECT_LOC/readme.txt + PARENT-1-PROJECT_LOC/.mailmap 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 @@ 4.0.0 - org.eclipse.tcf - org.eclipse.tcf.maven-config - 1.5.0-SNAPSHOT - pom-config.xml + org.eclipse.tcf + org.eclipse.tcf.maven-config + 1.5.0-SNAPSHOT + pom-config.xml org.eclipse.tcf @@ -37,9 +37,8 @@ sign - + - @@ -61,10 +60,9 @@ - + findbugs - @@ -89,48 +87,47 @@ + tests - - - - org.eclipse.tycho - target-platform-configuration - - - - - - p2-installable-unit - org.eclipse.platform.ide - 0.0.0 - - - eclipse-feature - org.eclipse.sdk - 0.0.0 - - - eclipse-feature - org.eclipse.cdt.platform - 0.0.0 - - - eclipse-feature - org.eclipse.remote - 0.0.0 - - - eclipse-feature - org.eclipse.swtbot.eclipse - 0.0.0 - - - - - + + org.eclipse.tycho + target-platform-configuration + + + + + + p2-installable-unit + org.eclipse.platform.ide + 0.0.0 + + + eclipse-feature + org.eclipse.sdk + 0.0.0 + + + eclipse-feature + org.eclipse.cdt.platform + 0.0.0 + + + eclipse-feature + org.eclipse.remote + 0.0.0 + + + eclipse-feature + org.eclipse.swtbot.eclipse + 0.0.0 + + + + + org.jacoco jacoco-maven-plugin 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 @@ Eclipse Public License http://www.eclipse.org/legal/epl-v10.html repo + + 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 + @@ -29,9 +37,11 @@ - + + + - 0.22.0 + 0.23.1 ${tycho-version} 2.7 1.8 @@ -44,7 +54,6 @@ ${env.WORKSPACE}/admin - development UTF-8 @@ -52,6 +61,7 @@ file true + development scm:git:git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.git @@ -63,9 +73,12 @@ http://download.eclipse.org/tm/terminal/updates/4.0 http://download.eclipse.org/tools/ptp/builds/remote/2.0.0 http://archive.eclipse.org/tm/updates/rxtx - - http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/ - http://download.eclipse.org/technology/swtbot/releases/2.5.0/ + + http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/ + + + + http://download.eclipse.org/technology/swtbot/releases/2.2.1/ @@ -165,6 +178,7 @@ http://download.eclipse.org/eclipse/updates/4.5 http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository http://download.eclipse.org/tools/cdt/releases/8.8.1 + http://download.eclipse.org/technology/swtbot/releases/2.5.0 @@ -180,8 +194,8 @@ http://download.eclipse.org/tools/ptp/builds/remote/2.1.1 http://download.eclipse.org/tm/terminal/updates/4.2 http://download.eclipse.org/tm/updates/4.2 + http://download.eclipse.org/technology/swtbot/releases/2.5.0 - cdt-launchbar @@ -205,7 +219,6 @@ http://download.eclipse.org/tm/updates/4.3milestones http://download.eclipse.org/technology/swtbot/releases/latest/ - cdt-launchbar 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 @@ - + @@ -20,18 +20,23 @@ - - - - + + + + - - + + - - - + + + + + + + + @@ -41,7 +46,7 @@ - + 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 @@ - + @@ -29,9 +29,14 @@ - - - + + + + + + + + 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 @@ - + @@ -29,9 +29,14 @@ + + + + + - - + + 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 @@ - + @@ -30,11 +30,12 @@ + - - + + @@ -48,7 +49,7 @@ - + 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 @@ - + -- cgit v1.2.3