From 67c03f20a92cda90fbe0bf7fd27b63a186a53427 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 14 Feb 2020 00:30:43 +0100 Subject: [PATCH] Prepare 5.6.2-SNSAPSHOT builds Change-Id: Ia161dc9974f29662dfb3d0cc11909ee582fbd710 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 8 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 24 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 82 +++---- 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 | 8 +- 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 | 106 ++++----- 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 | 28 +-- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/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 | 258 ++++++++++----------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 35 files changed, 333 insertions(+), 333 deletions(-) rewrite org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF (61%) rewrite org.eclipse.egit.ui/META-INF/MANIFEST.MF (62%) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index d77aa4e34..6284602d0 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - + + + org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF index 459c3e61f..bce04af7f 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,26 +4,26 @@ Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.egit.core.junit Bundle-SymbolicName: org.eclipse.egit.core.junit -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)", org.junit;bundle-version="[4.12.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.op;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.1,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)" +Import-Package: org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.op;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.dircache;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.junit;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.egit.core.test;version="5.6.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="5.6.2";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" Bundle-Localization: plugin diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index e97a1b96c..c453d3682 100644 --- a/org.eclipse.egit.core.junit/pom.xml +++ b/org.eclipse.egit.core.junit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT org.eclipse.egit.core.junit diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 82e202f60..8e965b1e9 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.core.test Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true Fragment-Host: org.eclipse.egit.core -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", @@ -13,19 +13,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.junit;bundle-version="[4.12.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[5.6.1,5.7.0)" + org.eclipse.egit.core.junit;bundle-version="[5.6.2,5.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", net.bytebuddy.agent;version="[1.7.9,2.0.0)", - org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.op;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.project;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.1,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)", + org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.op;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.project;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.attributes;version="[5.6.2,5.7.0)", + org.eclipse.jgit.junit;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)", org.mockito;version="[2.13.0,3.0.0)", org.mockito.junit;version="[2.13.0,3.0.0)", org.mockito.stubbing;version="[2.13.0,3.0.0)" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index ed0d1e374..43a2c289f 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 1fef186cc..497fb8c05 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.core Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)", org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)" -Export-Package: org.eclipse.egit.core;version="5.6.1"; +Export-Package: org.eclipse.egit.core;version="5.6.2"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, org.eclipse.egit.mylyn.ui, @@ -23,21 +23,21 @@ Export-Package: org.eclipse.egit.core;version="5.6.1"; org.eclipse.mylyn.github.ui, org.eclipse.mylyn.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.attributes;version="5.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="5.6.1"; + org.eclipse.egit.core.attributes;version="5.6.2";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="5.6.2"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.import, org.eclipse.egit.gitflow.ui, org.eclipse.egit.gitflow, org.eclipse.egit.mylyn.ui", - org.eclipse.egit.core.internal.gerrit;version="5.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="5.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.job;version="5.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="5.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="5.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="5.6.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="5.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="5.6.1"; + org.eclipse.egit.core.internal.gerrit;version="5.6.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="5.6.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.job;version="5.6.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="5.6.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="5.6.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="5.6.2";x-internal:=true, + org.eclipse.egit.core.internal.util;version="5.6.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="5.6.2"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -46,41 +46,41 @@ Export-Package: org.eclipse.egit.core;version="5.6.1"; org.eclipse.egit.github.core, org.eclipse.mylyn.github.ui, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="5.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.securestorage;version="5.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.storage;version="5.6.1"; + org.eclipse.egit.core.project;version="5.6.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.securestorage;version="5.6.2";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.storage;version="5.6.2"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="5.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="5.6.1";x-friends:="org.eclipse.egit.ui" + org.eclipse.egit.core.synchronize;version="5.6.2";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="5.6.2";x-friends:="org.eclipse.egit.ui" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.jcraft.jsch;bundle-version="[0.1.53,0.2.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.1,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.1,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.1,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.events;version="[5.6.1,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lfs;version="[5.6.1,5.7.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.1,5.7.0)", - org.eclipse.jgit.submodule;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport.http.apache;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport.sshd;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.1,5.7.0)", + org.eclipse.jgit.annotations;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.attributes;version="[5.6.2,5.7.0)", + org.eclipse.jgit.diff;version="[5.6.2,5.7.0)", + org.eclipse.jgit.dircache;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.events;version="[5.6.2,5.7.0)", + org.eclipse.jgit.internal.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lfs;version="[5.6.2,5.7.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.merge;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.submodule;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport.http;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport.http.apache;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport.sshd;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util.io;version="[5.6.2,5.7.0)", org.eclipse.jsch.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index b5a85a73b..f2fb7a143 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 f11ec1cea..7419cd1d9 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: 5.6.1.202002131546-r +Bundle-Version: 5.6.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 2b17526be..970b37522 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 84d2b4f72..8cc926bff 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ - - - + + + org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 5469e0d0e..353868d4e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: GitFlow Test Automatic-Module-Name: org.eclipse.egit.gitflow.test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.1,5.7.0)", +Import-Package: org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.jgit.junit;version="[5.6.2,5.7.0)", org.hamcrest;version="[1.1.0,1.2.0)", org.junit.rules;version="[4.12.0,5.0.0)", org.junit;version="[4.12.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[5.6.1,5.7.0)" + org.eclipse.egit.core.junit;bundle-version="[5.6.2,5.7.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index bb538dbd4..4515c8bb6 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 dissimilarity index 61% index dd4b0ddfa..de83f27f6 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -1,53 +1,53 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Automatic-Module-Name: org.eclipse.egit.gitflow.ui -Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true -Bundle-Version: 5.6.1.202002131546-r -Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %Bundle-Vendor -Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.job;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.op;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.project;version="[5.6.1,5.7.0)", - org.eclipse.egit.gitflow;version="[5.6.1,5.7.0)", - org.eclipse.egit.gitflow.op;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.actions;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.branch;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.commit;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.decorators;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.expressions;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.rebase;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.selection;version="[5.6.1,5.7.0)", - org.eclipse.jgit.annotations;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revplot;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)" -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)", - org.eclipse.ui;bundle-version="[3.108.0,4.0.0)", - org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", - org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)", - org.eclipse.core.databinding.beans;bundle-version="[1.3.100,2.0.0)", - org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="5.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="5.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="5.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="5.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="5.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="5.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="5.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="5.6.1";x-internal:=true +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Automatic-Module-Name: org.eclipse.egit.gitflow.ui +Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true +Bundle-Version: 5.6.2.qualifier +Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin +Import-Package: org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.job;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.op;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.project;version="[5.6.2,5.7.0)", + org.eclipse.egit.gitflow;version="[5.6.2,5.7.0)", + org.eclipse.egit.gitflow.op;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.actions;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.branch;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.commit;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.decorators;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.expressions;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.rebase;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.selection;version="[5.6.2,5.7.0)", + org.eclipse.jgit.annotations;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revplot;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)" +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)", + org.eclipse.ui;bundle-version="[3.108.0,4.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.3.100,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)" +Export-Package: org.eclipse.egit.gitflow.ui;version="5.6.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="5.6.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="5.6.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="5.6.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.6.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="5.6.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="5.6.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="5.6.2";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="5.6.2";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2923cd1e..b99748f7a 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 99b978d99..6c5e68b3f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="5.6.1"; +Export-Package: org.eclipse.egit.gitflow;version="5.6.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="5.6.1"; + org.eclipse.egit.gitflow.op;version="5.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.core.runtime.jobs, org.eclipse.core.runtime, @@ -26,13 +26,13 @@ Export-Package: org.eclipse.egit.gitflow;version="5.6.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.op;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.annotations;version="[5.6.1,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.op;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.annotations;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index fc7c0ec13..ffaf7cfb6 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 761bc9643..f33a09df8 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index f159502f4..4dfc57672 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 a8b447221..4779a8583 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse.org diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index b10523594..4ace6d640 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 a24b7d12c..823970ca1 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.mylyn.ui Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)", @@ -19,17 +19,17 @@ Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="5.6.1";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.synchronize;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.commit;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.staging;version="[5.6.1,5.7.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[5.6.1,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.6.2";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="5.6.2";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.synchronize;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.commit;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.staging;version="[5.6.2,5.7.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)", org.eclipse.ui.plugin;bundle-version="[3.108.0,4.0.0)" diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 4b38aed59..e7297adfe 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 71e18c6d8..7d60a4f43 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 e70e1a797..c45738ff1 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ - + org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index fdfe6a173..585bad5cd 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 9ae0301ff..0fe1cb7e1 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.ui.test Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", @@ -15,24 +15,24 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui;bundle-version="[3.108.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[5.6.1,5.7.0)" + org.eclipse.egit.core.junit;bundle-version="[5.6.2,5.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)", - org.eclipse.egit.gitflow;version="[5.6.1,5.7.0)", - org.eclipse.egit.gitflow.op;version="[5.6.1,5.7.0)", - org.eclipse.egit.gitflow.ui;version="[5.6.1,5.7.0)", - org.eclipse.egit.gitflow.ui.internal;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.1,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.1,5.7.0)", - org.eclipse.jgit.junit.http;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)", + org.eclipse.egit.gitflow;version="[5.6.2,5.7.0)", + org.eclipse.egit.gitflow.op;version="[5.6.2,5.7.0)", + org.eclipse.egit.gitflow.ui;version="[5.6.2,5.7.0)", + org.eclipse.egit.gitflow.ui.internal;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.attributes;version="[5.6.2,5.7.0)", + org.eclipse.jgit.junit;version="[5.6.2,5.7.0)", + org.eclipse.jgit.junit.http;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport.resolver;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.waits, diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 12ba18661..5ffe5a175 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 62% index 53522e4d1..b60e28f9e 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -1,129 +1,129 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Automatic-Module-Name: org.eclipse.egit.ui -Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 5.6.1.202002131546-r -Bundle-Activator: org.eclipse.egit.ui.Activator -Bundle-Vendor: %Bundle-Vendor -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)", - org.eclipse.ui;bundle-version="[3.108.0,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)", - org.eclipse.compare;bundle-version="[3.6.0,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.6.100,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)", - org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)", - org.eclipse.help;bundle-version="[3.7.0,4.0.0)", - org.eclipse.search;bundle-version="[3.11.0,4.0.0)";resolution:=optional, - org.eclipse.debug.ui;bundle-version="[3.11.200,4.0.0)";resolution:=optional, - org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";resolution:=optional, - org.eclipse.ui.views;bundle-version="[3.8.100,4.0.0)", - org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.5.1,2.0.0)", - org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)", - org.apache.ant;bundle-version="[1.10.5,2.0.0)" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml -Import-Package: org.eclipse.egit.core;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.attributes;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.gerrit;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.indexdiff;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.job;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.rebase;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.storage;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.internal.util;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.op;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.project;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.securestorage;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.synchronize;version="[5.6.1,5.7.0)", - org.eclipse.egit.core.synchronize.dto;version="[5.6.1,5.7.0)", - org.eclipse.jgit.annotations;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api;version="[5.6.1,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.1,5.7.0)", - org.eclipse.jgit.blame;version="[5.6.1,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.1,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.1,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.1,5.7.0)", - org.eclipse.jgit.events;version="[5.6.1,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.1,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.1,5.7.0)", - org.eclipse.jgit.notes;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revplot;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.revwalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.1,5.7.0)", - org.eclipse.jgit.submodule;version="[5.6.1,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.1,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util;version="[5.6.1,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.1,5.7.0)" -Export-Package: org.eclipse.egit.ui;version="5.6.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal;version="5.6.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.actions;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.clean;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="5.6.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.commit.command;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="5.6.1";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.credentials;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="5.6.1";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.gerrit;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="5.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="5.6.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.stash;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="5.6.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="5.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="5.6.1";x-internal:=true +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Automatic-Module-Name: org.eclipse.egit.ui +Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true +Bundle-Version: 5.6.2.qualifier +Bundle-Activator: org.eclipse.egit.ui.Activator +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)", + org.eclipse.ui;bundle-version="[3.108.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)", + org.eclipse.compare;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.100,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.search;bundle-version="[3.11.0,4.0.0)";resolution:=optional, + org.eclipse.debug.ui;bundle-version="[3.11.200,4.0.0)";resolution:=optional, + org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";resolution:=optional, + org.eclipse.ui.views;bundle-version="[3.8.100,4.0.0)", + org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.5.1,2.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)", + org.apache.ant;bundle-version="[1.10.5,2.0.0)" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml +Import-Package: org.eclipse.egit.core;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.attributes;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.gerrit;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.indexdiff;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.job;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.rebase;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.storage;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.internal.util;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.op;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.project;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.securestorage;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.synchronize;version="[5.6.2,5.7.0)", + org.eclipse.egit.core.synchronize.dto;version="[5.6.2,5.7.0)", + org.eclipse.jgit.annotations;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api;version="[5.6.2,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.attributes;version="[5.6.2,5.7.0)", + org.eclipse.jgit.blame;version="[5.6.2,5.7.0)", + org.eclipse.jgit.diff;version="[5.6.2,5.7.0)", + org.eclipse.jgit.dircache;version="[5.6.2,5.7.0)", + org.eclipse.jgit.errors;version="[5.6.2,5.7.0)", + org.eclipse.jgit.events;version="[5.6.2,5.7.0)", + org.eclipse.jgit.lib;version="[5.6.2,5.7.0)", + org.eclipse.jgit.merge;version="[5.6.2,5.7.0)", + org.eclipse.jgit.notes;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revplot;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.revwalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.storage.file;version="[5.6.2,5.7.0)", + org.eclipse.jgit.submodule;version="[5.6.2,5.7.0)", + org.eclipse.jgit.transport;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk;version="[5.6.2,5.7.0)", + org.eclipse.jgit.treewalk.filter;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util;version="[5.6.2,5.7.0)", + org.eclipse.jgit.util.io;version="[5.6.2,5.7.0)" +Export-Package: org.eclipse.egit.ui;version="5.6.2";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal;version="5.6.2";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.actions;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.clean;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="5.6.2";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.commit.command;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="5.6.2";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.credentials;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="5.6.2";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.gerrit;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="5.6.2";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="5.6.2";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.stash;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="5.6.2";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="5.6.2";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="5.6.2";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f13e52a1f..6dd5533a6 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.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 0db7eacbe..098cc2ffa 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: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit;singleton:=true -Bundle-Version: 5.6.1.202002131546-r +Bundle-Version: 5.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 500ce0212..f47ab37bd 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 407bcb8ae..5873af9e5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT pom EGit Parent @@ -60,7 +60,7 @@ - 5.6.1.202002131546-r + 5.6.2-SNAPSHOT 1.5.1 ${tycho-version} 1.4.0 -- 2.11.4.GIT