From f90897e88076acf7862923fbd8592ee330a80c01 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Sat, 28 Jul 2012 18:09:15 +0200 Subject: Augment version baseline and fix version problems --- features/org.eclipse.emf.cdo-feature/feature.xml | 2 +- .../org.eclipse.emf.cdo.defs-feature/feature.xml | 2 +- .../org.eclipse.emf.cdo.epp-feature/feature.xml | 2 +- .../feature.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.emf.cdo.sdk-feature/feature.xml | 2 +- .../org.eclipse.emf.cdo.server-feature/feature.xml | 2 +- .../feature.xml | 2 +- .../feature.xml | 2 +- .../feature.xml | 2 +- features/org.eclipse.emf.cdo.site-feature/.project | 4 + .../org.eclipse.emf.cdo.site-feature/feature.xml | 2 +- .../org.eclipse.emf.cdo.tests-feature/feature.xml | 2 +- features/org.eclipse.net4j-feature/feature.xml | 2 +- features/org.eclipse.net4j.db-feature/feature.xml | 2 +- .../org.eclipse.net4j.db.derby-feature/feature.xml | 2 +- .../org.eclipse.net4j.defs-feature/feature.xml | 2 +- features/org.eclipse.net4j.sdk-feature/feature.xml | 2 +- .../org.eclipse.net4j.util-feature/feature.xml | 2 +- .../org.eclipse.net4j.util.ui-feature/feature.xml | 2 +- features/org.gastro-feature/feature.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../.project | 28 ++ .../emf/cdo/releng/version/ui/QuickFixer.java | 3 +- plugins/org.eclipse.emf.cdo.releng/release.digest | Bin 7451 -> 15222 bytes plugins/org.eclipse.emf.cdo.releng/release.xml | 501 ++++++++++++++++++++- 29 files changed, 559 insertions(+), 27 deletions(-) create mode 100644 plugins/org.eclipse.emf.cdo.releng.version.digest.ui/.project diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index 56f4d5ada2..30523cb9b7 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml index 48b2c968ce..bce9b4d282 100644 --- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.xml index 38fea292c5..c724ab08e2 100644 --- a/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml index ced7371b0b..74fce82800 100644 --- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml index 19c2878f64..9071b77573 100644 --- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.emf.cdo.site-feature/.project b/features/org.eclipse.emf.cdo.site-feature/.project index d818a883a6..5f2bd9e34d 100644 --- a/features/org.eclipse.emf.cdo.site-feature/.project +++ b/features/org.eclipse.emf.cdo.site-feature/.project @@ -13,6 +13,10 @@ org.eclipse.emf.cdo.releng.version.VersionBuilder + + ignore.feature.content.changes + true + release.path /org.eclipse.emf.cdo.releng/release.xml diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml index 3c23e192ce..302f49374a 100644 --- a/features/org.eclipse.emf.cdo.site-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml index fdc075dbb7..d4682391a4 100644 --- a/features/org.eclipse.net4j-feature/feature.xml +++ b/features/org.eclipse.net4j-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.net4j.db.derby-feature/feature.xml b/features/org.eclipse.net4j.db.derby-feature/feature.xml index 6d4ebabbd5..a7ddd11ebf 100644 --- a/features/org.eclipse.net4j.db.derby-feature/feature.xml +++ b/features/org.eclipse.net4j.db.derby-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.net4j.defs-feature/feature.xml b/features/org.eclipse.net4j.defs-feature/feature.xml index 8a1dcd69b3..328a58cbf4 100644 --- a/features/org.eclipse.net4j.defs-feature/feature.xml +++ b/features/org.eclipse.net4j.defs-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index 43469b13b4..1f47ebe9cc 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -12,7 +12,7 @@ + + org.eclipse.emf.cdo.releng.version.digest.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/org.eclipse.emf.cdo.releng.version.ui/src/org/eclipse/emf/cdo/releng/version/ui/QuickFixer.java b/plugins/org.eclipse.emf.cdo.releng.version.ui/src/org/eclipse/emf/cdo/releng/version/ui/QuickFixer.java index 6b0c73df40..fd156bb11e 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version.ui/src/org/eclipse/emf/cdo/releng/version/ui/QuickFixer.java +++ b/plugins/org.eclipse.emf.cdo.releng.version.ui/src/org/eclipse/emf/cdo/releng/version/ui/QuickFixer.java @@ -246,7 +246,7 @@ public class QuickFixer implements IMarkerResolutionGenerator2 { int start; int end; - if (replacement.length() != 0) + if (replacement != null && replacement.length() != 0) { start = matcher.start(1); end = matcher.end(1); @@ -255,6 +255,7 @@ public class QuickFixer implements IMarkerResolutionGenerator2 { start = matcher.start(); end = matcher.end(); + replacement = ""; } document.replace(start, end - start, replacement); diff --git a/plugins/org.eclipse.emf.cdo.releng/release.digest b/plugins/org.eclipse.emf.cdo.releng/release.digest index 72792a743b..506944fb8e 100644 Binary files a/plugins/org.eclipse.emf.cdo.releng/release.digest and b/plugins/org.eclipse.emf.cdo.releng/release.digest differ diff --git a/plugins/org.eclipse.emf.cdo.releng/release.xml b/plugins/org.eclipse.emf.cdo.releng/release.xml index 7846607eb5..ed36e6c6e0 100644 --- a/plugins/org.eclipse.emf.cdo.releng/release.xml +++ b/plugins/org.eclipse.emf.cdo.releng/release.xml @@ -1,5 +1,448 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9,6 +452,14 @@ + + + + + + + + @@ -18,34 +469,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,6 +541,7 @@ + @@ -70,6 +553,12 @@ + + + + + + @@ -80,13 +569,17 @@ + + + + @@ -96,6 +589,7 @@ + @@ -105,7 +599,10 @@ + + + @@ -116,4 +613,6 @@ + + -- cgit v1.2.1