diff options
author | Matthias Sohn | 2013-02-13 23:29:25 +0000 |
---|---|---|
committer | Matthias Sohn | 2013-02-13 23:35:23 +0000 |
commit | 507bfac0f77a8ca7179ffde0d2f9852a97162a7e (patch) | |
tree | 4e83083f685f02448ba2dcc87dc3f5f4bdae4401 | |
parent | 05e15ab07d544240f2c2bf0cb6c87cf282da40d8 (diff) | |
download | egit-507bfac0f77a8ca7179ffde0d2f9852a97162a7e.tar.gz egit-507bfac0f77a8ca7179ffde0d2f9852a97162a7e.tar.xz egit-507bfac0f77a8ca7179ffde0d2f9852a97162a7e.zip |
Prepare 2.4.0-SNAPSHOT builds
Change-Id: I2da979a3075abe19e4d29ffbd8740848b8e9764a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
30 files changed, 181 insertions, 181 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 14bfbec1bf..ab0fe3699b 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="2.3.0.qualifier" + version="2.4.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -38,7 +38,7 @@ <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/> <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/> <import plugin="com.jcraft.jsch" version="0.1.37" match="compatible"/> - <import feature="org.eclipse.jgit" version="2.3.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="2.4.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index 5722c23c0a..ae0f999706 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 0920c23382..8f3f06700e 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 Fragment-Host: org.eclipse.egit.core -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 2.4.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)", @@ -17,13 +17,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", Bundle-ActivationPolicy: lazy Import-Package: org.mockito;version="[1.8.0,1.9.0)", org.mockito.stubbing;version="[1.8.0,1.9.0)", - org.eclipse.egit.core;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.op;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.project;version="[2.3.0,2.4.0)", - org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.junit;version="[2.3.0,2.4.0)", - org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util;version="[2.3.0,2.4.0)" + org.eclipse.egit.core;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.op;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.project;version="[2.4.0,2.5.0)", + org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.junit;version="[2.4.0,2.5.0)", + org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util;version="[2.4.0,2.5.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 16a3b1b7d3..3e253d3eb9 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 d199251b89..2b231eca24 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -11,36 +11,36 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" -Export-Package: org.eclipse.egit.core;version="2.3.0", - org.eclipse.egit.core.internal;version="2.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", - org.eclipse.egit.core.internal.indexdiff;version="2.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="2.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="2.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="2.3.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="2.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="2.3.0", - org.eclipse.egit.core.project;version="2.3.0", - org.eclipse.egit.core.securestorage;version="2.3.0", - org.eclipse.egit.core.synchronize;version="2.3.0", - org.eclipse.egit.core.synchronize.dto;version="2.3.0" +Export-Package: org.eclipse.egit.core;version="2.4.0", + org.eclipse.egit.core.internal;version="2.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", + org.eclipse.egit.core.internal.indexdiff;version="2.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="2.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="2.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="2.4.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="2.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="2.4.0", + org.eclipse.egit.core.project;version="2.4.0", + org.eclipse.egit.core.securestorage;version="2.4.0", + org.eclipse.egit.core.synchronize;version="2.4.0", + org.eclipse.egit.core.synchronize.dto;version="2.4.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[2.3.0,2.4.0)", - org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.diff;version="[2.3.0,2.4.0)", - org.eclipse.jgit.dircache;version="[2.3.0,2.4.0)", - org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.events;version="[2.3.0,2.4.0)", - org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", - org.eclipse.jgit.merge;version="[2.3.0,2.4.0)", - org.eclipse.jgit.patch;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk.filter;version="[2.3.0,2.4.0)", - org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", - org.eclipse.jgit.submodule;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util.io;version="[2.3.0,2.4.0)" +Import-Package: org.eclipse.jgit.api;version="[2.4.0,2.5.0)", + org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.diff;version="[2.4.0,2.5.0)", + org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)", + org.eclipse.jgit.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.events;version="[2.4.0,2.5.0)", + org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", + org.eclipse.jgit.merge;version="[2.4.0,2.5.0)", + org.eclipse.jgit.patch;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)", + org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)", + org.eclipse.jgit.submodule;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)" diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 6e1738a615..3793a83d18 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 01a0da0e4d..c5b61f00f1 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 5c77c4cd60..94c966f54b 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>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId> diff --git a/org.eclipse.egit.import-feature/feature.xml b/org.eclipse.egit.import-feature/feature.xml index d7a7ad756a..f233f454e6 100644 --- a/org.eclipse.egit.import-feature/feature.xml +++ b/org.eclipse.egit.import-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.import" label="%featureName" - version="2.3.0.qualifier" + version="2.4.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit.import-feature/pom.xml b/org.eclipse.egit.import-feature/pom.xml index ca94128402..ae34a21c4d 100644 --- a/org.eclipse.egit.import-feature/pom.xml +++ b/org.eclipse.egit.import-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.import/META-INF/MANIFEST.MF b/org.eclipse.egit.import/META-INF/MANIFEST.MF index fcda1aa7d0..ca9e28c48e 100644 --- a/org.eclipse.egit.import/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.import/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.import;singleton:=true -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Activator: org.eclipse.egit.internal.importing.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)", org.eclipse.ui;bundle-version="[3.8.0,4.0.0)", @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)", Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor -Import-Package: org.eclipse.egit.core.internal;version="[2.3.0,2.4.0)", - org.eclipse.egit.ui;version="[2.3.0,2.4.0)", - org.eclipse.egit.ui.internal;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport;version="[2.3.0,2.4.0)" -Export-Package: org.eclipse.egit.internal.importing;version="2.3.0";x-internal:=true +Import-Package: org.eclipse.egit.core.internal;version="[2.4.0,2.5.0)", + org.eclipse.egit.ui;version="[2.4.0,2.5.0)", + org.eclipse.egit.ui.internal;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport;version="[2.4.0,2.5.0)" +Export-Package: org.eclipse.egit.internal.importing;version="2.4.0";x-internal:=true diff --git a/org.eclipse.egit.import/pom.xml b/org.eclipse.egit.import/pom.xml index 83531e244d..2c8fe3965f 100644 --- a/org.eclipse.egit.import/pom.xml +++ b/org.eclipse.egit.import/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.import</artifactId> diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 4c60cd44ec..d02ee27ba2 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="2.3.0.qualifier" + version="2.4.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -24,7 +24,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="2.3.0" match="greaterOrEqual"/> + <import feature="org.eclipse.egit" version="2.4.0" match="greaterOrEqual"/> <import feature="org.eclipse.mylyn.team_feature" version="3.5.0" match="greaterOrEqual"/> </requires> diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 957727f1c2..dbbfc0a9bc 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 cf4fb8c9ec..6a13941619 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: J2SE-1.5 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 2fa233ead6..215454d6e9 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>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId> @@ -80,17 +80,17 @@ <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.egit.mylyn.feature.group</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> <dependency> <type>p2-installable-unit</type> diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index 28a5d22b09..e31403bd04 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.team.core, @@ -23,15 +23,15 @@ Require-Bundle: org.eclipse.team.core, Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="2.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="2.3.0";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.synchronize;version="[2.3.0,2.4.0)", - org.eclipse.egit.ui;version="[2.3.0,2.4.0)", - org.eclipse.egit.ui.internal.commit;version="[2.3.0,2.4.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[2.3.0,2.4.0)", - org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="2.4.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="2.4.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.synchronize;version="[2.4.0,2.5.0)", + org.eclipse.egit.ui;version="[2.4.0,2.5.0)", + org.eclipse.egit.ui.internal.commit;version="[2.4.0,2.5.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[2.4.0,2.5.0)", + org.eclipse.jgit.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 0a8908df77..3c0b496384 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 a0c94fb387..9b1f32d4eb 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 9ecb0574d7..59c42e607b 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="2.3.0.qualifier" + version="2.4.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 138472a051..f4a5f53a72 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 b216155f84..e2b03adcba 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index ee08db1010..b6e73372d1 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>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <build> diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2252ea66db..2010582acc 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", @@ -15,16 +15,16 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.mockito;bundle-version="[1.8.0,1.9.0)" -Import-Package: org.eclipse.jgit.api;version="[2.3.0,2.4.0)", - org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.junit;version="[2.3.0,2.4.0)", - org.eclipse.jgit.junit.http;version="[2.3.0,2.4.0)", - org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport.resolver;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util;version="[2.3.0,2.4.0)", +Import-Package: org.eclipse.jgit.api;version="[2.4.0,2.5.0)", + org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.junit;version="[2.4.0,2.5.0)", + org.eclipse.jgit.junit.http;version="[2.4.0,2.5.0)", + org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport.resolver;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util;version="[2.4.0,2.5.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.exceptions, diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index d92594e126..f3ea952867 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>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> @@ -87,13 +87,13 @@ <type>p2-installable-unit</type> <groupId>org.eclipse.egit.feature</groupId> <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>2.3.0</version> + <version>2.4.0</version> </dependency> <dependency> <type>p2-installable-unit</type> diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index edeb538c0f..a251ebc9dc 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: 2.3.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -32,81 +32,81 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.egit.core;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.internal;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.internal.indexdiff;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.internal.job;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.internal.storage;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.internal.util;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.op;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.project;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.securestorage;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.synchronize;version="[2.3.0,2.4.0)", - org.eclipse.egit.core.synchronize.dto;version="[2.3.0,2.4.0)", - org.eclipse.jgit.api;version="[2.3.0,2.4.0)", - org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.blame;version="[2.3.0,2.4.0)", - org.eclipse.jgit.diff;version="[2.3.0,2.4.0)", - org.eclipse.jgit.dircache;version="[2.3.0,2.4.0)", - org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", - org.eclipse.jgit.events;version="[2.3.0,2.4.0)", - org.eclipse.jgit.fnmatch;version="[2.3.0,2.4.0)", - org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", - org.eclipse.jgit.merge;version="[2.3.0,2.4.0)", - org.eclipse.jgit.notes;version="[2.3.0,2.4.0)", - org.eclipse.jgit.patch;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revplot;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.revwalk.filter;version="[2.3.0,2.4.0)", - org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", - org.eclipse.jgit.submodule;version="[2.3.0,2.4.0)", - org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", - org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util;version="[2.3.0,2.4.0)", - org.eclipse.jgit.util.io;version="[2.3.0,2.4.0)" -Export-Package: org.eclipse.egit.ui;version="2.3.0", - org.eclipse.egit.ui.internal;version="2.3.0";x-friends:="org.eclipse.egit.import", - org.eclipse.egit.ui.internal.actions;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.blame;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit.command;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.credentials;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.dialogs;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.factories;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.patch;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.command;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.sharing;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="2.3.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="2.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="2.3.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.internal;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.internal.indexdiff;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.internal.job;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.internal.storage;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.internal.util;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.op;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.project;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.securestorage;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.synchronize;version="[2.4.0,2.5.0)", + org.eclipse.egit.core.synchronize.dto;version="[2.4.0,2.5.0)", + org.eclipse.jgit.api;version="[2.4.0,2.5.0)", + org.eclipse.jgit.api.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.blame;version="[2.4.0,2.5.0)", + org.eclipse.jgit.diff;version="[2.4.0,2.5.0)", + org.eclipse.jgit.dircache;version="[2.4.0,2.5.0)", + org.eclipse.jgit.errors;version="[2.4.0,2.5.0)", + org.eclipse.jgit.events;version="[2.4.0,2.5.0)", + org.eclipse.jgit.fnmatch;version="[2.4.0,2.5.0)", + org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", + org.eclipse.jgit.merge;version="[2.4.0,2.5.0)", + org.eclipse.jgit.notes;version="[2.4.0,2.5.0)", + org.eclipse.jgit.patch;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revplot;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.revwalk.filter;version="[2.4.0,2.5.0)", + org.eclipse.jgit.storage.file;version="[2.4.0,2.5.0)", + org.eclipse.jgit.submodule;version="[2.4.0,2.5.0)", + org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)", + org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util;version="[2.4.0,2.5.0)", + org.eclipse.jgit.util.io;version="[2.4.0,2.5.0)" +Export-Package: org.eclipse.egit.ui;version="2.4.0", + org.eclipse.egit.ui.internal;version="2.4.0";x-friends:="org.eclipse.egit.import", + org.eclipse.egit.ui.internal.actions;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.blame;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit.command;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.credentials;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.factories;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.patch;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.command;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.sharing;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="2.4.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="2.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="2.4.0";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index b44bd780be..eeb9473ec5 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>2.3.0-SNAPSHOT</version> + <version>2.4.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 160032f94d..0ac0a7fe1d 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: 2.3.0.qualifier +Bundle-Version: 2.4.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 ac0469589f..951e9c4558 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>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId> @@ -21,7 +21,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -62,7 +62,7 @@ </licenses> <properties> - <egit-version>2.3.0-SNAPSHOT</egit-version> + <egit-version>2.4.0-SNAPSHOT</egit-version> <tycho-version>0.16.0</tycho-version> <tycho-extras-version>0.16.0</tycho-extras-version> <mockito-version>1.8.4</mockito-version> |