From 22fc436cc9524cd25965ed670638257a348a891f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 14 Nov 2015 01:01:50 +0100 Subject: [PATCH] Prepare 4.1.2-SNAPSHOT builds Change-Id: Ide8802e00ef2bbd9b4e7e9a5455f6c7071e71afe Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 4 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 22 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 72 +++--- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.gitflow-feature/feature.xml | 4 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 64 +++--- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 26 +-- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 4 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.importer.tests/pom.xml | 2 +- org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF | 4 +- org.eclipse.egit.ui.importer/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 34 +-- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 246 ++++++++++----------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 38 files changed, 283 insertions(+), 283 deletions(-) rewrite org.eclipse.egit.ui/META-INF/MANIFEST.MF (64%) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 3b5a88f7b..74f7761b2 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ @@ -38,7 +38,7 @@ - + org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 7a57c08e2..16e811434 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2,4.2.0)", + org.eclipse.egit.core.op;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.project;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.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.1.2" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index f4327b396..90d94a7bb 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.core.test diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 5103dc615..00714143a 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2"; 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.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.internal.gerrit;version="4.1.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="4.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.job;version="4.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.merge;version="4.1.2";x-internal:=true, + org.eclipse.egit.core.internal.rebase;version="4.1.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="4.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="4.1.2";x-internal:=true, + org.eclipse.egit.core.internal.util;version="4.1.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="4.1.2"; 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.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.securestorage;version="4.1.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.storage;version="4.1.2";uses:="org.eclipse.core.runtime,org.eclipse.jgit.lib,org.eclipse.core.resources", + org.eclipse.egit.core.synchronize;version="4.1.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="4.1.2";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.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.diff;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.events;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.patch;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.submodule;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)" Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ea712899f..d71f54ade 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.core diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index ca4e0a81e..fb05d3e98 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.201511131810-r +Bundle-Version: 4.1.2.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 6be99023d..0dacc0f4a 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index c94f57e5e..f26a254d3 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index e624837f9..e3e2dc04d 100644 --- a/org.eclipse.egit.gitflow-feature/pom.xml +++ b/org.eclipse.egit.gitflow-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index 6f0d36d68..6d17e737b 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2,4.2.0)", + org.eclipse.egit.core.test;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.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 0048df054..88a337568 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -15,7 +15,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 5b0c30f45..874c00c55 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2,4.2.0)", + org.eclipse.egit.core.internal;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.job;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.op;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.project;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow.op;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.branch;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.commit;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.history;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.rebase;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.selection;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revplot;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.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.1.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="4.1.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="4.1.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="4.1.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="4.1.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="4.1.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="4.1.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.selection;version="4.1.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="4.1.2";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c7e05643c..ecd1ce1d9 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.gitflow.ui diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index 547c12e3a..d48453b12 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2"; 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.1.2"; 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.1.2,4.2.0)", + org.eclipse.egit.core.internal.job;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.op;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index e03325998..f338fbda3 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index a43dbb2f8..513f58433 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 822404e26..cc7a8899f 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index df0e93e2f..6e73b4b7e 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.201511131810-r +Bundle-Version: 4.1.2.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 ce98e6faa..0cd6fc274 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index 58fe7781b..42c68d897 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="4.1.2";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.synchronize;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.commit;version="[4.1.2,4.2.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 67354885f..f26c5dd31 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 55b4da226..daef6d165 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 40647f7ed..8e0fd9989 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 0fb9ecd19..2d8455a5a 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index ccf304580..9874385d8 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.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index e7a87dbb5..e75cf9028 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT 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 91a22f92e..9bfbf54c3 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.201511131810-r +Bundle-Version: 4.1.2.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 be54c6e29..68428fbac 100644 --- a/org.eclipse.egit.ui.importer.tests/pom.xml +++ b/org.eclipse.egit.ui.importer.tests/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.egit - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT egit-parent org.eclipse.egit.ui.importer.tests diff --git a/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF index c3f372a12..66c641a28 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.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.ui, 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.1.2";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 923749ed0..0b6dfa909 100644 --- a/org.eclipse.egit.ui.importer/pom.xml +++ b/org.eclipse.egit.ui.importer/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.egit - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT egit-parent org.eclipse.egit.ui.importer diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2737f5502..5445cb618 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.201511131810-r +Bundle-Version: 4.1.2.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.1.2,4.2.0)", + org.eclipse.egit.gitflow;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow.op;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow.ui;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow.ui.internal;version="[4.1.2,4.2.0)", + org.eclipse.egit.gitflow.ui.internal.actions;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit.http;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.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 1771963b4..2694277a7 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.ui.test diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF dissimilarity index 64% index e58a7ad46..c3992141b 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -1,123 +1,123 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name -Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 4.1.1.201511131810-r -Bundle-Activator: org.eclipse.egit.ui.Activator -Bundle-Vendor: %provider_name -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.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)", - org.eclipse.core.net;bundle-version="[1.1.0,2.0.0)", - org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.team.core;bundle-version="[3.6.100,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.6.200,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)", - org.eclipse.compare;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jsch.ui;bundle-version="[1.1.100,2.0.0)", - org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)", - org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", - com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", - org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", - org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)", - org.eclipse.help;bundle-version="[3.4.0,4.0.0)", - org.eclipse.search;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.e4.ui.css.swt.theme;resolution:=optional, - org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - 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 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true +Bundle-Version: 4.1.2.qualifier +Bundle-Activator: org.eclipse.egit.ui.Activator +Bundle-Vendor: %provider_name +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.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)", + org.eclipse.core.net;bundle-version="[1.1.0,2.0.0)", + org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.6.100,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.6.200,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)", + org.eclipse.compare;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jsch.ui;bundle-version="[1.1.100,2.0.0)", + org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)", + org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", + com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", + org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)", + org.eclipse.help;bundle-version="[3.4.0,4.0.0)", + org.eclipse.search;bundle-version="[3.4.0,4.0.0)";resolution:=optional, + org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional, + org.eclipse.e4.ui.css.swt.theme;resolution:=optional, + org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional, + 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.2,4.2.0)", + org.eclipse.egit.core.internal;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.gerrit;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.indexdiff;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.job;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.rebase;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.storage;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.internal.util;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.op;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.project;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.securestorage;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.synchronize;version="[4.1.2,4.2.0)", + org.eclipse.egit.core.synchronize.dto;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.blame;version="[4.1.2,4.2.0)", + org.eclipse.jgit.diff;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.events;version="[4.1.2,4.2.0)", + org.eclipse.jgit.fnmatch;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.notes;version="[4.1.2,4.2.0)", + org.eclipse.jgit.patch;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revplot;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.submodule;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)" +Export-Package: org.eclipse.egit.ui;version="4.1.2";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal;version="4.1.2";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.blame;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="4.1.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="4.1.2";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.credentials;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="4.1.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.patch;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="4.1.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="4.1.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.sharing;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="4.1.2";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="4.1.2";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="4.1.2";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 123b4d560..751db8378 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 2ee819685..4a22f81f8 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.201511131810-r +Bundle-Version: 4.1.2.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 f82e29449..7d26c32a7 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index a005be340..11a15d451 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.eclipse.egit egit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT 0.23.0 ${tycho-version} 0.22.0 -- 2.11.4.GIT