From ae68201315261741fa876457108074482f332882 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Tue, 16 May 2017 11:20:31 +0200 Subject: [PATCH] Bug 516330 - Uprev all features to 4.3 and introduce Maven -Pcdtserial All features are upreved to 4.3 along with the Parent POM for the upcoming Terminal 4.3 / Oxygen release. Plugin versions remain unchanged, keeping them as semantic versions. Along the lines, also - Introduce a Maven Profile -Pcdtserial, which is active by default to build the cdtserial plug-ins. This can be de-activated by property -Dnocdtserial on the mvn command-line. This is necessary to build / validate Terminal against older streams (juno,mars,...,neon) which did not have the necessary cdt native serial dependency. - Update the update site to http://download.eclipse.org/tm/terminal/updates/4.3 - Update Copyright Year in all features to 2017 - Update p2 repo URLs of Oxygen and Orbit dependencies. - Update the terminals.psf project-set file adding the new cdtserial. Change-Id: I8992fe4bb8ac08abe783d33fbb8b00b4e864fd73 Signed-off-by: Martin Oberhuber --- admin/pom-build.xml | 4 +- admin/pom-config.xml | 28 +++++----- .../feature.properties | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.properties | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.properties | 6 +-- .../feature.xml | 6 +-- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 6 +-- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 6 +-- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 4 +- .../feature.xml | 14 ++--- .../org.eclipse.tm.terminal.feature/pom.xml | 4 +- .../feature.properties | 4 +- .../feature.xml | 14 ++--- .../pom.xml | 4 +- .../feature.properties | 4 +- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 6 +-- .../feature.xml | 4 +- .../pom.xml | 4 +- .../feature.properties | 2 +- .../feature.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.tm.terminal.control/pom.xml | 2 +- plugins/org.eclipse.tm.terminal.test/pom.xml | 2 +- .../org.eclipse.tm.terminal.view.core/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.tm.terminal.view.ui/pom.xml | 2 +- pom.xml | 54 ++++++++++++++----- repos/org.eclipse.tm.terminal.repo/pom.xml | 4 +- terminals.psf | 12 +++-- 77 files changed, 220 insertions(+), 186 deletions(-) diff --git a/admin/pom-build.xml b/admin/pom-build.xml index 1b3f50b924e..9591cdf44e6 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -7,13 +7,13 @@ org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-config - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT pom-config.xml org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-build - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT pom TM Terminal, Maven Build Master diff --git a/admin/pom-config.xml b/admin/pom-config.xml index bcab7875d51..a0c4383d5e9 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -10,7 +10,7 @@ org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-config - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT pom TM Terminal, Maven Configuration Master @@ -55,15 +55,15 @@ development ${project.artifactId}.zip /home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly - 4.5 + 4.7 http://download.eclipse.org/cbi/updates/license http://download.eclipse.org/eclipse/updates/4.7milestones http://download.eclipse.org/staging/oxygen - http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository - http://download.eclipse.org/tools/cdt/builds/neon/milestones - http://download.eclipse.org/tm/updates/4.1milestones + http://download.eclipse.org/tools/orbit/S-builds/S20170505151127/repository + http://download.eclipse.org/tools/cdt/builds/oxygen/milestones + http://download.eclipse.org/tm/updates/4.3milestones http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones http://download.eclipse.org/technology/swtbot/releases/latest/ http://archive.eclipse.org/tm/updates/rxtx @@ -148,6 +148,7 @@ 3.8 http://download.eclipse.org/eclipse/updates/${sdk-version} http://download.eclipse.org/releases/${terminal-stream} + http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/ http://download.eclipse.org/tools/cdt/releases/8.4 @@ -160,6 +161,7 @@ 4.3 http://download.eclipse.org/eclipse/updates/${sdk-version} http://download.eclipse.org/releases/${terminal-stream} + http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/ http://download.eclipse.org/tools/cdt/releases/8.4 @@ -172,6 +174,7 @@ 4.4 http://download.eclipse.org/eclipse/updates/${sdk-version} http://download.eclipse.org/releases/${terminal-stream} + http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/ http://download.eclipse.org/tools/cdt/releases/8.5 @@ -184,7 +187,8 @@ 4.5 http://download.eclipse.org/eclipse/updates/${sdk-version} http://download.eclipse.org/releases/${terminal-stream} - http://download.eclipse.org/tools/cdt/releases/8.7 + http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/ + http://download.eclipse.org/tools/cdt/releases/8.8.1 @@ -194,15 +198,13 @@ neon 4.6 - - http://download.eclipse.org/eclipse/updates/4.6-M-builds - - http://download.eclipse.org/staging/${terminal-stream} - - http://download.eclipse.org/tools/cdt/builds/neon/milestones + http://download.eclipse.org/eclipse/updates/${sdk-version} + http://download.eclipse.org/releases/${terminal-stream} + http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository + http://download.eclipse.org/tools/cdt/releases/9.2 - + diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.properties index 84c64e1b8ac..b4ad0f4964d 100644 --- a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.properties @@ -21,7 +21,7 @@ featureName=TM Terminal Serial Connector Extensions providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.2 Updates +updateSiteName=TM Terminal 4.3 Updates # "description" property - description of the feature description=A serial line connector for the Terminal diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.xml index b0e44c309fd..0f7af84bc1c 100644 --- a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.xml @@ -31,7 +31,7 @@ - + org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-build - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../admin/pom-build.xml diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.properties index 229855c57b5..bd2a334a321 100644 --- a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.properties @@ -21,7 +21,7 @@ featureName=TM Terminal Serial Connector Extensions, SDK providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.2 Updates +updateSiteName=TM Terminal 4.3 Updates # "description" property - description of the feature description=A serial line connector for the Terminal diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.xml index ad40eb35802..18340814182 100644 --- a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/feature.xml @@ -31,7 +31,7 @@ - + org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-build - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../admin/pom-build.xml diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties index 811064b2727..70ff675c01e 100644 --- a/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2006, 2016 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. # 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 @@ -21,14 +21,14 @@ featureName=TM Terminal Local Connector Extensions providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.2 Updates +updateSiteName=TM Terminal 4.3 Updates # "description" property - description of the feature description=A connector implementation for the Local Terminal. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2003, 2016 Wind River Systems, Inc. and others.\n\ +Copyright (c) 2003, 2017 Wind River Systems, Inc. and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml index 39d7841f191..2ccac5913c1 100644 --- a/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml @@ -1,6 +1,6 @@ - repos/org.eclipse.tm.terminal.repo + + + - tests - - plugins/org.eclipse.tm.terminal.test - - + + cdtserial + + + + true + !nocdtserial + + + plugins/org.eclipse.tm.terminal.connector.cdtserial + features/org.eclipse.tm.terminal.connector.cdtserial.feature + features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature + repos/org.eclipse.tm.terminal.repo + + + + + rxtxserial + + true + !norxtx + + + plugins/org.eclipse.tm.terminal.connector.serial + features/org.eclipse.tm.terminal.connector.serial.feature + features/org.eclipse.tm.terminal.connector.serial.sdk.feature + + + + + tests + + plugins/org.eclipse.tm.terminal.test + + diff --git a/repos/org.eclipse.tm.terminal.repo/pom.xml b/repos/org.eclipse.tm.terminal.repo/pom.xml index 3e98b77444d..215fcf22b59 100644 --- a/repos/org.eclipse.tm.terminal.repo/pom.xml +++ b/repos/org.eclipse.tm.terminal.repo/pom.xml @@ -7,11 +7,11 @@ org.eclipse.tm.terminal org.eclipse.tm.terminal.maven-build - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../admin/pom-build.xml - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT org.eclipse.tm.terminal.repo eclipse-repository diff --git a/terminals.psf b/terminals.psf index 02f70a51d89..3a17b424333 100644 --- a/terminals.psf +++ b/terminals.psf @@ -11,6 +11,9 @@ + + + @@ -53,6 +56,7 @@ + @@ -60,16 +64,18 @@ - + + + + - - +