diff options
author | Matthias Sohn | 2016-01-19 12:21:09 +0000 |
---|---|---|
committer | Matthias Sohn | 2016-01-19 14:14:50 +0000 |
commit | 4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b (patch) | |
tree | fb97bce31b5566e3024abcf212ea00639f934405 | |
parent | ef064dafb54e69040be3e275f156976820a47125 (diff) | |
download | egit-4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b.tar.gz egit-4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b.tar.xz egit-4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b.zip |
Prepare 4.2.0-SNAPSHOT builds
Also add missing dependency to org.slf4j to fix class loading issues in
running egit core tests from Maven.
Change-Id: If2267f676e731a83892ea348378d78f59ecf4cf5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
38 files changed, 41 insertions, 40 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 269a8ed1d1..67c990b8cb 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="4.2.0.201512141825-rc1" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index 7c4e92f6f6..5fb87c0974 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 256488cf30..43429e3b81 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 984f08b589..f00f4d78b8 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.test</artifactId> diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 6c5b4e6f95..08744acf80 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -59,5 +59,6 @@ Import-Package: org.eclipse.jgit.annotations;version="[4.2.0,4.3.0)", org.eclipse.jgit.treewalk;version="[4.2.0,4.3.0)", org.eclipse.jgit.treewalk.filter;version="[4.2.0,4.3.0)", org.eclipse.jgit.util;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)" + org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)", + org.slf4j;version="[1.7.0,2.0.0)" Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 5e0ab37c32..c57db8fc1d 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core</artifactId> diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index b388520f81..b780c49ce2 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 22ed3f13ca..a0b65e3945 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId> diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index e3500a43c0..c53f8f547e 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.gitflow.feature" label="%featureName" - version="4.2.0.201512141825-rc1" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit.gitflow"> diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index dc5cfce0db..6776c09aa2 100644 --- a/org.eclipse.egit.gitflow-feature/pom.xml +++ b/org.eclipse.egit.gitflow-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index 2551ba99f4..348c5da1d6 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GitFlow Test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true -Bundle-Version: 4.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index e86eefe22c..210e937d0e 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.test</artifactId> diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index f22f6540db..090af02ada 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.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.gitflow.ui;singleton:=true -Bundle-Version: 4.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 32d7d89c0a..e1904843cc 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.ui</artifactId> diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index d9041b2546..5a19bf138e 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.gitflow -Bundle-Version: 4.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-Vendor: %provider_name Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index c403d39ea0..f5e5a4bc80 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow</artifactId> diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 60ab3899e8..ed2fa221c8 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.mylyn" label="%featureName" - version="4.2.0.201512141825-rc1" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 4a9f1c0247..077e104880 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> 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 cc89b7baa2..12969aee38 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 cc94b2bbf6..6d94f6a544 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId> diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index f1f2e37ff1..2b0592513c 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 05bc1f8662..b07f270405 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui</artifactId> diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 0406be6c1f..bce0d404e6 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.repository</artifactId> diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index aa30cbcfb0..f06506d130 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.source" label="%featureName" - version="4.2.0.201512141825-rc1" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 5c69055be3..ad625c33c9 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index 8644b5de89..410e304853 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 097cfd7ba3..80be3f52b6 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <build> diff --git a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF index 57780e6725..d09aa3f0b6 100644 --- a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.importer.tests/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.importer.tests -Bundle-Version: 4.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui.importer.tests/pom.xml b/org.eclipse.egit.ui.importer.tests/pom.xml index 5f29561501..0d2c93c48b 100644 --- a/org.eclipse.egit.ui.importer.tests/pom.xml +++ b/org.eclipse.egit.ui.importer.tests/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.egit</groupId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> <artifactId>egit-parent</artifactId> </parent> <artifactId>org.eclipse.egit.ui.importer.tests</artifactId> diff --git a/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF index 363c35264e..5b23f46a42 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: 4.2.0.201512141825-rc1 +Bundle-Version: 4.2.0.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 2c400dee68..17166f22ec 100644 --- a/org.eclipse.egit.ui.importer/pom.xml +++ b/org.eclipse.egit.ui.importer/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.egit</groupId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> <artifactId>egit-parent</artifactId> </parent> <artifactId>org.eclipse.egit.ui.importer</artifactId> diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 656b3c1789..29cb8a95d1 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 3d9a869445..789eb237a3 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 9fa9753a43..aebe531e34 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 87779e793c..bc6c148bc0 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui</artifactId> diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 3c8e6e2427..8075219906 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.2.0.201512141825-rc1 +Bundle-Version: 4.2.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 3e91322309..2242fada23 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId> @@ -21,7 +21,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>4.2.0.201512141825-rc1</version> + <version>4.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -62,7 +62,7 @@ </licenses> <properties> - <egit-version>4.2.0.201512141825-rc1</egit-version> + <egit-version>4.2.0-SNAPSHOT</egit-version> <tycho-version>0.23.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <jboss-tycho-plugins-version>0.22.0</jboss-tycho-plugins-version> |