From 8aa4a622f2352a82f4cea897a6d75b79ec32eefe Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 29 Nov 2021 17:39:18 +0100 Subject: [PATCH] Prepare 6.0.1-SNAPSHOT builds Change-Id: Ie7b0295bc5413da5681571565f6f109e17906528 --- org.eclipse.egit-feature/feature.xml | 10 +- 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 | 106 ++++---- 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 | 114 ++++---- 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 | 292 ++++++++++----------- 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, 367 insertions(+), 367 deletions(-) rewrite org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF (63%) rewrite org.eclipse.egit.ui/META-INF/MANIFEST.MF (61%) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index bf7cb198d..47ddd17a6 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-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 e6d8dd1e8..299dd1d00 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.18.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.op;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)" +Import-Package: org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.op;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.egit.core.test;version="6.0.0";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="6.0.1";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 d72eeb7cd..4ddb5a681 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 - 6.0.0.202111291000-r + 6.0.1-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 e683a6548..f93776c50 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", @@ -13,19 +13,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,3.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)" + org.eclipse.egit.core.junit;bundle-version="[6.0.1,6.1.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="[6.0.0,6.1.0)", - org.eclipse.egit.core.op;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.project;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)", + org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.op;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.project;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", + org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.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 edba64c1e..675b3bcd2 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 - 6.0.0.202111291000-r + 6.0.1-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 3c288d157..e48ae3ce2 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.4.800,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.6.1000,4.0.0)", org.eclipse.osgi.services;bundle-version="[3.9.0,4.0.0)" -Export-Package: org.eclipse.egit.core;version="6.0.0"; +Export-Package: org.eclipse.egit.core;version="6.0.1"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, org.eclipse.egit.mylyn.ui, @@ -24,29 +24,29 @@ Export-Package: org.eclipse.egit.core;version="6.0.0"; org.eclipse.mylyn.github.ui, org.eclipse.mylyn.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.attributes;version="6.0.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="6.0.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="6.0.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="6.0.0"; + org.eclipse.egit.core.attributes;version="6.0.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="6.0.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="6.0.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="6.0.1"; 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.credentials;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="6.0.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="6.0.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="6.0.0"; + org.eclipse.egit.core.internal.credentials;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="6.0.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="6.0.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="6.0.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="6.0.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="6.0.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="6.0.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -55,46 +55,46 @@ Export-Package: org.eclipse.egit.core;version="6.0.0"; org.eclipse.egit.github.core, org.eclipse.mylyn.github.ui, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="6.0.0", - org.eclipse.egit.core.settings;version="6.0.0", - org.eclipse.egit.core.storage;version="6.0.0"; + org.eclipse.egit.core.project;version="6.0.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="6.0.1", + org.eclipse.egit.core.settings;version="6.0.1", + org.eclipse.egit.core.storage;version="6.0.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="6.0.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="6.0.0" + org.eclipse.egit.core.synchronize;version="6.0.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="6.0.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="6.0.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.0,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.events;version="[6.0.0,6.1.0)", - org.eclipse.jgit.gpg.bc;version="[6.0.0,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)", - org.eclipse.jgit.submodule;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport.sshd;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)" + org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", + org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", + org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.events;version="[6.0.1,6.1.0)", + org.eclipse.jgit.gpg.bc;version="[6.0.1,6.1.0)", + org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lfs;version="[6.0.1,6.1.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", + org.eclipse.jgit.submodule;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport.http.apache;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport.sshd;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)" Service-Component: OSGI-INF/org.eclipse.egit.core.RepositoryInitializer.xml, OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml, OSGI-INF/org.eclipse.egit.core.internal.start.PreferencesMigrator.xml, diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 47f84eb07..abfdfe815 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-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 a5ea795cb..013d9103c 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.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 f6f9e64b1..970323805 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index c0794bd42..d94756900 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 - 6.0.0.202111291000-r + 6.0.1-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 3bb240300..a1b0b031b 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.0,6.1.0)", +Import-Package: org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", org.junit.rules;version="[4.13.0,5.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)", + org.eclipse.egit.core.junit;bundle-version="[6.0.1,6.1.0)", org.hamcrest;bundle-version="[1.1.0,3.0.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 097f86a3d..b6eda561f 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 - 6.0.0.202111291000-r + 6.0.1-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 63% index a5323d1c0..03a3b6a20 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -1,57 +1,57 @@ -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: 6.0.0.202111291000-r -Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %Bundle-Vendor -Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.op;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.project;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.settings;version="[6.0.0,6.1.0)", - org.eclipse.egit.gitflow;version="[6.0.0,6.1.0)", - org.eclipse.egit.gitflow.op;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.actions;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.branch;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.commit;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.components;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.decorators;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.dialogs;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.expressions;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.push;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.rebase;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.selection;version="[6.0.0,6.1.0)", - org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)" -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", - org.eclipse.jface.databinding;bundle-version="[1.12.0,2.0.0)", - org.eclipse.core.databinding.property;bundle-version="[1.8.100,2.0.0)", - org.eclipse.core.databinding.beans;bundle-version="[1.7.0,2.0.0)", - org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="6.0.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="6.0.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="6.0.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="6.0.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.0.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="6.0.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="6.0.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="6.0.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="6.0.0";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: 6.0.1.qualifier +Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-ActivationPolicy: lazy +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin +Import-Package: org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.job;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.op;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.project;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.settings;version="[6.0.1,6.1.0)", + org.eclipse.egit.gitflow;version="[6.0.1,6.1.0)", + org.eclipse.egit.gitflow.op;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.actions;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.branch;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.commit;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.components;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.decorators;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.dialogs;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.expressions;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.push;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.rebase;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.selection;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revplot;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.0)" +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.12.0,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.8.100,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.7.0,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)" +Export-Package: org.eclipse.egit.gitflow.ui;version="6.0.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="6.0.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="6.0.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="6.0.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.0.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="6.0.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="6.0.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="6.0.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="6.0.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index ca2f9810f..0663db332 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 - 6.0.0.202111291000-r + 6.0.1-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 e7863676e..58e9d3c03 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="6.0.0"; +Export-Package: org.eclipse.egit.gitflow;version="6.0.1"; 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="6.0.0"; + org.eclipse.egit.gitflow.op;version="6.0.1"; 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="6.0.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.op;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.op;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 0e770261e..4c581cff5 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index f04f3d020..6eada92cb 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 eebc281df..90995ee58 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 - 6.0.0.202111291000-r + 6.0.1-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 8c9d7d33b..ae50a64d3 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: JavaSE-11 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 882918682..e527ee222 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 - 6.0.0.202111291000-r + 6.0.1-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 300941d23..58812e2ad 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.jface;bundle-version="[3.21.0,4.0.0)", @@ -19,17 +19,17 @@ Require-Bundle: org.eclipse.jface;bundle-version="[3.21.0,4.0.0)", Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="6.0.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="6.0.0";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.synchronize;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.commit;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.staging;version="[6.0.0,6.1.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[6.0.0,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="6.0.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="6.0.1";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.synchronize;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.commit;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.staging;version="[6.0.1,6.1.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.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 18ed60e8e..eec8b31cc 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 - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 2b45dc3e8..8d3ab3f1d 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 006134cc6..de9cd1eff 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 - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index c02bb2982..a688b0c18 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 3643ff9b2..675804ee7 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", @@ -14,25 +14,25 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.search;bundle-version="[3.12.0,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.18.0,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)", + org.eclipse.egit.core.junit;bundle-version="[6.0.1,6.1.0)", org.hamcrest;bundle-version="[1.1.0,3.0.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.egit.gitflow;version="[6.0.0,6.1.0)", - org.eclipse.egit.gitflow.op;version="[6.0.0,6.1.0)", - org.eclipse.egit.gitflow.ui;version="[6.0.0,6.1.0)", - org.eclipse.egit.gitflow.ui.internal;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.0,6.1.0)", - org.eclipse.jgit.junit.http;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)", + org.eclipse.egit.gitflow;version="[6.0.1,6.1.0)", + org.eclipse.egit.gitflow.op;version="[6.0.1,6.1.0)", + org.eclipse.egit.gitflow.ui;version="[6.0.1,6.1.0)", + org.eclipse.egit.gitflow.ui.internal;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", + org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", + org.eclipse.jgit.junit.http;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.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 c87c73c03..e19bdb028 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 - 6.0.0.202111291000-r + 6.0.1-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 61% index d35426638..4de894164 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -1,146 +1,146 @@ -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: 6.0.0.202111291000-r -Bundle-Activator: org.eclipse.egit.ui.Activator -Bundle-Vendor: %Bundle-Vendor -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.4.800,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.16.400,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.17.200,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.15.0,4.0.0)", - org.eclipse.compare;bundle-version="[3.7.1100,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.13.300,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.9.400,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.10.0,4.0.0)", - org.eclipse.equinox.security;bundle-version="[1.3.500,2.0.0)", - org.eclipse.help;bundle-version="[3.8.800,4.0.0)", - org.eclipse.search;bundle-version="[3.12.0,4.0.0)";resolution:=optional, - org.eclipse.debug.ui;bundle-version="[3.14.600,4.0.0)";resolution:=optional, - org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="[3.21.200,4.0.0)";resolution:=optional, - org.eclipse.ui.views;bundle-version="[3.10.400,4.0.0)", - org.eclipse.osgi.services;bundle-version="[3.9.0,4.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.8.400,2.0.0)", - org.eclipse.e4.core.services;bundle-version="[2.2.400,3.0.0)", - org.eclipse.e4.ui.workbench;bundle-version="[1.11.400,2.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.attributes;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.credentials;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.info;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.credentials;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.efs;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.gerrit;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.hosts;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.indexdiff;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.info;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.rebase;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.signing;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.storage;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.internal.util;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.op;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.project;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.settings;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.synchronize;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.synchronize.dto;version="[6.0.0,6.1.0)", - org.eclipse.egit.core.util;version="[6.0.0,6.1.0)", - org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api;version="[6.0.0,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)", - org.eclipse.jgit.blame;version="[6.0.0,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.0,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", - org.eclipse.jgit.events;version="[6.0.0,6.1.0)", - org.eclipse.jgit.ignore;version="[6.0.0,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.0,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.0,6.1.0)", - org.eclipse.jgit.notes;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)", - org.eclipse.jgit.submodule;version="[6.0.0,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util;version="[6.0.0,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)" -Export-Package: org.eclipse.egit.ui;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.history;version="6.0.0", - org.eclipse.egit.ui.internal;version="6.0.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.actions;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.clean;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="6.0.0";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="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="6.0.0";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="6.0.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.gerrit;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.stash;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="6.0.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="6.0.0";x-internal:=true -Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml, - OSGI-INF/org.eclipse.egit.ui.internal.StartEventListener.xml, - OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml, - OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml, - OSGI-INF/org.eclipse.egit.ui.internal.trace.DebugOptionsHandler.xml, - OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml, - OSGI-INF/org.eclipse.egit.ui.internal.credentials.EGitCredentialsUI.xml +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: 6.0.1.qualifier +Bundle-Activator: org.eclipse.egit.ui.Activator +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.4.800,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.16.400,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.17.200,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.15.0,4.0.0)", + org.eclipse.compare;bundle-version="[3.7.1100,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.13.300,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.9.400,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.10.0,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.3.500,2.0.0)", + org.eclipse.help;bundle-version="[3.8.800,4.0.0)", + org.eclipse.search;bundle-version="[3.12.0,4.0.0)";resolution:=optional, + org.eclipse.debug.ui;bundle-version="[3.14.600,4.0.0)";resolution:=optional, + org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="[3.21.200,4.0.0)";resolution:=optional, + org.eclipse.ui.views;bundle-version="[3.10.400,4.0.0)", + org.eclipse.osgi.services;bundle-version="[3.9.0,4.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.8.400,2.0.0)", + org.eclipse.e4.core.services;bundle-version="[2.2.400,3.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.11.400,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: org.eclipse.egit.core;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.attributes;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.credentials;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.info;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.credentials;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.efs;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.gerrit;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.hosts;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.indexdiff;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.info;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.job;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.rebase;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.signing;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.storage;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.internal.util;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.op;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.project;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.settings;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.synchronize;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.synchronize.dto;version="[6.0.1,6.1.0)", + org.eclipse.egit.core.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", + org.eclipse.jgit.blame;version="[6.0.1,6.1.0)", + org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", + org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.events;version="[6.0.1,6.1.0)", + org.eclipse.jgit.ignore;version="[6.0.1,6.1.0)", + org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", + org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", + org.eclipse.jgit.notes;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revplot;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.revwalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", + org.eclipse.jgit.submodule;version="[6.0.1,6.1.0)", + org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", + org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)" +Export-Package: org.eclipse.egit.ui;version="6.0.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.history;version="6.0.1", + org.eclipse.egit.ui.internal;version="6.0.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.actions;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.clean;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="6.0.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="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="6.0.1";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="6.0.1";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.gerrit;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="6.0.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="6.0.1";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.stash;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="6.0.1";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="6.0.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="6.0.1";x-internal:=true +Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml, + OSGI-INF/org.eclipse.egit.ui.internal.StartEventListener.xml, + OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml, + OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml, + OSGI-INF/org.eclipse.egit.ui.internal.trace.DebugOptionsHandler.xml, + OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml, + OSGI-INF/org.eclipse.egit.ui.internal.credentials.EGitCredentialsUI.xml diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 688c57993..7b474ef36 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 095a84299..82d8dc46f 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: 6.0.0.202111291000-r +Bundle-Version: 6.0.1.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 a7c9bbe25..8b35933c9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index befa0523c..d1918849a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT pom EGit Parent @@ -61,7 +61,7 @@ 3.6.3 - 6.0.0.202111291000-r + 6.0.1-SNAPSHOT 2.5.0 ${tycho-version} 11 -- 2.11.4.GIT