diff options
author | Matthias Sohn | 2023-09-07 00:29:09 +0000 |
---|---|---|
committer | Matthias Sohn | 2023-09-07 00:29:09 +0000 |
commit | 6c1336f5769bf7164b7fd68612ce8631cb042ca3 (patch) | |
tree | 827d5d382b1584c524f4177406186976ec106e37 | |
parent | cde67868a47430a9a97ac6dbe97353811faa8589 (diff) | |
download | egit-stable-6.7.tar.gz egit-stable-6.7.tar.xz egit-stable-6.7.zip |
Prepare 6.7.1-SNAPSHOT buildsstable-6.7
Change-Id: I2925025d96a4f1c39c5201c589d933c077d10de4
29 files changed, 287 insertions, 287 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 0641c2de75..9079c40f51 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="6.7.0.202309050840-r" + version="6.7.1.qualifier" provider-name="%providerName" plugin="org.eclipse.egit" license-feature="org.eclipse.license" @@ -37,10 +37,10 @@ <import plugin="org.eclipse.compare" version="3.6.0" match="compatible"/> <import plugin="org.eclipse.core.net" version="1.3.0" match="compatible"/> <import plugin="org.eclipse.team.core" version="3.8.0" match="compatible"/> - <import feature="org.eclipse.jgit" version="6.7.0" match="equivalent"/> - <import feature="org.eclipse.jgit.gpg.bc" version="6.7.0" match="equivalent"/> - <import feature="org.eclipse.jgit.http.apache" version="6.7.0" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="6.7.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/> + <import feature="org.eclipse.jgit.gpg.bc" version="6.7.1" match="equivalent"/> + <import feature="org.eclipse.jgit.http.apache" version="6.7.1" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="6.7.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index 6b8f7ce80d..2ac3e82ef4 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF index ed9d38da45..d72596032c 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.19.800,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.op;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.dircache;version="[6.7.0,6.8.0)", - org.eclipse.jgit.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.junit;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.storage.file;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)" +Import-Package: org.eclipse.egit.core;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.op;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)", + org.eclipse.jgit.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.junit;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.egit.core.test;version="6.7.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.7.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 27d1d9072f..4292431281 100644 --- a/org.eclipse.egit.core.junit/pom.xml +++ b/org.eclipse.egit.core.junit/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.junit</artifactId> diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index d4cbbc99f5..c972645096 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,28 +5,28 @@ 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)", + org.eclipse.egit.core.junit;bundle-version="[6.7.1,6.8.0)", org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", org.hamcrest.library;bundle-version="[1.3.0,2.0.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.7.0,6.8.0)", - org.eclipse.egit.core.op;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.project;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.attributes;version="[6.7.0,6.8.0)", - org.eclipse.jgit.junit;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)", + org.eclipse.egit.core;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.op;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.project;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)", + org.eclipse.jgit.junit;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.0)", org.mockito;version="[5.4.0,6.0.0)", org.mockito.junit;version="[5.4.0,6.0.0)", org.mockito.stubbing;version="[5.4.0,6.0.0)" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index b6f8ff1928..9a58836816 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.test</artifactId> diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 860dbe3c06..dbdfe10136 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -15,34 +15,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.7.200,4.0.0)", org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)" -Export-Package: org.eclipse.egit.core;version="6.7.0"; +Export-Package: org.eclipse.egit.core;version="6.7.1"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, org.eclipse.egit.gitflow.test, org.eclipse.egit.gitflow.ui, org.eclipse.egit.core.junit", - org.eclipse.egit.core.attributes;version="6.7.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="6.7.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="6.7.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="6.7.0"; + org.eclipse.egit.core.attributes;version="6.7.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="6.7.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="6.7.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="6.7.1"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.import, org.eclipse.egit.gitflow.ui, org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.credentials;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="6.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="6.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="6.7.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="6.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="6.7.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="6.7.0"; + org.eclipse.egit.core.internal.credentials;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="6.7.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="6.7.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="6.7.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="6.7.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="6.7.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="6.7.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -50,47 +50,47 @@ Export-Package: org.eclipse.egit.core;version="6.7.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="6.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="6.7.0", - org.eclipse.egit.core.settings;version="6.7.0", - org.eclipse.egit.core.storage;version="6.7.0"; + org.eclipse.egit.core.project;version="6.7.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="6.7.1", + org.eclipse.egit.core.settings;version="6.7.1", + org.eclipse.egit.core.storage;version="6.7.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.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="6.7.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="6.7.0" + org.eclipse.egit.core.synchronize;version="6.7.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="6.7.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="6.7.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.pkcs;version="[1.69,2)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.attributes;version="[6.7.0,6.8.0)", - org.eclipse.jgit.diff;version="[6.7.0,6.8.0)", - org.eclipse.jgit.dircache;version="[6.7.0,6.8.0)", - org.eclipse.jgit.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.events;version="[6.7.0,6.8.0)", - org.eclipse.jgit.gpg.bc;version="[6.7.0,6.8.0)", - org.eclipse.jgit.internal.storage.file;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lfs;version="[6.7.0,6.8.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.merge;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.storage.file;version="[6.7.0,6.8.0)", - org.eclipse.jgit.submodule;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.http;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.http.apache;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.sshd;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util.io;version="[6.7.0,6.8.0)" + org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)", + org.eclipse.jgit.diff;version="[6.7.1,6.8.0)", + org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)", + org.eclipse.jgit.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.events;version="[6.7.1,6.8.0)", + org.eclipse.jgit.gpg.bc;version="[6.7.1,6.8.0)", + org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lfs;version="[6.7.1,6.8.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.merge;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)", + org.eclipse.jgit.submodule;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.http.apache;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.sshd;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util.io;version="[6.7.1,6.8.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.MergeStrategies$Loader.xml, diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index e88556c964..75f8de0368 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core</artifactId> diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index 78d5a2510b..aebb85d32e 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.7.0.202309050840-r +Bundle-Version: 6.7.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 fb0ee79d15..38509f7e5d 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId> diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f82ae1413f..230d334e0e 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.gitflow.feature" label="%featureName" - version="6.7.0.202309050840-r" + version="6.7.1.qualifier" provider-name="%providerName" plugin="org.eclipse.egit.gitflow" license-feature="org.eclipse.license" @@ -26,9 +26,9 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="6.7.0" match="equivalent"/> - <import plugin="org.eclipse.egit.core" version="6.7.0" match="equivalent"/> - <import plugin="org.eclipse.egit.ui" version="6.7.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/> + <import plugin="org.eclipse.egit.core" version="6.7.1" match="equivalent"/> + <import plugin="org.eclipse.egit.ui" version="6.7.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index 1801c3b55f..84a9988008 100644 --- a/org.eclipse.egit.gitflow-feature/pom.xml +++ b/org.eclipse.egit.gitflow-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index 69c7d2f7fa..6448f60d68 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.7.0,6.8.0)", - org.eclipse.jgit.junit;version="[6.7.0,6.8.0)", +Import-Package: org.eclipse.egit.core;version="[6.7.1,6.8.0)", + org.eclipse.jgit.junit;version="[6.7.1,6.8.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.18.100,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)", + org.eclipse.egit.core.junit;bundle-version="[6.7.1,6.8.0)", org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 863f7fd911..09bc85a4a3 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.test</artifactId> diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 11fb847e48..a91696d4d4 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,40 +3,40 @@ 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.7.0.202309050840-r +Bundle-Version: 6.7.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.7.0,6.8.0)", - org.eclipse.egit.core.internal;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.job;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.op;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.project;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.settings;version="[6.7.0,6.8.0)", - org.eclipse.egit.gitflow;version="[6.7.0,6.8.0)", - org.eclipse.egit.gitflow.op;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.actions;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.branch;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.commit;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.components;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.decorators;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.dialogs;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.expressions;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.push;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.rebase;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[6.7.0,6.8.0)", - org.eclipse.egit.ui.internal.selection;version="[6.7.0,6.8.0)", - org.eclipse.jgit.annotations;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revplot;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)" +Import-Package: org.eclipse.egit.core;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.job;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.op;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.project;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.settings;version="[6.7.1,6.8.0)", + org.eclipse.egit.gitflow;version="[6.7.1,6.8.0)", + org.eclipse.egit.gitflow.op;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.actions;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.branch;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.commit;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.components;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.decorators;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.dialogs;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.expressions;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.push;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.rebase;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[6.7.1,6.8.0)", + org.eclipse.egit.ui.internal.selection;version="[6.7.1,6.8.0)", + org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revplot;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.9.500,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.9.100,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.9.0,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.11.200,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="6.7.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="6.7.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="6.7.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="6.7.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.7.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="6.7.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="6.7.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="6.7.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="6.7.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="6.7.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="6.7.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="6.7.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="6.7.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.7.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="6.7.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="6.7.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="6.7.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="6.7.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 41319e2728..9135676aa5 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.ui</artifactId> diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index 9688ac2dad..a9a70bc5ed 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.7.0.202309050840-r +Bundle-Version: 6.7.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.26.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="6.7.0"; +Export-Package: org.eclipse.egit.gitflow;version="6.7.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.7.0"; + org.eclipse.egit.gitflow.op;version="6.7.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.7.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.op;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.annotations;version="[6.7.0,6.8.0)", - org.eclipse.jgit.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport;version="[6.7.0,6.8.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.op;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)", + org.eclipse.jgit.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport;version="[6.7.1,6.8.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index ba609ec540..aee0077e9b 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow</artifactId> diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 1279a25b3a..f626aa8d51 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.repository</artifactId> diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 4d1493e768..b1463b3e79 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.source" label="%featureName" - version="6.7.0.202309050840-r" + version="6.7.1.qualifier" provider-name="%providerName" plugin="org.eclipse.egit" license-feature="org.eclipse.license" @@ -26,7 +26,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="6.7.0" match="equivalent"/> + <import feature="org.eclipse.egit" version="6.7.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 498d0a9819..aa48f5c1d0 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index abeccc6b28..472b7a4565 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,6 +20,6 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> </project> diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 99dcfbee66..5b8d2af7d8 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", @@ -13,26 +13,26 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.search;bundle-version="[3.14.300,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.19.800,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)", + org.eclipse.egit.core.junit;bundle-version="[6.7.1,6.8.0)", org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", org.hamcrest.library;bundle-version="[1.3.0,2.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.7.0,6.8.0)", - org.eclipse.egit.gitflow.op;version="[6.7.0,6.8.0)", - org.eclipse.egit.gitflow.ui;version="[6.7.0,6.8.0)", - org.eclipse.egit.gitflow.ui.internal;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.attributes;version="[6.7.0,6.8.0)", - org.eclipse.jgit.junit;version="[6.7.0,6.8.0)", - org.eclipse.jgit.junit.http;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.storage.file;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.resolver;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)", + org.eclipse.egit.gitflow;version="[6.7.1,6.8.0)", + org.eclipse.egit.gitflow.op;version="[6.7.1,6.8.0)", + org.eclipse.egit.gitflow.ui;version="[6.7.1,6.8.0)", + org.eclipse.egit.gitflow.ui.internal;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)", + org.eclipse.jgit.junit;version="[6.7.1,6.8.0)", + org.eclipse.jgit.junit.http;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.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 e7dce9e80d..798ff68895 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 5c80f2771e..a1583aae5e 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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.7.0.202309050840-r +Bundle-Version: 6.7.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -36,110 +36,110 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.127.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.attributes;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.credentials;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.info;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.credentials;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.efs;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.gerrit;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.hosts;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.indexdiff;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.info;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.job;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.rebase;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.signing;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.storage;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.internal.util;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.op;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.project;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.settings;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.synchronize;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.synchronize.dto;version="[6.7.0,6.8.0)", - org.eclipse.egit.core.util;version="[6.7.0,6.8.0)", - org.eclipse.jgit.annotations;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api;version="[6.7.0,6.8.0)", - org.eclipse.jgit.api.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.attributes;version="[6.7.0,6.8.0)", - org.eclipse.jgit.blame;version="[6.7.0,6.8.0)", - org.eclipse.jgit.diff;version="[6.7.0,6.8.0)", - org.eclipse.jgit.dircache;version="[6.7.0,6.8.0)", - org.eclipse.jgit.errors;version="[6.7.0,6.8.0)", - org.eclipse.jgit.events;version="[6.7.0,6.8.0)", - org.eclipse.jgit.ignore;version="[6.7.0,6.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib;version="[6.7.0,6.8.0)", - org.eclipse.jgit.lib.internal;version="[6.7.0,6.8.0)", - org.eclipse.jgit.merge;version="[6.7.0,6.8.0)", - org.eclipse.jgit.notes;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revplot;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.revwalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.storage.file;version="[6.7.0,6.8.0)", - org.eclipse.jgit.submodule;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport;version="[6.7.0,6.8.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk;version="[6.7.0,6.8.0)", - org.eclipse.jgit.treewalk.filter;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util;version="[6.7.0,6.8.0)", - org.eclipse.jgit.util.io;version="[6.7.0,6.8.0)" -Export-Package: org.eclipse.egit.ui;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.history;version="6.7.0", - org.eclipse.egit.ui.internal;version="6.7.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="6.7.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="6.7.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="6.7.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.attributes;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.credentials;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.info;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.credentials;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.efs;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.gerrit;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.hosts;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.indexdiff;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.info;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.job;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.rebase;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.signing;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.storage;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.internal.util;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.op;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.project;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.settings;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.synchronize;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.synchronize.dto;version="[6.7.1,6.8.0)", + org.eclipse.egit.core.util;version="[6.7.1,6.8.0)", + org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api;version="[6.7.1,6.8.0)", + org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)", + org.eclipse.jgit.blame;version="[6.7.1,6.8.0)", + org.eclipse.jgit.diff;version="[6.7.1,6.8.0)", + org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)", + org.eclipse.jgit.errors;version="[6.7.1,6.8.0)", + org.eclipse.jgit.events;version="[6.7.1,6.8.0)", + org.eclipse.jgit.ignore;version="[6.7.1,6.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib;version="[6.7.1,6.8.0)", + org.eclipse.jgit.lib.internal;version="[6.7.1,6.8.0)", + org.eclipse.jgit.merge;version="[6.7.1,6.8.0)", + org.eclipse.jgit.notes;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revplot;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.revwalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)", + org.eclipse.jgit.submodule;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport;version="[6.7.1,6.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)", + org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util;version="[6.7.1,6.8.0)", + org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)" +Export-Package: org.eclipse.egit.ui;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.history;version="6.7.1", + org.eclipse.egit.ui.internal;version="6.7.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="6.7.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="6.7.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="6.7.1";x-internal:=true Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml, OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml, OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml, diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 57cf3ffde1..2a07d01da2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui</artifactId> diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index c7d2641834..2934c47f7e 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.7.0.202309050840-r +Bundle-Version: 6.7.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 74f7c07c6a..dfa5281756 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId> @@ -19,7 +19,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.7.0.202309050840-r</version> + <version>6.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -61,7 +61,7 @@ <properties> <maven-version-minimum>3.6.3</maven-version-minimum> - <egit-version>6.7.0.202309050840-r</egit-version> + <egit-version>6.7.1-SNAPSHOT</egit-version> <tycho-version>4.0.2</tycho-version> <java-version>11</java-version> <ecj-version>3.33.0</ecj-version> |