From 68cf77a93f5b82d80141bfd7456b49421480d6a5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 4 May 2015 22:13:16 +0200 Subject: [PATCH] Prepare post 4.0.0-m1 builds Change-Id: I7cdb75c3f0aa8dbcde1a4a120dc2ee4b51642dad Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 2 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/category.xml | 2 +- org.eclipse.egit.repository/pom.xml | 10 +++++++++- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.importer/pom.xml | 4 ++-- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 14 ++------------ 29 files changed, 39 insertions(+), 41 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 7c6f6e6bf..81e6bfe43 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index dff1e1d1a..bb68ac74b 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 2b454df2e..8f3143edc 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Git Team Provider Core Test Plug-in Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true Fragment-Host: org.eclipse.egit.core -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index d3efdc187..7f87167a1 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.core.test diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 26322f653..4d61e5201 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 2a0d2cead..1ed2db056 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.core diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index cf4a44549..604efc78b 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[2.0.0,3.0.0)";resolution:=optional, diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 837cac14f..45726cc97 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 6421d77ef..517779c68 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index d21b05c61..070879e86 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index 8c3bfa75f..0d912e513 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index 0c6a63965..b648241b3 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index 9ae77ecd4..9c2052638 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.team.core, diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index d976e1614..d09a2d118 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index ff556e108..0b312848b 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -27,7 +27,7 @@ - + diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index c19b97ca5..74ff1f408 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.repository @@ -64,11 +64,19 @@ + + + jboss-public-repository-group + JBoss Public Repository Group + http://repository.jboss.org/nexus/content/groups/public/ + + org.jboss.tools.tycho-plugins repository-utils + 0.22.0 generate-facade diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index bb62d1e36..7b67f243d 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index a73342fa7..0b5fbdf1c 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index dae9ae784..3a32f7885 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 3c625ea78..962b1c349 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT diff --git a/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF index 963762951..942b9eb28 100644 --- a/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %fragment_name Bundle-SymbolicName: org.eclipse.egit.ui.importer;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 0.0.1.201503231230-m1 +Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %provider_name Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.eclipse.egit.ui.importer/pom.xml b/org.eclipse.egit.ui.importer/pom.xml index 8b99f5de5..af7dbac3e 100644 --- a/org.eclipse.egit.ui.importer/pom.xml +++ b/org.eclipse.egit.ui.importer/pom.xml @@ -4,11 +4,11 @@ 4.0.0 org.eclipse.egit - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT egit-parent org.eclipse.egit.ui.importer - 0.0.1.201503231230-m1 + 0.0.1-SNAPSHOT eclipse-plugin Git Team Provider (experimental auto-import wizard, incubation) diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2062a1c7d..c4c1a4daf 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Git Team Provider UI Test Fragment Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index fd7065b05..2afc1b8bf 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.ui.test diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 9449736f3..dd27a74d9 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 94719971e..b0f530736 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index d8d2b7b28..13ea9f48c 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit -Bundle-Version: 4.0.0.201503231230-m1 +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 405882b29..63b4a10b1 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 9ab515f49..830cdf509 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.eclipse.egit egit-parent - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ - 4.0.0.201503231230-m1 + 4.0.0-SNAPSHOT 0.22.0 ${tycho-version} 1.8.4 @@ -306,11 +306,6 @@ repo.eclipse.org.cbi-releases https://repo.eclipse.org/content/repositories/cbi-releases/ - - jboss-public-repository-group - JBoss Public Repository Group - http://repository.jboss.org/nexus/content/groups/public/ - @@ -510,11 +505,6 @@ eclipse-jarsigner-plugin 1.0.4 - - org.jboss.tools.tycho-plugins - repository-utils - 0.22.0 - -- 2.11.4.GIT