diff options
author | Matthias Sohn | 2015-09-28 12:29:15 +0000 |
---|---|---|
committer | Matthias Sohn | 2015-09-28 13:38:37 +0000 |
commit | 901707b707dd919c315f6f210cd36d1aa0c49520 (patch) | |
tree | 8388a045549cd951ecbdc261c74d4e8678828444 | |
parent | ae74b783a404e7c871e2bb196913bb456ed796b6 (diff) | |
download | egit-901707b707dd919c315f6f210cd36d1aa0c49520.tar.gz egit-901707b707dd919c315f6f210cd36d1aa0c49520.tar.xz egit-901707b707dd919c315f6f210cd36d1aa0c49520.zip |
Prepare 4.2.0-SNAPSHOT builds
Change-Id: Ib8648c6885c90f0c812fb06cf79defdd9368e301
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
38 files changed, 249 insertions, 249 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 92a23f9c4c..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.1.1.qualifier" + version="4.2.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="4.1.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="4.2.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index aad01c0f5b..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.1.1-SNAPSHOT</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 a11b5236ca..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.1.1.qualifier +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)", @@ -17,14 +17,14 @@ Bundle-ActivationPolicy: lazy Import-Package: org.mockito;version="[1.8.0,1.9.0)", org.mockito.runners;version="[1.8.0,1.9.0)", org.mockito.stubbing;version="[1.8.0,1.9.0)", - org.eclipse.egit.core;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.op;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.project;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)" + org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.op;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.project;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;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)" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.egit.core.test;version="4.1.1" +Export-Package: org.eclipse.egit.core.test;version="4.2.0" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index fecea16955..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.1.1-SNAPSHOT</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 d33e279073..421bee9575 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.1.1.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -13,50 +13,50 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)", org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)" -Export-Package: org.eclipse.egit.core;version="4.1.1"; +Export-Package: org.eclipse.egit.core;version="4.2.0"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, org.eclipse.egit.mylyn.ui, org.eclipse.egit.gitflow.test", - org.eclipse.egit.core.internal;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.internal.gerrit;version="4.1.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.job;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.merge;version="4.1.1";x-internal:=true, - org.eclipse.egit.core.internal.rebase;version="4.1.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="4.1.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="4.1.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="4.1.1"; + org.eclipse.egit.core.internal;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.internal.gerrit;version="4.2.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.job;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.merge;version="4.2.0";x-internal:=true, + org.eclipse.egit.core.internal.rebase;version="4.2.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="4.2.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="4.2.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="4.2.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, org.eclipse.egit.gitflow.test, org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.project;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.securestorage;version="4.1.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.storage;version="4.1.1";uses:="org.eclipse.core.runtime,org.eclipse.jgit.lib,org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="4.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="4.1.1";x-friends:="org.eclipse.egit.ui" + org.eclipse.egit.core.project;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.securestorage;version="4.2.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.storage;version="4.2.0";uses:="org.eclipse.core.runtime,org.eclipse.jgit.lib,org.eclipse.core.resources", + org.eclipse.egit.core.synchronize;version="4.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="4.2.0";x-friends:="org.eclipse.egit.ui" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.diff;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.events;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.patch;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.submodule;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)" +Import-Package: org.eclipse.jgit.api;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.diff;version="[4.2.0,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.events;version="[4.2.0,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", + org.eclipse.jgit.patch;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk.filter;version="[4.2.0,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", + org.eclipse.jgit.submodule;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport;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)" Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 63748228c0..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.1.1-SNAPSHOT</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 f617d1faf1..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.1.1.qualifier +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 2ee44b95f1..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.1.1-SNAPSHOT</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 dfc0658f48..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.1.1.qualifier" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit.gitflow"> @@ -24,9 +24,9 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="4.1.1" match="equivalent"/> - <import plugin="org.eclipse.egit.core" version="4.1.0" match="equivalent"/> - <import plugin="org.eclipse.egit.ui" version="4.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="4.2.0" match="equivalent"/> + <import plugin="org.eclipse.egit.core" version="4.2.0" match="equivalent"/> + <import plugin="org.eclipse.egit.ui" version="4.2.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index 818671ea99..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.1.1-SNAPSHOT</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 d92fce108c..348c5da1d6 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GitFlow Test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true -Bundle-Version: 4.1.1.qualifier +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.1.1,4.2.0)", - org.eclipse.egit.core.test;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", +Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.test;version="[4.2.0,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", org.junit;version="[4.3.0,5.0.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 18214ae009..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.1.1-SNAPSHOT</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 76e08adaa0..090af02ada 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -2,34 +2,34 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Vendor: %provider_name Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.job;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.op;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.project;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow.op;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.branch;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.commit;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.history;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.rebase;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.selection;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revplot;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)" +Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.job;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.op;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.project;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow.op;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.branch;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.commit;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.history;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.rebase;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.selection;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revplot;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.util;version="[4.2.0,4.3.0)" Require-Bundle: org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", @@ -42,12 +42,12 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.2.0,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="4.1.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="4.1.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="4.1.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="4.1.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="4.1.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="4.1.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="4.1.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.selection;version="4.1.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="4.1.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="4.2.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="4.2.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="4.2.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="4.2.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="4.2.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="4.2.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="4.2.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.selection;version="4.2.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="4.2.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index a012a33eed..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.1.1-SNAPSHOT</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 d44aadeef3..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.1.1.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Vendor: %provider_name Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -11,14 +11,14 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.egit.gitflow;version="4.1.1"; +Export-Package: org.eclipse.egit.gitflow;version="4.2.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="4.1.1"; + org.eclipse.egit.gitflow.op;version="4.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.core.runtime.jobs, org.eclipse.core.runtime, @@ -27,13 +27,13 @@ Export-Package: org.eclipse.egit.gitflow;version="4.1.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.job;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.op;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)" +Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.job;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.op;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk.filter;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.0,4.3.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index f793336b45..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.1.1-SNAPSHOT</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 142b85b89b..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.1.1.qualifier" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -24,7 +24,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="4.1.1" match="greaterOrEqual"/> + <import feature="org.eclipse.egit" version="4.2.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 0761272e69..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.1.1-SNAPSHOT</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 4c3ed0abf3..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.1.1.qualifier +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 4ce5cfadd2..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.1.1-SNAPSHOT</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 21d368c29c..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.1.1.qualifier +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, @@ -24,15 +24,15 @@ Require-Bundle: org.eclipse.team.core, Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="4.1.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="4.1.1";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.synchronize;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.commit;version="[4.1.1,4.2.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="4.2.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="4.2.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.synchronize;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.commit;version="[4.2.0,4.3.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 5595bfccf1..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.1.1-SNAPSHOT</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 34ff8dee0f..937f9e6307 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.1.1-SNAPSHOT</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 ee5c4ba23e..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.1.1.qualifier" + 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 50d0d67f9b..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.1.1-SNAPSHOT</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 795e76cf0d..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.1.1.qualifier +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 0daadbe936..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.1.1-SNAPSHOT</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 3a3d760f23..ef6ceeec87 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.1.1.qualifier +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 915344b410..e940019f8e 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.1.1-SNAPSHOT</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 eccf5abbdc..5b23f46a42 100644 --- a/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ 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.1.1.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Vendor: %provider_name Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.e4.ui.importer;bundle-version="0.1.0", - org.eclipse.jgit;bundle-version="[4.1.0,4.2.0)" + org.eclipse.jgit;bundle-version="[4.2.0,4.3.0)" Bundle-Localization: fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.egit.ui.internal.clone;version="4.1.1";x-internal:=true; +Export-Package: org.eclipse.egit.ui.internal.clone;version="4.2.0";x-internal:=true; uses:="org.eclipse.ui,org.eclipse.jface.wizard,org.eclipse.jface.viewers" diff --git a/org.eclipse.egit.ui.importer/pom.xml b/org.eclipse.egit.ui.importer/pom.xml index 953104ff9c..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.1.1-SNAPSHOT</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 f9049c96ff..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.1.1.qualifier +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)", @@ -17,22 +17,22 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.mockito;bundle-version="[1.8.0,1.9.0)", org.objenesis;bundle-version="[1.0.0,2.0.0)", org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)" -Import-Package: org.eclipse.egit.core.test;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow.op;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow.ui;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow.ui.internal;version="[4.1.1,4.2.0)", - org.eclipse.egit.gitflow.ui.internal.actions;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit.http;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", +Import-Package: org.eclipse.egit.core.test;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow.op;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow.ui;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow.ui.internal;version="[4.2.0,4.3.0)", + org.eclipse.egit.gitflow.ui.internal.actions;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", + org.eclipse.jgit.junit.http;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", + org.eclipse.jgit.util;version="[4.2.0,4.3.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 f8a2dafd34..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.1.1-SNAPSHOT</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 e4e30c98dd..8cf3e43246 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.1.1.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -36,88 +36,88 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.egit.core;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.gerrit;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.indexdiff;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.job;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.rebase;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.storage;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.internal.util;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.op;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.project;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.securestorage;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.synchronize;version="[4.1.1,4.2.0)", - org.eclipse.egit.core.synchronize.dto;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.blame;version="[4.1.1,4.2.0)", - org.eclipse.jgit.diff;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.events;version="[4.1.1,4.2.0)", - org.eclipse.jgit.fnmatch;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.notes;version="[4.1.1,4.2.0)", - org.eclipse.jgit.patch;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revplot;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.submodule;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)" -Export-Package: org.eclipse.egit.ui;version="4.1.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal;version="4.1.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.blame;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="4.1.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="4.1.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.credentials;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.dialogs;version="4.1.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.patch;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="4.1.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="4.1.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.sharing;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="4.1.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="4.1.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="4.1.1";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.gerrit;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.indexdiff;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.job;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.rebase;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.storage;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.internal.util;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.op;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.project;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.securestorage;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.synchronize;version="[4.2.0,4.3.0)", + org.eclipse.egit.core.synchronize.dto;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.blame;version="[4.2.0,4.3.0)", + org.eclipse.jgit.diff;version="[4.2.0,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", + org.eclipse.jgit.events;version="[4.2.0,4.3.0)", + org.eclipse.jgit.fnmatch;version="[4.2.0,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", + org.eclipse.jgit.notes;version="[4.2.0,4.3.0)", + org.eclipse.jgit.patch;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revplot;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", + org.eclipse.jgit.revwalk.filter;version="[4.2.0,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", + org.eclipse.jgit.submodule;version="[4.2.0,4.3.0)", + org.eclipse.jgit.transport;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)" +Export-Package: org.eclipse.egit.ui;version="4.2.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal;version="4.2.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.blame;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="4.2.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="4.2.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.credentials;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="4.2.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.patch;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="4.2.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="4.2.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.sharing;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="4.2.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="4.2.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="4.2.0";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 831afc0850..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.1.1-SNAPSHOT</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 a8d8de28b0..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.1.1.qualifier +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 98fac58136..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.1.1-SNAPSHOT</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.1.1-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -62,7 +62,7 @@ </licenses> <properties> - <egit-version>4.1.1-SNAPSHOT</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> |