From 087e4aafbf3eb1f48d5e4284e6aae191dd455760 Mon Sep 17 00:00:00 2001 From: gwatson Date: Thu, 26 Jun 2014 11:33:46 -0400 Subject: [PATCH 1/2] Make update_versions script work Change-Id: I219502605284a8cf4f7235390b453a4e6720ad42 Signed-off-by: gwatson --- releng/org.eclipse.remote.build/update_versions | 6 +++--- releng/org.eclipse.remote.repo/category.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releng/org.eclipse.remote.build/update_versions b/releng/org.eclipse.remote.build/update_versions index b4a72b20eeb..32cf53e3c7c 100644 --- a/releng/org.eclipse.remote.build/update_versions +++ b/releng/org.eclipse.remote.build/update_versions @@ -32,7 +32,7 @@ if [ $# -gt 2 ]; then BRANCH=$3 fi -if [ -f fix_versions ]; then +if [ -d fix_versions ]; then echo "please remove fix_versions first" exit 1 fi @@ -53,12 +53,12 @@ update_manifest() { mv $1/META-INF/MANIFEST.MF.tmp $1/META-INF/MANIFEST.MF } -for feature in org.eclipse.remote/*-feature; do +for feature in org.eclipse.remote/features/*-feature; do echo "Updating $feature..." update_feature $feature $version done -(cd org.eclipse.remote && \ +(cd org.eclipse.remote/releng/org.eclipse.remote.build && \ mvn versions:set -DnewVersion="${version}-SNAPSHOT" && \ mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom) diff --git a/releng/org.eclipse.remote.repo/category.xml b/releng/org.eclipse.remote.repo/category.xml index 5be5984c165..4fe8f479a4e 100644 --- a/releng/org.eclipse.remote.repo/category.xml +++ b/releng/org.eclipse.remote.repo/category.xml @@ -1,4 +1,4 @@ - + From e2705cfd341a961c7da95392270d5e2aa2c854b1 Mon Sep 17 00:00:00 2001 From: gwatson Date: Thu, 26 Jun 2014 14:48:05 -0400 Subject: [PATCH 2/2] Update version to 1.0.1 --- bundles/org.eclipse.remote.core/pom.xml | 2 +- bundles/org.eclipse.remote.jsch.core/pom.xml | 2 +- bundles/org.eclipse.remote.jsch.ui/pom.xml | 2 +- bundles/org.eclipse.remote.ui/pom.xml | 2 +- features/org.eclipse.remote-feature/feature.xml | 2 +- features/org.eclipse.remote-feature/pom.xml | 4 ++-- releng/org.eclipse.remote.build/pom.xml | 2 +- releng/org.eclipse.remote.repo/pom.xml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml index ea2b3a0867e..79f026d6ec1 100644 --- a/bundles/org.eclipse.remote.core/pom.xml +++ b/bundles/org.eclipse.remote.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml index 1f01db1a1fd..c9f21ad04c4 100644 --- a/bundles/org.eclipse.remote.jsch.core/pom.xml +++ b/bundles/org.eclipse.remote.jsch.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml index 671bf7cec79..4b863ada9b9 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/bundles/org.eclipse.remote.jsch.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml index dfa993f5d78..574fea94ea2 100644 --- a/bundles/org.eclipse.remote.ui/pom.xml +++ b/bundles/org.eclipse.remote.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml index 6eb8e5da5c7..c2f6ae0c919 100644 --- a/features/org.eclipse.remote-feature/feature.xml +++ b/features/org.eclipse.remote-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml index 73d39651a6c..f9e14d86343 100644 --- a/features/org.eclipse.remote-feature/pom.xml +++ b/features/org.eclipse.remote-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml org.eclipse.remote - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT eclipse-feature diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml index ba83c0a5274..5b4d27f9ce5 100644 --- a/releng/org.eclipse.remote.build/pom.xml +++ b/releng/org.eclipse.remote.build/pom.xml @@ -10,7 +10,7 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT pom Remote Parent diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml index 108d79a1b6a..549480f3d8d 100644 --- a/releng/org.eclipse.remote.repo/pom.xml +++ b/releng/org.eclipse.remote.repo/pom.xml @@ -7,11 +7,11 @@ org.eclipse.remote remote-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT org.eclipse.remote.repo eclipse-repository