From b0bbe8a1f4feacc51e48d4c6998bde6279e52a0f Mon Sep 17 00:00:00 2001 From: Dirk Baumann Date: Fri, 7 Feb 2025 09:12:08 +0100 Subject: [PATCH 001/160] Import Team Project Set can create local branch Currently the configured branch of a project in a Team Project Set is not used, when the repository of the project is already checked out and the configured branch has not yet a local branch. The changes in this commit enhances the import of a Team Project Set to create a new local branch if there is none for the branch configured in the Team Project Set. Change-Id: I2479f8dd31d33b7f55ecbc0972511a3bda233a52 Signed-off-by: Dirk Baumann --- .../egit/core/GitProjectSetCapability.java | 4 ++ .../internal/ProjectReferenceImporter.java | 42 ++++++++++++++++--- .../dialogs/RebaseTargetSelectionDialog.java | 24 ++++++----- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProjectSetCapability.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProjectSetCapability.java index 5acbd5cd2a..a511c86f4f 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProjectSetCapability.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitProjectSetCapability.java @@ -86,6 +86,10 @@ private String asReference(IProject project) throws TeamException { } else { remote = config.getString(ConfigConstants.CONFIG_BRANCH_SECTION, branch, ConfigConstants.CONFIG_KEY_REMOTE); + // Use default remote if not configured + if (remote == null) { + remote = Constants.DEFAULT_REMOTE_NAME; + } } String url = config.getString(ConfigConstants.CONFIG_REMOTE_SECTION, diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java index aac34996c4..ba2ca3e743 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java @@ -14,6 +14,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -40,11 +41,14 @@ import org.eclipse.egit.core.op.BranchOperation; import org.eclipse.egit.core.op.CloneOperation; import org.eclipse.egit.core.op.ConnectProviderOperation; +import org.eclipse.egit.core.op.CreateLocalBranchOperation; import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.egit.core.settings.GitSettings; +import org.eclipse.jgit.lib.BranchConfig.BranchRebaseMode; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import org.eclipse.jgit.transport.URIish; @@ -130,6 +134,7 @@ public List run(IProgressMonitor monitor) throws TeamException { /** * Check whether current branch is the same as configured in project * reference. Checkout configured branch if current branch is different. + * Create new local branch if required. * * @param projectReference * the project reference to be checked @@ -160,18 +165,45 @@ private static void checkoutBranchIfNecessary( currentBranch = RepositoryUtil.INSTANCE .mapCommitToRef(repository, currentBranch, false); } - + // Check for local changes + if (RepositoryUtil.hasChanges(repository)) { + throw new TeamException(MessageFormat.format( + "Repository at folder {0} has uncommitted changes.", //$NON-NLS-1$ + repository.getWorkTree())); + } // compare with current branch String configuredBranch = projectReference.getBranch(); if (!configuredBranch.equals(currentBranch)) { // Checkout configured branch - final BranchOperation branchOperation = new BranchOperation( - repository, configuredBranch); + final String branchName = projectReference.getBranch(); + // check whether ref is in reference database + Ref ref = null; try { - branchOperation.execute(monitor); - } catch (CoreException e) { + ref = mapping.getRepository().getRefDatabase() + .findRef(branchName); + } catch (IOException e) { throw new TeamException(e.getMessage()); } + if (ref == null) { + // create new local branch + final CreateLocalBranchOperation createLocalBranchOperation = new CreateLocalBranchOperation( + mapping.getRepository(), branchName, ref, + BranchRebaseMode.NONE); + try { + createLocalBranchOperation.execute(monitor); + } catch (CoreException e) { + throw new TeamException(e.getMessage()); + } + } else { + // Checkout configured branch + final BranchOperation branchOperation = new BranchOperation( + repository, configuredBranch); + try { + branchOperation.execute(monitor); + } catch (CoreException e) { + throw new TeamException(e.getMessage()); + } + } } } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java index 09b62bda09..3a72dd6ccd 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java @@ -140,17 +140,19 @@ public void widgetSelected(SelectionEvent e) { BranchRebaseMode rebase = cfg.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, branchName, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE); - switch (rebase) { - case MERGES: - preserveMergesButton.setSelection(true); - preserveMerges = true; - break; - case INTERACTIVE: - interactiveButton.setSelection(true); - interactive = true; - break; - default: - break; + if (rebase != null) { + switch (rebase) { + case MERGES: + preserveMergesButton.setSelection(true); + preserveMerges = true; + break; + case INTERACTIVE: + interactiveButton.setSelection(true); + interactive = true; + break; + default: + break; + } } } From 021bcbb6b5abdf61cd041d10c383ea34023d4da5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 16:01:18 +0100 Subject: [PATCH 002/160] Prepare 7.3.0-SNAPSHOT builds Change-Id: Icdb4a82f97904558c96eb50decb05853815217ab --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++---- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 214 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 288 insertions(+), 288 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 390922b572..6c436a5b6c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-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 0e1b7735f5..0415372cc8 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.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="[7.2.1,7.3.0)", - org.eclipse.egit.core.op;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" +Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.egit.core.test;version="7.2.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="7.3.0";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 41c1316d9a..3862385cee 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 - 7.2.1-SNAPSHOT + 7.3.0-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 1aafac202f..a9f45e0b9b 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.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="[7.2.1,7.3.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.0,7.4.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="[7.2.1,7.3.0)", - org.eclipse.egit.core.op;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.project;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.egit.core;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.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 b5d29c6c67..83943e25aa 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 - 7.2.1-SNAPSHOT + 7.3.0-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 e05a0ecb37..0366925f11 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.3.1000,2.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)" -Export-Package: org.eclipse.egit.core;version="7.2.1"; +Export-Package: org.eclipse.egit.core;version="7.3.0"; 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="7.2.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.2.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.2.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.2.1"; + org.eclipse.egit.core.attributes;version="7.3.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.3.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.3.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.3.0"; 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="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.2.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.2.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.2.1";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.2.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.2.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.2.1"; + org.eclipse.egit.core.internal.credentials;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.3.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.3.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.3.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.2.1"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.2.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.2.1", - org.eclipse.egit.core.settings;version="7.2.1", - org.eclipse.egit.core.storage;version="7.2.1"; + org.eclipse.egit.core.project;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.3.0", + org.eclipse.egit.core.settings;version="7.3.0", + org.eclipse.egit.core.storage;version="7.3.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.2.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.2.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.2.1" + org.eclipse.egit.core.synchronize;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.jce.provider;version="[1.79.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.79.0,2.0.0)", org.bouncycastle.pkcs;version="[1.79.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.events;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.signing.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.submodule;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)" + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.events;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.signing.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.submodule;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.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 2d09a2ee41..4e17d082d1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-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 7b1bc47063..cbd08df226 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 0d74aca7a1..7c63a29500 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 48af0362bb..943caee2a6 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 - 7.2.1-SNAPSHOT + 7.3.0-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 25c287e66d..e02e6b7ee4 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.egit.core;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", +Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.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="[7.2.1,7.3.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.0,7.4.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 aea660309a..6325e4159e 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 - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index efe4278ae5..c295b1fd1e 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.job;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.op;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.project;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.settings;version="[7.2.1,7.3.0)", - org.eclipse.egit.gitflow;version="[7.2.1,7.3.0)", - org.eclipse.egit.gitflow.op;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.actions;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.branch;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.commit;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.components;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.push;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.2.1,7.3.0)", - org.eclipse.egit.ui.internal.selection;version="[7.2.1,7.3.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" +Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.settings;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow.op;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.actions;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.branch;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.commit;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.components;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.push;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.3.0,7.4.0)", + org.eclipse.egit.ui.internal.selection;version="[7.3.0,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.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="7.2.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.2.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.2.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.2.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.2.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.2.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.2.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.2.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.2.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.3.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.3.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.3.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.3.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.3.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.3.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.3.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.3.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.3.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index fe92b6d167..c2e4eabb3b 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 - 7.2.1-SNAPSHOT + 7.3.0-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 d3a88b1cfa..062c6b0ba8 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 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="7.2.1"; +Export-Package: org.eclipse.egit.gitflow;version="7.3.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="7.2.1"; + org.eclipse.egit.gitflow.op;version="7.3.0"; 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="7.2.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.op;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index a5508d85fe..b47d2b0e2a 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index f895bce0c4..da561bec65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index d6f5ce6e07..9ff6eea2d1 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 - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index b0c9d334d5..55adfe614e 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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="[7.2.1,7.3.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.0,7.4.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="[7.2.1,7.3.0)", - org.eclipse.egit.gitflow.op;version="[7.2.1,7.3.0)", - org.eclipse.egit.gitflow.ui;version="[7.2.1,7.3.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.egit.gitflow;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow.op;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow.ui;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.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 f860054774..bdb322c7db 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 - 7.2.1-SNAPSHOT + 7.3.0-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 index e630328b00..29fefdf5b8 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,113 +35,113 @@ 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-17 -Import-Package: org.eclipse.egit.core;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.attributes;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.credentials;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.info;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.credentials;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.efs;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.hosts;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.info;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.job;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.rebase;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.signing;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.storage;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.internal.util;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.op;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.project;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.settings;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.synchronize;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.2.1,7.3.0)", - org.eclipse.egit.core.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.blame;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.events;version="[7.2.1,7.3.0)", - org.eclipse.jgit.ignore;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.notes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.submodule;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", +Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.attributes;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.credentials;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.info;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.credentials;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.efs;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.hosts;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.info;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.rebase;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.signing;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.storage;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.internal.util;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.settings;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.synchronize;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.3.0,7.4.0)", + org.eclipse.egit.core.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.blame;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.events;version="[7.3.0,7.4.0)", + org.eclipse.jgit.ignore;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.notes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.submodule;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.history;version="7.2.1", - org.eclipse.egit.ui.internal;version="7.2.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.2.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.2.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.2.1";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.history;version="7.3.0", + org.eclipse.egit.ui.internal;version="7.3.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.3.0";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 ee526445b4..f3882031e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 56f81676d4..a2846aaffe 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: 7.2.1.qualifier +Bundle-Version: 7.3.0.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 4bca31c046..69649b629a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index fffeadec26..ebeb6473be 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT 4.0.11 17 3.40.0 From ffd384cfc543c0e9dbcadb74886b23beea1e3ab7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 8 Mar 2025 23:00:13 +0100 Subject: [PATCH 003/160] Update jgit dependencies - bytebuddy to 1.17.2 - jetty to 12.0.17 - mockito to 5.16.0 Change-Id: Id58f7b85475abe43eb96f5ec16400f53dc5f0d33 --- org.eclipse.egit.target/egit-4.26.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.27.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.28.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.29.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.30.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.31.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.32.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.33.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.34.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.35.target | 24 +++++++++---------- .../maven/dependencies.tpd | 22 ++++++++--------- 11 files changed, 131 insertions(+), 131 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target index d4463db142..39bf2eb118 100644 --- a/org.eclipse.egit.target/egit-4.26.target +++ b/org.eclipse.egit.target/egit-4.26.target @@ -1,7 +1,7 @@ - + @@ -156,7 +156,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -182,49 +182,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -260,13 +260,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target index 3f5a37aded..2dd8dacdee 100644 --- a/org.eclipse.egit.target/egit-4.27.target +++ b/org.eclipse.egit.target/egit-4.27.target @@ -1,7 +1,7 @@ - + @@ -157,7 +157,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -183,49 +183,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -261,13 +261,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target index bedcb45406..7a26b19ee9 100644 --- a/org.eclipse.egit.target/egit-4.28.target +++ b/org.eclipse.egit.target/egit-4.28.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target index fd41ad63df..ef182651a4 100644 --- a/org.eclipse.egit.target/egit-4.29.target +++ b/org.eclipse.egit.target/egit-4.29.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target index f0b2d99e40..6e3a73a26d 100644 --- a/org.eclipse.egit.target/egit-4.30.target +++ b/org.eclipse.egit.target/egit-4.30.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target index 7da9c26e6b..5243078c04 100644 --- a/org.eclipse.egit.target/egit-4.31.target +++ b/org.eclipse.egit.target/egit-4.31.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target index 5e33cf2805..f8a223ca56 100644 --- a/org.eclipse.egit.target/egit-4.32.target +++ b/org.eclipse.egit.target/egit-4.32.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target index 4f4ac18763..0a63428419 100644 --- a/org.eclipse.egit.target/egit-4.33.target +++ b/org.eclipse.egit.target/egit-4.33.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target index 125479fa43..c4583e5b2e 100644 --- a/org.eclipse.egit.target/egit-4.34.target +++ b/org.eclipse.egit.target/egit-4.34.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target index 310a8ab6b4..cb12a25960 100644 --- a/org.eclipse.egit.target/egit-4.35.target +++ b/org.eclipse.egit.target/egit-4.35.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.17 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.17 jar @@ -274,13 +274,13 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 jar net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 54af997009..da792a80a6 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.1" + version = "1.17.2" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.1" + version = "1.17.2" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.16" + version = "12.0.17" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.15.2" + version = "5.16.0" } } From 8161529fa3d76f129f6288b98d47027bbd7a6c1c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 9 Mar 2025 12:14:03 +0100 Subject: [PATCH 004/160] Update maven plugins - maven-spotbugs-plugin to 4.9.2.0 - tycho to 4.0.12 Change-Id: Iefadf438caa5f986f1b67a929d2041dc827b4aa2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ebeb6473be..832a3fb650 100644 --- a/pom.xml +++ b/pom.xml @@ -63,10 +63,10 @@ 3.9.0 7.3.0-SNAPSHOT - 4.0.11 + 4.0.12 17 3.40.0 - 4.9.1.0 + 4.9.2.0 file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository https://download.eclipse.org/cbi/updates/license /home/data/httpd/download-staging.priv/egit From dde0700217c04603fdb8e3cb26e6f5d13fb252c1 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Tue, 11 Mar 2025 18:03:14 +0100 Subject: [PATCH 005/160] Make ClipboardPropertyTester configurable and disabled by default Fixes https://github.com/eclipse-egit/egit/issues/83 Change-Id: Iec7021909151a89e964417f62cfe6b1ef1956cdb --- org.eclipse.egit.ui/plugin.xml | 2 +- .../org/eclipse/egit/ui/UIPreferences.java | 3 ++ .../org/eclipse/egit/ui/internal/UIText.java | 6 +++ .../clipboard/ClipboardPropertyTester.java | 43 +++++++++++++------ .../preferences/GitPreferenceRoot.java | 9 ++++ .../egit/ui/internal/uitext.properties | 2 + 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 83d9e213d2..9dfc9175e7 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -2113,10 +2113,10 @@ - + diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java index c7a2362b00..eb85c9197a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java @@ -331,6 +331,9 @@ private UIPreferences() { /** */ public static final String DIFF_OUTLINE_PRESENTATION = "DiffEditorOutline.compactTree"; //$NON-NLS-1$ + /** */ + public static final String ENABLE_CLIPBOARD_MONITORING = "ClipboardPropertyTester.enabled"; //$NON-NLS-1$ + /** * Converts a persisted String separated with commas to an integer array * diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 79a002b338..6c180e812f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -813,6 +813,12 @@ public class UIText extends NLS { /** */ public static String GitPreferenceRoot_lfsSupportSuccessMessage; + /** */ + public static String GitPreferenceRoot_clipboardHeader; + + /** */ + public static String GitPreferenceRoot_clipboardLabel; + /** */ public static String GitPreferenceRoot_lfsSupportSuccessTitle; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clipboard/ClipboardPropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clipboard/ClipboardPropertyTester.java index 0cc999f8f5..c1947fedd3 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clipboard/ClipboardPropertyTester.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clipboard/ClipboardPropertyTester.java @@ -13,6 +13,9 @@  *******************************************************************************/ package org.eclipse.egit.ui.internal.clipboard; +import org.eclipse.core.runtime.Platform; +import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.clone.GitUrlChecker; import org.eclipse.egit.ui.internal.expressions.AbstractPropertyTester; import org.eclipse.egit.ui.internal.trace.GitTraceLocation; @@ -55,27 +58,39 @@ public boolean test(Object receiver, String property, Object[] args, } private boolean internalTest(String property) { - if (property.equals("containsGitURL")) { //$NON-NLS-1$ - String content = getClipboardTextContent(); - if (content != null) { + if (!"containsGitURL".equals(property)) { //$NON-NLS-1$ + return false; + } + if (!isClipboarMonitoringEnabled()) { + return false; + } + String content = getClipboardTextContent(); + if (content != null) { - String sanitized = GitUrlChecker - .sanitizeAsGitUrl(content); + String sanitized = GitUrlChecker.sanitizeAsGitUrl(content); - if (GitUrlChecker.isValidGitUrl(sanitized)) { - // The clipboard is valid for GIT paste only if the current - // swt control is not a Text or a StyledText (ie : in a - // CellEditor) - Control c = getFocusedControl(); - return (c != null) && !(c instanceof StyledText) - && !(c instanceof Text); - } + if (GitUrlChecker.isValidGitUrl(sanitized)) { + // The clipboard is valid for GIT paste only if the current + // swt control is not a Text or a StyledText (ie : in a + // CellEditor) + Control c = getFocusedControl(); + return (c != null) && !(c instanceof StyledText) + && !(c instanceof Text); } } - return false; } + /** + * Tells whether "Monitor clipboard for repository url" is currently enabled + * + * @return {@code true} if monitoring is enabled, {@code false} otherwise. + */ + public static boolean isClipboarMonitoringEnabled() { + return Platform.getPreferencesService().getBoolean(Activator.PLUGIN_ID, + UIPreferences.ENABLE_CLIPBOARD_MONITORING, false, null); + } + /** * Extract the text value in the clipboard. * diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java index 71b5dc3f55..d066d32a5f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java @@ -392,6 +392,15 @@ public void widgetSelected(SelectionEvent e) { } }); updateMargins(lfsGroup); + + Group clipboardGroup = new Group(main, SWT.SHADOW_ETCHED_IN); + GridDataFactory.fillDefaults().grab(true, false).span(GROUP_SPAN, 1) + .applyTo(clipboardGroup); + clipboardGroup.setText(UIText.GitPreferenceRoot_clipboardHeader); + addField(new BooleanFieldEditor( + UIPreferences.ENABLE_CLIPBOARD_MONITORING, + UIText.GitPreferenceRoot_clipboardLabel, clipboardGroup)); + updateMargins(clipboardGroup); } @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index a2b10cc17d..7981272a66 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -294,6 +294,8 @@ GitPreferenceRoot_lfsSupportCaptionNotAvailable=LFS support (not installed) GitPreferenceRoot_lfsSupportInstall=Enable &LFS support globally (for the current user) GitPreferenceRoot_lfsSupportSuccessMessage=LFS support has been installed for the current user. GitPreferenceRoot_lfsSupportSuccessTitle=LFS configured +GitPreferenceRoot_clipboardHeader=Monitor clipboard +GitPreferenceRoot_clipboardLabel=Always check clipboard content for possible git repository URLs GitServersPreferencePage_AddLabel=A&dd GitServersPreferencePage_Description=Enter host name patterns for Git servers. GitServersPreferencePage_PatternTitle=Host Name Pattern From 0bced171f106a088df825ff47c63fcb57f23f444 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 12 Mar 2025 21:44:46 +0100 Subject: [PATCH 006/160] Add egit-4.36 target platform for Eclipse 2025-06 Change-Id: I4808c54353d85c0aabe296b11bfa7f0dc2666064 --- org.eclipse.egit.repository/category.xml | 2 +- org.eclipse.egit.target/egit-4.36.target | 371 ++++++++++++++++++ org.eclipse.egit.target/egit-4.36.tpd | 7 + org.eclipse.egit.target/orbit/orbit-4.36.tpd | 53 +++ .../releasetrain/4.36-2025-06.tpd | 36 ++ 5 files changed, 468 insertions(+), 1 deletion(-) create mode 100644 org.eclipse.egit.target/egit-4.36.target create mode 100644 org.eclipse.egit.target/egit-4.36.tpd create mode 100644 org.eclipse.egit.target/orbit/orbit-4.36.tpd create mode 100644 org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index d6ad63b7dd..74767851dd 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -250,5 +250,5 @@ - + diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target new file mode 100644 index 0000000000..bd76631616 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.36.target @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + jar + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + jar + + + org.osgi + org.osgi.service.component.annotations + 1.5.1 + jar + + + org.osgi + org.osgi.service.metatype.annotations + 1.4.1 + jar + + + + + + + org.tukaani + xz + 1.10 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.15.0 + jar + + + org.apache.sshd + sshd-sftp + 2.15.0 + jar + + + + + + + org.mockito + mockito-core + 5.16.0 + jar + + + + + + + net.java.dev.jna + jna + 5.16.0 + jar + + + net.java.dev.jna + jna-platform + 5.16.0 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.17 + jar + + + org.eclipse.jetty + jetty-http + 12.0.17 + jar + + + org.eclipse.jetty + jetty-io + 12.0.17 + jar + + + org.eclipse.jetty + jetty-security + 12.0.17 + jar + + + org.eclipse.jetty + jetty-server + 12.0.17 + jar + + + org.eclipse.jetty + jetty-session + 12.0.17 + jar + + + org.eclipse.jetty + jetty-util + 12.0.17 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.17 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + com.google.code.gson + gson + 2.12.1 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.17.2 + jar + + + net.bytebuddy + byte-buddy-agent + 1.17.2 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.80 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.80 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.80 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.80 + jar + + + + + + + org.assertj + assertj-core + 3.27.3 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.18.0 + jar + + + org.apache.commons + commons-compress + 1.27.1 + jar + + + org.apache.commons + commons-lang3 + 3.17.0 + jar + + + commons-io + commons-io + 2.18.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.egit.target/egit-4.36.tpd b/org.eclipse.egit.target/egit-4.36.tpd new file mode 100644 index 0000000000..83d69e70cd --- /dev/null +++ b/org.eclipse.egit.target/egit-4.36.tpd @@ -0,0 +1,7 @@ +target "egit-4.36" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.36.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.36-2025-06.tpd" diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd new file mode 100644 index 0000000000..238f5aa64b --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -0,0 +1,53 @@ +target "orbit-4.36" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06" { + com.ibm.icu [76.1.0,76.1.0] + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + jakarta.activation-api [2.1.3,2.1.3] + jakarta.activation-api.source [2.1.3,2.1.3] + jakarta.annotation-api [2.1.1,2.1.1] + jakarta.annotation-api.source [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] + jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api.source [2.3.3,2.3.3] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.batik.constants [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.batik.css [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.batik.i18n [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.batik.util [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apache.xmlgraphics [2.10.0.v20241009-1200,2.10.0.v20241009-1200] + org.eclipse.jetty.servlet-api [4.0.6,4.0.6] + org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0,4.36.0] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] + org.hamcrest [2.2.0,2.2.0] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.source [2.2.0,2.2.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.mortbay.jasper.apache-jsp [9.0.96,9.0.96] + org.objectweb.asm [9.7.1, 9.7.1] + org.objectweb.asm.source [9.7.1, 9.7.1] + org.objectweb.asm.tree [9.7.1,9.7.1] + org.objectweb.asm.tree.analysis [9.7.1,9.7.1] + org.objectweb.asm.util [9.7.1,9.7.1] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd new file mode 100644 index 0000000000..57b1d0617f --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd @@ -0,0 +1,36 @@ +target "4.36-2025-06" with source configurePhase + +location "https://download.eclipse.org/releases/2025-06" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + biz.aQute.repository + biz.aQute.resolve lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.commonmark lazy + org.commonmark-gfm-tables lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.sdk.ide lazy + org.eclipse.search.core lazy + org.osgi.service.http.whiteboard lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} From 983bea8be796b7df8896bec9b55f822b313f1513 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 16 Mar 2025 13:20:33 +0100 Subject: [PATCH 007/160] [oomph] Update and cycle API baselines Add 7.2.0, remove 6.10.0. Also add a choice for the 4.35 and 4.36 target platforms. Change-Id: I3133f6b4c615857cb03a5abb1098cdb29ecd2a49 --- tools/oomph/EGit.setup | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index 619e208ca4..4608cc8d04 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -144,17 +144,14 @@ + + Default target platform for EGit development. - - EGit 6.10.0 API baseline; to be used with branch stable-7.0 - - EGit 7.1.0 API baseline; to be used with branch master + EGit 7.1.0 API baseline; to be used with branch stable-7.2 + + + EGit 7.2.0 API baseline; to be used with branch master Date: Sun, 16 Mar 2025 13:28:11 +0100 Subject: [PATCH 008/160] Bump minimum dependency for Bouncy Castle to 1.80.0 Bug: jgit-148 Change-Id: I3eb36e520da17be0d8ede8df70c4b4a46754aa43 --- org.eclipse.egit.core/META-INF/MANIFEST.MF | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 0366925f11..baab28be80 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -62,10 +62,10 @@ Export-Package: org.eclipse.egit.core;version="7.3.0"; org.eclipse.egit.core.util;version="7.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.bouncycastle.jce.provider;version="[1.79.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.79.0,2.0.0)", - org.bouncycastle.openpgp.bc;version="[1.79.0,2.0.0)", - org.bouncycastle.pkcs;version="[1.79.0,2.0.0)", +Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", + org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", + org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", org.eclipse.jgit.api;version="[7.3.0,7.4.0)", From db3e6f0a0d06f8c8250ac84705cf56dde0165b6f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 22 Mar 2025 21:59:33 +0100 Subject: [PATCH 009/160] Update build dependencies - bytebuddy to 1.17.3 - com.ibm.icu to 77.1.0 - jetty to 12.0.18 - jna to 5.17.0 - mockito to 5.16.1 Change-Id: I9b53716905da22d48d9164f0b06c81a3fd8b8e91 --- org.eclipse.egit.target/egit-4.26.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.27.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.28.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.29.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.30.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.31.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.32.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.33.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.34.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.35.target | 28 ++++++++--------- org.eclipse.egit.target/egit-4.36.target | 30 +++++++++---------- .../maven/dependencies.tpd | 26 ++++++++-------- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 2 +- 13 files changed, 169 insertions(+), 169 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target index 39bf2eb118..4cf7a3c0f4 100644 --- a/org.eclipse.egit.target/egit-4.26.target +++ b/org.eclipse.egit.target/egit-4.26.target @@ -1,7 +1,7 @@ - + @@ -156,7 +156,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -166,13 +166,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -182,49 +182,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -260,13 +260,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target index 2dd8dacdee..f066b631cf 100644 --- a/org.eclipse.egit.target/egit-4.27.target +++ b/org.eclipse.egit.target/egit-4.27.target @@ -1,7 +1,7 @@ - + @@ -157,7 +157,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -167,13 +167,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -183,49 +183,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -261,13 +261,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target index 7a26b19ee9..e7b121e046 100644 --- a/org.eclipse.egit.target/egit-4.28.target +++ b/org.eclipse.egit.target/egit-4.28.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -170,13 +170,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target index ef182651a4..41f259bf22 100644 --- a/org.eclipse.egit.target/egit-4.29.target +++ b/org.eclipse.egit.target/egit-4.29.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -170,13 +170,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target index 6e3a73a26d..c4ac93b628 100644 --- a/org.eclipse.egit.target/egit-4.30.target +++ b/org.eclipse.egit.target/egit-4.30.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -171,13 +171,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target index 5243078c04..044190a15e 100644 --- a/org.eclipse.egit.target/egit-4.31.target +++ b/org.eclipse.egit.target/egit-4.31.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -171,13 +171,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target index f8a223ca56..82729f4c97 100644 --- a/org.eclipse.egit.target/egit-4.32.target +++ b/org.eclipse.egit.target/egit-4.32.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -171,13 +171,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target index 0a63428419..82847101e6 100644 --- a/org.eclipse.egit.target/egit-4.33.target +++ b/org.eclipse.egit.target/egit-4.33.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -171,13 +171,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target index c4583e5b2e..7d62a82ca3 100644 --- a/org.eclipse.egit.target/egit-4.34.target +++ b/org.eclipse.egit.target/egit-4.34.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -171,13 +171,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target index cb12a25960..eaef1cf4fa 100644 --- a/org.eclipse.egit.target/egit-4.35.target +++ b/org.eclipse.egit.target/egit-4.35.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -180,13 +180,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -274,13 +274,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index bd76631616..d054195391 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 jar @@ -180,13 +180,13 @@ net.java.dev.jna jna - 5.16.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-http - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-io - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-security - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-server - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-session - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util - 12.0.17 + 12.0.18 jar org.eclipse.jetty jetty-util-ajax - 12.0.17 + 12.0.18 jar @@ -274,13 +274,13 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 jar net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index da792a80a6..fe7a47e478 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.2" + version = "1.17.3" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.2" + version = "1.17.3" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.17" + version = "12.0.18" } dependency { groupId = "jakarta.servlet" @@ -193,12 +193,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.16.0" + version = "5.17.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.16.0" + version = "5.17.0" } } @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.16.0" + version = "5.16.1" } } diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index 238f5aa64b..7c0370055a 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -3,7 +3,7 @@ target "orbit-4.36" with source configurePhase // when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06" { - com.ibm.icu [76.1.0,76.1.0] + com.ibm.icu [77.1.0,77.1.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] From c54a0000e395ca57c8c8521d0c4f002d7d17101f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Apr 2025 09:16:01 +0200 Subject: [PATCH 010/160] Update jgit and orbit dependencies - bytebuddy to 1.17.5 - jetty to 12.0.19 - mockito to 5.17.0 - org.mortbay.jasper.apache-jsp to 9.0.102 - org.objectweb.asm to 9.8.0 - org.objectweb.asm.tree to 9.8.0 - org.objectweb.asm.tree.analysis to 9.8.0 - org.objectweb.asm.util to 9.8.0 Change-Id: I375d0d26b0ab8d149874cf0b8d0a5f671ed73078 --- org.eclipse.egit.target/egit-4.26.target | 24 ++++++------- org.eclipse.egit.target/egit-4.27.target | 24 ++++++------- org.eclipse.egit.target/egit-4.28.target | 24 ++++++------- org.eclipse.egit.target/egit-4.29.target | 24 ++++++------- org.eclipse.egit.target/egit-4.30.target | 24 ++++++------- org.eclipse.egit.target/egit-4.31.target | 24 ++++++------- org.eclipse.egit.target/egit-4.32.target | 24 ++++++------- org.eclipse.egit.target/egit-4.33.target | 24 ++++++------- org.eclipse.egit.target/egit-4.34.target | 24 ++++++------- org.eclipse.egit.target/egit-4.35.target | 24 ++++++------- org.eclipse.egit.target/egit-4.36.target | 36 +++++++++---------- .../maven/dependencies.tpd | 22 ++++++------ org.eclipse.egit.target/orbit/orbit-4.36.tpd | 12 +++---- 13 files changed, 155 insertions(+), 155 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target index 4cf7a3c0f4..e515ef6bf0 100644 --- a/org.eclipse.egit.target/egit-4.26.target +++ b/org.eclipse.egit.target/egit-4.26.target @@ -1,7 +1,7 @@ - + @@ -156,7 +156,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -182,49 +182,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -260,13 +260,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target index f066b631cf..6c68f50ad2 100644 --- a/org.eclipse.egit.target/egit-4.27.target +++ b/org.eclipse.egit.target/egit-4.27.target @@ -1,7 +1,7 @@ - + @@ -157,7 +157,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -183,49 +183,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -261,13 +261,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target index e7b121e046..d7a6db4c18 100644 --- a/org.eclipse.egit.target/egit-4.28.target +++ b/org.eclipse.egit.target/egit-4.28.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target index 41f259bf22..95bb08140c 100644 --- a/org.eclipse.egit.target/egit-4.29.target +++ b/org.eclipse.egit.target/egit-4.29.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -264,13 +264,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target index c4ac93b628..40ca970c0e 100644 --- a/org.eclipse.egit.target/egit-4.30.target +++ b/org.eclipse.egit.target/egit-4.30.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target index 044190a15e..dd5aac857d 100644 --- a/org.eclipse.egit.target/egit-4.31.target +++ b/org.eclipse.egit.target/egit-4.31.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target index 82729f4c97..583405bf9f 100644 --- a/org.eclipse.egit.target/egit-4.32.target +++ b/org.eclipse.egit.target/egit-4.32.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target index 82847101e6..669a0e1ef7 100644 --- a/org.eclipse.egit.target/egit-4.33.target +++ b/org.eclipse.egit.target/egit-4.33.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target index 7d62a82ca3..044d712b79 100644 --- a/org.eclipse.egit.target/egit-4.34.target +++ b/org.eclipse.egit.target/egit-4.34.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -265,13 +265,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target index eaef1cf4fa..0adee548d3 100644 --- a/org.eclipse.egit.target/egit-4.35.target +++ b/org.eclipse.egit.target/egit-4.35.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -274,13 +274,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index d054195391..4844704f4c 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -51,12 +51,12 @@ - - - - - - + + + + + + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-http - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-io - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-security - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-server - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-session - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util - 12.0.18 + 12.0.19 jar org.eclipse.jetty jetty-util-ajax - 12.0.18 + 12.0.19 jar @@ -274,13 +274,13 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.5 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index fe7a47e478..30af75c140 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.3" + version = "1.17.5" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.3" + version = "1.17.5" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.18" + version = "12.0.19" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.16.1" + version = "5.17.0" } } diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index 7c0370055a..a0c46aa824 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -40,12 +40,12 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.hamcrest.source [2.2.0,2.2.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.mortbay.jasper.apache-jsp [9.0.96,9.0.96] - org.objectweb.asm [9.7.1, 9.7.1] - org.objectweb.asm.source [9.7.1, 9.7.1] - org.objectweb.asm.tree [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis [9.7.1,9.7.1] - org.objectweb.asm.util [9.7.1,9.7.1] + org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] + org.objectweb.asm [9.8.0, 9.8.0] + org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.tree [9.8.0, 9.8.0] + org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] + org.objectweb.asm.util [9.8.0, 9.8.0] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] From 6c83dc42fb4a5ea993162586eccb3c2be4328e47 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Apr 2025 16:03:09 +0200 Subject: [PATCH 011/160] EGit v7.3.0.202504081226-m1 Change-Id: Ia9f02e3878aa87bcaf0899b8c7861743277e24cc Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6c436a5b6c..a7f7c86d19 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 0415372cc8..77b9cda66e 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3862385cee..a97bfaba1b 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 a9f45e0b9b..8d10e90612 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 83943e25aa..6e1a20fbde 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 baab28be80..5f9120d88f 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 4e17d082d1..fdceda4a0a 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 cbd08df226..bea6833e03 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 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 7c63a29500..d747b558cd 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 943caee2a6..2dcae83c73 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 e02e6b7ee4..7812b16028 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 6325e4159e..a04e0a4e2a 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index c295b1fd1e..77e67cd244 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2e4eabb3b..563b6eae0b 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 062c6b0ba8..301558a4f7 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index b47d2b0e2a..11e84dd0d1 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index da561bec65..9b485e7115 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9ff6eea2d1..0dbb503c2f 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 55adfe614e..0ba19da0c3 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bdb322c7db..0293d8575e 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 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 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 index 29fefdf5b8..56e72dea6a 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f3882031e2..df74d56717 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a2846aaffe..e26f8da7ab 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202504081226-m1 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 69649b629a..504e4237b8 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 832a3fb650..1c9f5dcd83 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0-SNAPSHOT + 7.3.0.202504081226-m1 4.0.12 17 3.40.0 From 4add4a21647c52ef3ded4dc16062cf0014df7266 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 10 Apr 2025 00:03:01 +0200 Subject: [PATCH 012/160] Prepare 7.3.0-SNAPSHOT builds Change-Id: Ibd505cef2b6e2e190e6f13ee9f95c1a66baa0e61 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a7f7c86d19..6c436a5b6c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-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 77b9cda66e..0415372cc8 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a97bfaba1b..3862385cee 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 - 7.3.0.202504081226-m1 + 7.3.0-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 8d10e90612..a9f45e0b9b 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 6e1a20fbde..83943e25aa 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 - 7.3.0.202504081226-m1 + 7.3.0-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 5f9120d88f..baab28be80 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index fdceda4a0a..4e17d082d1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-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 bea6833e03..cbd08df226 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index d747b558cd..7c63a29500 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 2dcae83c73..943caee2a6 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 - 7.3.0.202504081226-m1 + 7.3.0-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 7812b16028..e02e6b7ee4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index a04e0a4e2a..6325e4159e 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 - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 77e67cd244..c295b1fd1e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 563b6eae0b..c2e4eabb3b 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 - 7.3.0.202504081226-m1 + 7.3.0-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 301558a4f7..062c6b0ba8 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 11e84dd0d1..b47d2b0e2a 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9b485e7115..da561bec65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 0dbb503c2f..9ff6eea2d1 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 - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0ba19da0c3..55adfe614e 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 0293d8575e..bdb322c7db 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 - 7.3.0.202504081226-m1 + 7.3.0-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 index 56e72dea6a..29fefdf5b8 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index df74d56717..f3882031e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index e26f8da7ab..a2846aaffe 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: 7.3.0.202504081226-m1 +Bundle-Version: 7.3.0.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 504e4237b8..69649b629a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 1c9f5dcd83..832a3fb650 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0.202504081226-m1 + 7.3.0-SNAPSHOT 4.0.12 17 3.40.0 From a237a367bf1378b6a7d3e819e4b56f21456d640c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 21 Apr 2025 18:47:12 +0200 Subject: [PATCH 013/160] Update jgit dependencies and orbit - commons-io:commons-io to 2.19.0 - com.google.code.gson:gson to 2.13.0 - org.eclipse.orbit.maven.lucene-10 to 4.36.0.v20250410-1000 Change-Id: I129e848339ec4b235a16b9b0e79bc9249a7ddf2c --- org.eclipse.egit.target/egit-4.26.target | 6 +++--- org.eclipse.egit.target/egit-4.27.target | 6 +++--- org.eclipse.egit.target/egit-4.28.target | 6 +++--- org.eclipse.egit.target/egit-4.29.target | 6 +++--- org.eclipse.egit.target/egit-4.30.target | 6 +++--- org.eclipse.egit.target/egit-4.31.target | 6 +++--- org.eclipse.egit.target/egit-4.32.target | 6 +++--- org.eclipse.egit.target/egit-4.33.target | 6 +++--- org.eclipse.egit.target/egit-4.34.target | 6 +++--- org.eclipse.egit.target/egit-4.35.target | 6 +++--- org.eclipse.egit.target/egit-4.36.target | 8 ++++---- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target index e515ef6bf0..cd42a0d912 100644 --- a/org.eclipse.egit.target/egit-4.26.target +++ b/org.eclipse.egit.target/egit-4.26.target @@ -1,7 +1,7 @@ - + @@ -250,7 +250,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -342,7 +342,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target index 6c68f50ad2..111d9c431e 100644 --- a/org.eclipse.egit.target/egit-4.27.target +++ b/org.eclipse.egit.target/egit-4.27.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -343,7 +343,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target index d7a6db4c18..e512219636 100644 --- a/org.eclipse.egit.target/egit-4.28.target +++ b/org.eclipse.egit.target/egit-4.28.target @@ -1,7 +1,7 @@ - + @@ -254,7 +254,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -346,7 +346,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target index 95bb08140c..ce2aa165bb 100644 --- a/org.eclipse.egit.target/egit-4.29.target +++ b/org.eclipse.egit.target/egit-4.29.target @@ -1,7 +1,7 @@ - + @@ -254,7 +254,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -346,7 +346,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target index 40ca970c0e..9b04c9c548 100644 --- a/org.eclipse.egit.target/egit-4.30.target +++ b/org.eclipse.egit.target/egit-4.30.target @@ -1,7 +1,7 @@ - + @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -347,7 +347,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target index dd5aac857d..cd32e1da6e 100644 --- a/org.eclipse.egit.target/egit-4.31.target +++ b/org.eclipse.egit.target/egit-4.31.target @@ -1,7 +1,7 @@ - + @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -347,7 +347,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target index 583405bf9f..8a3e891674 100644 --- a/org.eclipse.egit.target/egit-4.32.target +++ b/org.eclipse.egit.target/egit-4.32.target @@ -1,7 +1,7 @@ - + @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -347,7 +347,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target index 669a0e1ef7..58e7a8eb6c 100644 --- a/org.eclipse.egit.target/egit-4.33.target +++ b/org.eclipse.egit.target/egit-4.33.target @@ -1,7 +1,7 @@ - + @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -347,7 +347,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target index 044d712b79..625b1006f2 100644 --- a/org.eclipse.egit.target/egit-4.34.target +++ b/org.eclipse.egit.target/egit-4.34.target @@ -1,7 +1,7 @@ - + @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -347,7 +347,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target index 0adee548d3..253b51bf92 100644 --- a/org.eclipse.egit.target/egit-4.35.target +++ b/org.eclipse.egit.target/egit-4.35.target @@ -1,7 +1,7 @@ - + @@ -264,7 +264,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -356,7 +356,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 4844704f4c..6869a2b78d 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -264,7 +264,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.0 jar @@ -356,7 +356,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 30af75c140..e0167bc080 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -24,7 +24,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.18.0" + version = "2.19.0" } dependency { groupId = "commons-logging" @@ -114,7 +114,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.12.1" + version = "2.13.0" } } diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index a0c46aa824..257b24aa7f 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -30,7 +30,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] org.apache.xmlgraphics [2.10.0.v20241009-1200,2.10.0.v20241009-1200] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0,4.36.0] + org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0.v20250410-1000,4.36.0.v20250410-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] From d0a1cfb398bcdfaa9f4d43a04a1619e775c5946e Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 5 May 2025 09:04:44 +0200 Subject: [PATCH 014/160] Compilation fix for 4.36M2 changes in NLS API See https://github.com/eclipse-equinox/equinox/pull/936 NLS changed signature from bind(String, Object[]) to bind(String, Object...) which should be binary compatible. Change-Id: I595403b3b79faa7f2d0a88b22b033267843fdb0c --- .../src/org/eclipse/egit/core/internal/GitURI.java | 6 +++--- .../eclipse/egit/ui/internal/dialogs/CompareTreeView.java | 2 +- .../revision/GitCompareFileRevisionEditorInput.java | 2 +- .../eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java index 774e3e5ccc..429b6aa618 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/GitURI.java @@ -61,7 +61,7 @@ public GitURI(URI uri) { if (indexOfSemicolon < 0) { throw new IllegalArgumentException( NLS.bind(CoreText.GitURI_InvalidSCMURL, - new String[] { uri.toString() })); + new Object[] { uri.toString() })); } if (ssp.startsWith(SCHEME_GIT)) { URIish r = new URIish(ssp.substring( @@ -90,11 +90,11 @@ public GitURI(URI uri) { } throw new IllegalArgumentException(NLS.bind( CoreText.GitURI_InvalidSCMURL, - new String[] { uri.toString() })); + new Object[] { uri.toString() })); } catch (URISyntaxException e) { Activator.logError(e.getMessage(), e); throw new IllegalArgumentException(NLS.bind( - CoreText.GitURI_InvalidURI, new String[] { uri.toString(), + CoreText.GitURI_InvalidURI, new Object[] { uri.toString(), e.getMessage() })); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java index 85ec352f01..46f97f05e6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java @@ -444,7 +444,7 @@ private void updateControls() { else setContentDescription(NLS.bind( UIText.CompareTreeView_ComparingTwoVersionDescription, - new String[] { name, + new Object[] { name, CompareUtils.truncatedRevision(baseVersion), getCompareVersionText() })); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java index f847e0650e..27a12829ea 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java @@ -429,7 +429,7 @@ protected ICompareInput prepareCompareInput(IProgressMonitor monitor) getCompareConfiguration().setRightEditable(isRightEditable(input)); ensureContentsCached(getLeftRevision(), getRightRevision(), getAncestorRevision(), monitor); initLabels(input); - setTitle(NLS.bind(UIText.GitCompareFileRevisionEditorInput_CompareInputTitle, new String[] { input.getName() })); + setTitle(NLS.bind(UIText.GitCompareFileRevisionEditorInput_CompareInputTitle, new Object[] { input.getName() })); // The compare editor (Structure Compare) will show the diff filenames // with their project relative path. So, no need to also show directory entries. diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java index 1960341f16..e10fc21e75 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java @@ -609,7 +609,7 @@ protected void updateControls() { if (new File(parent, ".project").exists()) { //$NON-NLS-1$ setErrorMessage(NLS .bind(UIText.ExistingOrNewPage_NestedProjectErrorMessage, - new String[] { prj.getName(), + new Object[] { prj.getName(), targetTest.getPath(), parent.getPath() })); break; From 675d14bd5e451312f237c4d0e20a5e4f237e8e52 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 7 May 2025 09:08:39 +0200 Subject: [PATCH 015/160] EGit v7.3.0.202505070700-m2 Change-Id: I5846702a545f0a1e1997f796c83150d0e9c8c8f0 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6c436a5b6c..6a42b5621c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 0415372cc8..7f72412f8c 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3862385cee..32147a49ab 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 a9f45e0b9b..b9bb7a0c93 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 83943e25aa..75f93ae14b 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 baab28be80..6cfbb86936 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 4e17d082d1..d160dc1333 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 cbd08df226..e0aecc49e9 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 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 7c63a29500..93677bf003 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 943caee2a6..92f32aee92 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 e02e6b7ee4..f463f674ec 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 6325e4159e..12d5578fb3 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index c295b1fd1e..bdc7267186 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2e4eabb3b..a80e51cc40 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 062c6b0ba8..f320585d3b 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index b47d2b0e2a..3f482e9b27 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index da561bec65..8d17dce9d6 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9ff6eea2d1..e592a198e7 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 55adfe614e..9e6ca1829c 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bdb322c7db..5cc894f024 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 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 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 index 29fefdf5b8..eb7e98a02d 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f3882031e2..ad0a7eb4e8 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a2846aaffe..15645aa9a9 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505070700-m2 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 69649b629a..75bffa4469 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 832a3fb650..778ad1bda2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0-SNAPSHOT + 7.3.0.202505070700-m2 4.0.12 17 3.40.0 From 292790ad9ea0f087fdaa58db6b1f10472f8b0d41 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 7 May 2025 15:17:51 +0200 Subject: [PATCH 016/160] Prepare 7.3.0-SNAPSHOT builds Change-Id: Ib6c3b0ea9e1b4e4147ece3eef61c0a4c5245ce0b --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6a42b5621c..6c436a5b6c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-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 7f72412f8c..0415372cc8 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 32147a49ab..3862385cee 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 - 7.3.0.202505070700-m2 + 7.3.0-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 b9bb7a0c93..a9f45e0b9b 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 75f93ae14b..83943e25aa 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 - 7.3.0.202505070700-m2 + 7.3.0-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 6cfbb86936..baab28be80 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d160dc1333..4e17d082d1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-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 e0aecc49e9..cbd08df226 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 93677bf003..7c63a29500 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 92f32aee92..943caee2a6 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 - 7.3.0.202505070700-m2 + 7.3.0-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 f463f674ec..e02e6b7ee4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 12d5578fb3..6325e4159e 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 - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index bdc7267186..c295b1fd1e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index a80e51cc40..c2e4eabb3b 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 - 7.3.0.202505070700-m2 + 7.3.0-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 f320585d3b..062c6b0ba8 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 3f482e9b27..b47d2b0e2a 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8d17dce9d6..da561bec65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e592a198e7..9ff6eea2d1 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 - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 9e6ca1829c..55adfe614e 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 5cc894f024..bdb322c7db 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 - 7.3.0.202505070700-m2 + 7.3.0-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 index eb7e98a02d..29fefdf5b8 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index ad0a7eb4e8..f3882031e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 15645aa9a9..a2846aaffe 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: 7.3.0.202505070700-m2 +Bundle-Version: 7.3.0.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 75bffa4469..69649b629a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 778ad1bda2..832a3fb650 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0.202505070700-m2 + 7.3.0-SNAPSHOT 4.0.12 17 3.40.0 From 76fa58153b830b9472113473b12e4f9223906415 Mon Sep 17 00:00:00 2001 From: Aleksandar Kurtakov Date: Fri, 9 May 2025 09:56:58 +0300 Subject: [PATCH 017/160] Fix multi dir project imports Fixes https://github.com/eclipse-egit/egit/issues/89. Bug: egit-89 Change-Id: Ic907b1532b406242757c5047c57e4838565b8e91 --- .../egit/core/internal/ProjectReferenceImporter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java index aac34996c4..780dc56001 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2011, 2015 Robin Stocker + * Copyright (C) 2011, 2025 Robin Stocker * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -140,9 +140,10 @@ public List run(IProgressMonitor monitor) throws TeamException { private static void checkoutBranchIfNecessary( ProjectReference projectReference, IProgressMonitor monitor) throws TeamException { - + String projectName = new Path(projectReference.getProjectDir()) + .lastSegment(); IProject projectInWorkspace = ResourcesPlugin.getWorkspace().getRoot() - .getProject(projectReference.getProjectDir()); + .getProject(projectName); if (projectInWorkspace != null) { RepositoryMapping mapping = RepositoryMapping From 214ffe4e14516de83b353533df7012934f6a1fb8 Mon Sep 17 00:00:00 2001 From: Stephan Wahlbrink Date: Wed, 12 Mar 2025 17:24:55 +0100 Subject: [PATCH 018/160] Extract impl of IMenuCreator from DropDownMenuAction Separate IMenuCreator.dispose() and IWorkbenchAction.dispose(). These two dispose() methods have different semantics, and calling IMenuCreator.dispose() must only dispose of the created menus, but must not dispose of the action! Bug: egit-85 Change-Id: I59cbde89e0ebbecf194643588ea2916af296df99 --- .../components/DropDownMenuAction.java | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/DropDownMenuAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/DropDownMenuAction.java index b65c3ef1ca..bdc8059950 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/DropDownMenuAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/DropDownMenuAction.java @@ -33,14 +33,49 @@ * {@link #runWithEvent(Event)} or {@link #run()}. */ public abstract class DropDownMenuAction extends Action - implements IWorkbenchAction, IMenuCreator { + implements IWorkbenchAction { - private Menu controlMenu; + private class MenuCreator implements IMenuCreator { - private Menu subMenu; + private Menu controlMenu; + + private Menu subMenu; + + private Menu dispose(Menu m) { + if (m != null) { + if (!m.isDisposed()) { + m.dispose(); + } + } + return null; + } + + @Override + public Menu getMenu(Menu parent) { + subMenu = dispose(subMenu); + subMenu = fillMenu(new Menu(parent)); + return subMenu; + } + + @Override + public Menu getMenu(Control parent) { + controlMenu = dispose(controlMenu); + controlMenu = fillMenu(new Menu(parent)); + return controlMenu; + } + + @Override + public void dispose() { + controlMenu = dispose(controlMenu); + subMenu = dispose(subMenu); + } + + } private boolean showMenu; + private IMenuCreator menuCreator = new MenuCreator(); + /** * Creates a new {@link DropDownMenuAction}. * @@ -78,7 +113,7 @@ public void runWithEvent(Event event) { @Override public IMenuCreator getMenuCreator() { - return this; + return menuCreator; } private Menu fillMenu(Menu m) { @@ -88,29 +123,6 @@ private Menu fillMenu(Menu m) { return m; } - private Menu dispose(Menu m) { - if (m != null) { - if (!m.isDisposed()) { - m.dispose(); - } - } - return null; - } - - @Override - public Menu getMenu(Menu parent) { - subMenu = dispose(subMenu); - subMenu = fillMenu(new Menu(parent)); - return subMenu; - } - - @Override - public Menu getMenu(Control parent) { - controlMenu = dispose(controlMenu); - controlMenu = fillMenu(new Menu(parent)); - return controlMenu; - } - /** * Obtains the items to display in the drop-down menu. Might be action * contributions or separators. @@ -121,8 +133,7 @@ public Menu getMenu(Control parent) { @Override public void dispose() { - controlMenu = dispose(controlMenu); - subMenu = dispose(subMenu); + menuCreator.dispose(); } } From bd9874c94f98b0a7438f741cd3682c123140b2be Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Tue, 20 May 2025 16:32:45 +0200 Subject: [PATCH 019/160] Improve empty repositories view layout This commit adjusts the grid layout in RepositoriesView when no repositories are added yet to address an issue in Windows with monitor specific scaling active. Contributes to https://github.com/eclipse-platform/eclipse.platform.swt/issues/2003 Change-Id: Ib46ea2e6ffe7bd59fe990e67485925d57a21b085 --- .../eclipse/egit/ui/internal/repository/RepositoriesView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java index b8c6cbad8b..e40a21d77e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java @@ -333,8 +333,8 @@ public void menuAboutToShow(IMenuManager m) { Composite optionsArea = new Composite(infoArea, SWT.NONE); optionsArea.setMenu(menu); GridLayoutFactory.swtDefaults().numColumns(2).applyTo(optionsArea); - GridDataFactory.swtDefaults().indent(5, 0).grab(true, true) - .applyTo(optionsArea); + GridDataFactory.swtDefaults().indent(5, 0).align(SWT.FILL, SWT.CENTER) + .grab(true, true).applyTo(optionsArea); final FormToolkit toolkit = new FormToolkit(emptyArea.getDisplay()); emptyArea.addDisposeListener(new DisposeListener() { From aa9ebce7adf3199ff8f39c4f4eb5b5af90bf9114 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 May 2025 13:58:02 +0200 Subject: [PATCH 020/160] EGit v7.3.0.202505211123-m3 Change-Id: I55381f7e493e83a2460e8a814109db0c6ad06226 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6c436a5b6c..cbd732c475 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 0415372cc8..a4ba39b12b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3862385cee..90b5e42dfa 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 a9f45e0b9b..b145bbd39c 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 83943e25aa..d3ac9ace38 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 baab28be80..ab414fcb32 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 4e17d082d1..a251f6f481 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 cbd08df226..a017201780 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 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 7c63a29500..6a25642136 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 943caee2a6..504b12ff8e 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 e02e6b7ee4..03815513ac 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 6325e4159e..62aa940ad9 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index c295b1fd1e..95e2519be1 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2e4eabb3b..bf616f31e9 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 062c6b0ba8..892ac3e188 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index b47d2b0e2a..25c2021834 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index da561bec65..7c8e5079e3 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9ff6eea2d1..cb4286d000 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 55adfe614e..e704acf38b 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bdb322c7db..b45f65df8b 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 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 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 index 29fefdf5b8..38429281f5 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f3882031e2..6fe4536e38 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a2846aaffe..b88f7456f2 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505211123-m3 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 69649b629a..cec0d24d60 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 832a3fb650..a5994ba93e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0-SNAPSHOT + 7.3.0.202505211123-m3 4.0.12 17 3.40.0 From 6f518d597cf49cc8ae617236478ff5c4dd17f320 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 May 2025 16:37:58 +0200 Subject: [PATCH 021/160] Prepare 7.3.0-SNAPSHOT builds Change-Id: I7cd2449d30593bb7d3ba34a2a6a21e38ac6461d8 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index cbd732c475..6c436a5b6c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-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 a4ba39b12b..0415372cc8 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 90b5e42dfa..3862385cee 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 - 7.3.0.202505211123-m3 + 7.3.0-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 b145bbd39c..a9f45e0b9b 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index d3ac9ace38..83943e25aa 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 - 7.3.0.202505211123-m3 + 7.3.0-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 ab414fcb32..baab28be80 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index a251f6f481..4e17d082d1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-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 a017201780..cbd08df226 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 6a25642136..7c63a29500 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 504b12ff8e..943caee2a6 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 - 7.3.0.202505211123-m3 + 7.3.0-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 03815513ac..e02e6b7ee4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 62aa940ad9..6325e4159e 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 - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 95e2519be1..c295b1fd1e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bf616f31e9..c2e4eabb3b 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 - 7.3.0.202505211123-m3 + 7.3.0-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 892ac3e188..062c6b0ba8 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 25c2021834..b47d2b0e2a 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 7c8e5079e3..da561bec65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index cb4286d000..9ff6eea2d1 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 - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index e704acf38b..55adfe614e 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index b45f65df8b..bdb322c7db 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 - 7.3.0.202505211123-m3 + 7.3.0-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 index 38429281f5..29fefdf5b8 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 6fe4536e38..f3882031e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index b88f7456f2..a2846aaffe 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: 7.3.0.202505211123-m3 +Bundle-Version: 7.3.0.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 cec0d24d60..69649b629a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index a5994ba93e..832a3fb650 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0.202505211123-m3 + 7.3.0-SNAPSHOT 4.0.12 17 3.40.0 From c2dde3a8df54558f898b16070114c2cb11ef450e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 May 2025 22:48:30 +0200 Subject: [PATCH 022/160] Update jgit and orbit dependencies update jgit dependencies - gson to 2.13.1 - jetty to 12.0.21 - mockito to 5.18.0 update orbit dependencies - org.apache.batik to 1.19.0.v20250506-1400 - org.apache.xmlgraphics to 2.11.0.v20250506-1400 - org.eclipse.orbit.maven.lucene-10.feature.jar to 4.36.0.v20250501-1000 Change-Id: Iff09caeb3969ec508b7827a4556f97a546381a78 --- org.eclipse.egit.target/egit-4.26.target | 22 ++++++------ org.eclipse.egit.target/egit-4.27.target | 22 ++++++------ org.eclipse.egit.target/egit-4.28.target | 22 ++++++------ org.eclipse.egit.target/egit-4.29.target | 22 ++++++------ org.eclipse.egit.target/egit-4.30.target | 22 ++++++------ org.eclipse.egit.target/egit-4.31.target | 22 ++++++------ org.eclipse.egit.target/egit-4.32.target | 22 ++++++------ org.eclipse.egit.target/egit-4.33.target | 22 ++++++------ org.eclipse.egit.target/egit-4.34.target | 22 ++++++------ org.eclipse.egit.target/egit-4.35.target | 22 ++++++------ org.eclipse.egit.target/egit-4.36.target | 34 +++++++++---------- .../maven/dependencies.tpd | 20 +++++------ org.eclipse.egit.target/orbit/orbit-4.36.tpd | 12 +++---- 13 files changed, 143 insertions(+), 143 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target index cd42a0d912..4aa40a10f1 100644 --- a/org.eclipse.egit.target/egit-4.26.target +++ b/org.eclipse.egit.target/egit-4.26.target @@ -1,7 +1,7 @@ - + @@ -156,7 +156,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -182,49 +182,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -250,7 +250,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target index 111d9c431e..92df720d31 100644 --- a/org.eclipse.egit.target/egit-4.27.target +++ b/org.eclipse.egit.target/egit-4.27.target @@ -1,7 +1,7 @@ - + @@ -157,7 +157,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -183,49 +183,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -251,7 +251,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target index e512219636..84f1419848 100644 --- a/org.eclipse.egit.target/egit-4.28.target +++ b/org.eclipse.egit.target/egit-4.28.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -254,7 +254,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target index ce2aa165bb..94ad663b07 100644 --- a/org.eclipse.egit.target/egit-4.29.target +++ b/org.eclipse.egit.target/egit-4.29.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -186,49 +186,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -254,7 +254,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target index 9b04c9c548..7f7586b491 100644 --- a/org.eclipse.egit.target/egit-4.30.target +++ b/org.eclipse.egit.target/egit-4.30.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target index cd32e1da6e..a28b955743 100644 --- a/org.eclipse.egit.target/egit-4.31.target +++ b/org.eclipse.egit.target/egit-4.31.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target index 8a3e891674..a24690680b 100644 --- a/org.eclipse.egit.target/egit-4.32.target +++ b/org.eclipse.egit.target/egit-4.32.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target index 58e7a8eb6c..cbd6442d3b 100644 --- a/org.eclipse.egit.target/egit-4.33.target +++ b/org.eclipse.egit.target/egit-4.33.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target index 625b1006f2..ad9f6458c0 100644 --- a/org.eclipse.egit.target/egit-4.34.target +++ b/org.eclipse.egit.target/egit-4.34.target @@ -1,7 +1,7 @@ - + @@ -161,7 +161,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -187,49 +187,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -255,7 +255,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target index 253b51bf92..f8ac6533a4 100644 --- a/org.eclipse.egit.target/egit-4.35.target +++ b/org.eclipse.egit.target/egit-4.35.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -264,7 +264,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 6869a2b78d..3afe9948b6 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -29,19 +29,19 @@ - - - - + + + + - + - + @@ -170,7 +170,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar @@ -196,49 +196,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.19 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.19 + 12.0.21 jar @@ -264,7 +264,7 @@ com.google.code.gson gson - 2.13.0 + 2.13.1 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index e0167bc080..eb14500314 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -114,7 +114,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.13.0" + version = "2.13.1" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.17.0" + version = "5.18.0" } } diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index 257b24aa7f..bbb6aca48a 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -18,19 +18,19 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 jakarta.xml.bind-api.source [2.3.3,2.3.3] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.batik.constants [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.css [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.i18n [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.util [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.commons.logging [1.2.0,1.2.0] org.apache.commons.logging.source [1.2.0,1.2.0] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] org.apache.httpcomponents.httpcore [4.4.16,4.4.16] org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.apache.xmlgraphics [2.10.0.v20241009-1200,2.10.0.v20241009-1200] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0.v20250410-1000,4.36.0.v20250410-1000] + org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0.v20250501-1000,4.36.0.v20250501-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] From b2a03a4cbd08e4a95a67d2d9a42de203b394a350 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 24 May 2025 22:15:42 +0200 Subject: [PATCH 023/160] CommitMessageComponent: improve empty message detection Commit 03b84e25 had already handled the special case of a message containing only the Gerrit Change-Id footer. However, the same problem can also occur with other footers: if a message contains only a few blank lines and footers, clean-up will move the footers to the start, at which point they cease to be footers, and the commit message would be considered non-empty. Improve this by checking first for footer lines on the non-cleaned text and get the first footer line. Then clean the message. If now the first line of the commit message is that footer line (and wasn't before), this case occurred. Consider the commit message empty in that case. Change-Id: Ia64e11d7b38df058d6a0f5db277ec5ceb9370267 --- .../dialogs/CommitMessageComponent.java | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java index 997084329f..ddf317c69d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java @@ -1,6 +1,5 @@ /******************************************************************************* * Copyright (C) 2007, Dave Watson - * Copyright (C) 2007, Robin Rosenberg * Copyright (C) 2007, Robin Rosenberg * Copyright (C) 2008, Robin Rosenberg * Copyright (C) 2007, Shawn O. Pearce @@ -10,6 +9,7 @@ * Copyright (C) 2012, 2013 Robin Stocker * Copyright (C) 2014 IBM Corporation (Daniel Megert ) * Copyright (C) 2015 SAP SE (Christian Georgi ) + * Copyright (C) 2025 Thomas Wolf and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -24,7 +24,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.regex.Pattern; import org.eclipse.egit.core.internal.Utils; import org.eclipse.egit.core.internal.gerrit.GerritUtil; @@ -87,8 +86,6 @@ */ public class CommitMessageComponent { - private static final Pattern EMPTY_GERRIT_MESSAGE = Pattern - .compile("^(?:\\h*\\n)*Change-Id: I[0-9a-fA-F]{40}\\h*(?:\\n|$)"); //$NON-NLS-1$ /** * Status provider for whether a commit operation should be enabled or not */ @@ -623,16 +620,52 @@ static String formatIssuesInCommitMessage(String message) { public boolean checkCommitInfo() { updateStateFromUI(); - String rawText = commitText.getText(); - rawText = Utils.normalizeLineEndings(rawText); + String rawText = Utils.normalizeLineEndings(commitText.getText()); + int rawFooterOffset = CommonUtils.getFooterOffset(rawText); + String firstFooterLine = null; + if (rawFooterOffset > 0) { + int rawFooterLineEnd = rawText.indexOf('\n', rawFooterOffset + 1); + if (rawFooterLineEnd < 0) { + rawFooterLineEnd = rawText.length(); + } + firstFooterLine = rawText.substring(rawFooterOffset, + rawFooterLineEnd).stripTrailing(); + if (rawText.startsWith(firstFooterLine)) { + // Commit message title looks like the existing first footer + // line: the message definitely is not empty, so we don't have + // to check against this footer later on. + firstFooterLine = null; + } else { + int firstLineEnd = rawText.indexOf('\n'); + if (firstLineEnd > 0) { + String firstLine = rawText.substring(0, firstLineEnd) + .stripTrailing(); + if (!firstLine.isEmpty() + && firstFooterLine.startsWith(firstLine)) { + // Same reasoning as above. + firstFooterLine = null; + } + } + } + } + // Get the fully cleaned commit message + String text = getCommitMessage(); boolean isEmpty = false; - if (EMPTY_GERRIT_MESSAGE.matcher(rawText).matches()) { - isEmpty = true; + int footer = CommonUtils.getFooterOffset(text); + if (firstFooterLine != null && footer < 0) { + // If we had only comments and empty lines above the footers, the + // first footer is now at the start of the message. + // That's an empty message! + int firstLineEnd = text.indexOf('\n'); + if (firstLineEnd < 0) { + firstLineEnd = text.length(); + } + if (firstLineEnd <= firstFooterLine.length()) { + isEmpty = firstFooterLine + .startsWith(text.substring(0, firstLineEnd)); + } } else { - // Get the fully cleaned commit message - String text = getCommitMessage(); // Strip footers - int footer = CommonUtils.getFooterOffset(text); if (footer >= 0) { text = text.substring(0, footer); } From 0836a7e0585859302f90bc8fde2c16f64439c803 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 May 2025 16:24:24 +0200 Subject: [PATCH 024/160] EGit v7.3.0.202505281347-rc1 Change-Id: I449427a754f1c379997dcc9d3cd4394b036525e5 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6c436a5b6c..ac321733a1 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 0415372cc8..3c2db5255d 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3862385cee..ad8316a4d7 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 a9f45e0b9b..2af0363303 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 83943e25aa..42275901bd 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 baab28be80..8c23ef83b8 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 4e17d082d1..43c0af823e 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 cbd08df226..5a6b978b3f 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 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 7c63a29500..bf1178598c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 943caee2a6..ec91bec2cf 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 e02e6b7ee4..d711b0bea5 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 6325e4159e..f770d3397d 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index c295b1fd1e..638aa74dd9 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2e4eabb3b..b86f7bb0af 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 062c6b0ba8..4751d3507e 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index b47d2b0e2a..55c54d9d8d 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index da561bec65..1f988a7fe4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9ff6eea2d1..385ef60ba2 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 55adfe614e..0a4f44b9b8 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bdb322c7db..2b249f9c6b 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 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 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 index 29fefdf5b8..127300bd84 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f3882031e2..85e67f6fad 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a2846aaffe..9103149e99 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202505281347-rc1 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 69649b629a..a27aa4abd9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 832a3fb650..b8cbd5126b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0-SNAPSHOT + 7.3.0.202505281347-rc1 4.0.12 17 3.40.0 From fccacd87aed6ce42586ccef5bfec88e039658721 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 29 May 2025 17:07:49 +0200 Subject: [PATCH 025/160] Prepare 7.3.0-SNAPSHOT builds Change-Id: I41e0adc343c09f92b3935cc77a057a060aa9a9bf --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index ac321733a1..6c436a5b6c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-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 3c2db5255d..0415372cc8 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index ad8316a4d7..3862385cee 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 - 7.3.0.202505281347-rc1 + 7.3.0-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 2af0363303..a9f45e0b9b 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 42275901bd..83943e25aa 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 - 7.3.0.202505281347-rc1 + 7.3.0-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 8c23ef83b8..baab28be80 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 43c0af823e..4e17d082d1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-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 5a6b978b3f..cbd08df226 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index bf1178598c..7c63a29500 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index ec91bec2cf..943caee2a6 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 - 7.3.0.202505281347-rc1 + 7.3.0-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 d711b0bea5..e02e6b7ee4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index f770d3397d..6325e4159e 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 - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 638aa74dd9..c295b1fd1e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index b86f7bb0af..c2e4eabb3b 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 - 7.3.0.202505281347-rc1 + 7.3.0-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 4751d3507e..062c6b0ba8 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 55c54d9d8d..b47d2b0e2a 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 1f988a7fe4..da561bec65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 385ef60ba2..9ff6eea2d1 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 - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0a4f44b9b8..55adfe614e 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 2b249f9c6b..bdb322c7db 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 - 7.3.0.202505281347-rc1 + 7.3.0-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 index 127300bd84..29fefdf5b8 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 85e67f6fad..f3882031e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 9103149e99..a2846aaffe 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: 7.3.0.202505281347-rc1 +Bundle-Version: 7.3.0.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 a27aa4abd9..69649b629a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index b8cbd5126b..832a3fb650 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0.202505281347-rc1 + 7.3.0-SNAPSHOT 4.0.12 17 3.40.0 From cd0a599ba6180c21bb029fce7754361724489fb1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 29 May 2025 20:50:09 +0200 Subject: [PATCH 026/160] Add missing IDE runtime dependencies to 4.36 target platform EGit couldn't be started in debug IDE anymore. Adding these dependencies fixes validation errors raised when starting EGit in debug IDE. Change-Id: Ia3c1b849f145e0de076c0f73e1c9046310c38f12 --- org.eclipse.egit.target/egit-4.36.target | 38 ++++++++++++++++--- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 35 ++++++++++++++--- .../releasetrain/4.36-2025-06.tpd | 1 + 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 3afe9948b6..df38b02467 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -14,19 +14,33 @@ + + + - + - + - - + + + + + + + + + + + + + @@ -39,9 +53,16 @@ + + + + + - + + + @@ -59,6 +80,10 @@ + + + + @@ -88,6 +113,7 @@ + diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index bbb6aca48a..e147087d35 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -3,19 +3,33 @@ target "orbit-4.36" with source configurePhase // when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06" { + aQute.libg [7.1.0.202411251545,7.1.0.202411251545] + bndtools.api [7.1.0.202411251545,7.1.0.202411251545] com.ibm.icu [77.1.0,77.1.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [1.7.2,1.7.2] jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] + jakarta.annotation-api [1.3.5,1.3.5] jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.2,4.0.2] + junit-jupiter-api [5.12.2,5.12.2] + junit-jupiter-engine [5.12.2,5.12.2] + junit-jupiter-migrationsupport [5.12.2,5.12.2] + junit-jupiter-params [5.12.2,5.12.2] + junit-platform-commons [1.12.2,1.12.2] + junit-platform-engine [1.12.2,1.12.2] + junit-platform-launcher [1.12.2,1.12.2] + junit-platform-runner [1.12.2,1.12.2] + junit-platform-suite-api [1.12.2,1.12.2] + junit-platform-suite-commons [1.12.2,1.12.2] + junit-platform-suite-engine [1.12.2,1.12.2] + junit-vintage-engine [5.12.2,5.12.2] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] @@ -28,9 +42,16 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] org.apache.httpcomponents.httpcore [4.4.16,4.4.16] org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.bndtools.headless.build.manager [7.1.0.202411251545,7.1.0.202411251545] + org.bndtools.templating [7.1.0.202411251545,7.1.0.202411251545] + org.bndtools.versioncontrol.ignores.manager [7.1.0.202411251545,7.1.0.202411251545] + org.mortbay.jasper.apache-el [9.0.102,9.0.102] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene-10.feature.jar [4.36.0.v20250501-1000,4.36.0.v20250501-1000] + org.apache.lucene.analysis-common [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] @@ -48,6 +69,10 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.objectweb.asm.util [9.8.0, 9.8.0] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] } diff --git a/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd index 57b1d0617f..4d5e280fdf 100644 --- a/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd +++ b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd @@ -26,6 +26,7 @@ location "https://download.eclipse.org/releases/2025-06" { org.eclipse.jetty.ee8.servlet lazy org.eclipse.sdk.ide lazy org.eclipse.search.core lazy + org.eclipse.swt.tools.base lazy org.osgi.service.http.whiteboard lazy org.osgi.service.repository lazy org.sat4j.core lazy From fd5851ef65501cb8f71dfd57e5aec38ac141092d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Jun 2025 11:15:01 +0200 Subject: [PATCH 027/160] Update maven plugins - tycho to 4.0.13 - spotbugs-maven-plugin to 4.9.3.0 Change-Id: I88d0461c1315cf560f389c7b1ce8597e8f6a4345 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 832a3fb650..280d0888ac 100644 --- a/pom.xml +++ b/pom.xml @@ -63,10 +63,10 @@ 3.9.0 7.3.0-SNAPSHOT - 4.0.12 + 4.0.13 17 3.40.0 - 4.9.2.0 + 4.9.3.0 file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository https://download.eclipse.org/cbi/updates/license /home/data/httpd/download-staging.priv/egit From 5d2e8aecf425b98d07aa5a242847c7348d803da0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Jun 2025 16:23:14 +0200 Subject: [PATCH 028/160] EGit v7.3.0.202506031305-r Change-Id: I9934628af5763ceaa55c25de526c18d663425699 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6c436a5b6c..605e221d03 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 0415372cc8..30d5c5879f 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3862385cee..10e85d758b 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 a9f45e0b9b..fcbd0ffe77 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 83943e25aa..dcea96fa57 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 baab28be80..8555838a6a 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 4e17d082d1..e943b6e6be 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 cbd08df226..124c0c6ee1 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r 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 7c63a29500..3e125f8cf1 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 943caee2a6..d3443c32e3 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 e02e6b7ee4..6cb19a1186 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 6325e4159e..d7c8c550ec 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index c295b1fd1e..5226bd1d9a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index c2e4eabb3b..21561716eb 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 062c6b0ba8..4a9b8b6d7e 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index b47d2b0e2a..d176946dbd 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index da561bec65..a50cba043f 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9ff6eea2d1..ef6f784751 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 55adfe614e..af534535d6 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bdb322c7db..b638560839 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 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 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 index 29fefdf5b8..ccdec51697 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index f3882031e2..597115dec7 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a2846aaffe..a14a1bdf23 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: 7.3.0.qualifier +Bundle-Version: 7.3.0.202506031305-r 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 69649b629a..7f4fa5f0ca 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r org.eclipse.egit diff --git a/pom.xml b/pom.xml index 280d0888ac..e134faa683 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0-SNAPSHOT + 7.3.0.202506031305-r 4.0.13 17 3.40.0 From 69f9ffc3e28b9111f346fc4404fb6d864069d6d7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Jun 2025 22:42:20 +0200 Subject: [PATCH 029/160] Prepare 7.3.1-SNAPSHOT builds Change-Id: I5de5bce016366bbb648bf8f0370de0a562f8b5b9 --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++---- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 214 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 288 insertions(+), 288 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 605e221d03..68fd2248d6 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.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 30d5c5879f..ded171101e 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.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="[7.3.0,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)" +Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.egit.core.test;version="7.3.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="7.3.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 10e85d758b..ed74d60038 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 - 7.3.0.202506031305-r + 7.3.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 fcbd0ffe77..bae44fa525 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.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="[7.3.0,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.1,7.4.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="[7.3.0,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.egit.core;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.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 dcea96fa57..2658e8ed9b 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 - 7.3.0.202506031305-r + 7.3.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 8555838a6a..270f0376ca 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.3.1000,2.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)" -Export-Package: org.eclipse.egit.core;version="7.3.0"; +Export-Package: org.eclipse.egit.core;version="7.3.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="7.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.3.0"; + org.eclipse.egit.core.attributes;version="7.3.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.3.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.3.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.3.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="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.3.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.3.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.3.0"; + org.eclipse.egit.core.internal.credentials;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.3.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.3.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.3.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.3.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.3.0", - org.eclipse.egit.core.settings;version="7.3.0", - org.eclipse.egit.core.storage;version="7.3.0"; + org.eclipse.egit.core.project;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.3.1", + org.eclipse.egit.core.settings;version="7.3.1", + org.eclipse.egit.core.storage;version="7.3.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.3.0" + org.eclipse.egit.core.synchronize;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.3.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.3.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", - org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.events;version="[7.3.0,7.4.0)", - org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.signing.ssh;version="[7.3.0,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", - org.eclipse.jgit.submodule;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.sshd;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)" + org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.1,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.events;version="[7.3.1,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.1,7.4.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.signing.ssh;version="[7.3.1,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", + org.eclipse.jgit.submodule;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.sshd;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.1,7.4.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 e943b6e6be..9f2e700df8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.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 124c0c6ee1..c2a190cb48 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.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 3e125f8cf1..05b155e8cc 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.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 d3443c32e3..671756a845 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 - 7.3.0.202506031305-r + 7.3.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 6cb19a1186..f9c65c618d 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", +Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.1,7.4.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="[7.3.0,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.1,7.4.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 d7c8c550ec..4ee0875c16 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 - 7.3.0.202506031305-r + 7.3.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 index 5226bd1d9a..0333f38851 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.settings;version="[7.3.0,7.4.0)", - org.eclipse.egit.gitflow;version="[7.3.0,7.4.0)", - org.eclipse.egit.gitflow.op;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.actions;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.branch;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.commit;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.components;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.push;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.3.0,7.4.0)", - org.eclipse.egit.ui.internal.selection;version="[7.3.0,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)" +Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.settings;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow.op;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.actions;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.branch;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.commit;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.components;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.push;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.3.1,7.4.0)", + org.eclipse.egit.ui.internal.selection;version="[7.3.1,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.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="7.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.3.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.3.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.3.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.3.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.3.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.3.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.3.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.3.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.3.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.3.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 21561716eb..0a7ff212ce 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 - 7.3.0.202506031305-r + 7.3.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 4a9b8b6d7e..f188f542c0 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 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="7.3.0"; +Export-Package: org.eclipse.egit.gitflow;version="7.3.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="7.3.0"; + org.eclipse.egit.gitflow.op;version="7.3.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="7.3.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.0,7.4.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.1,7.4.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index d176946dbd..610b5d61bc 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index a50cba043f..e62a21127d 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.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 ef6f784751..ebcc2e846d 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 - 7.3.0.202506031305-r + 7.3.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index af534535d6..0a79852bdd 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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="[7.3.0,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.3.1,7.4.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="[7.3.0,7.4.0)", - org.eclipse.egit.gitflow.op;version="[7.3.0,7.4.0)", - org.eclipse.egit.gitflow.ui;version="[7.3.0,7.4.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", - org.eclipse.jgit.junit.http;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.egit.gitflow;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow.op;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow.ui;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", + org.eclipse.jgit.junit.http;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.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 b638560839..19c2242185 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 - 7.3.0.202506031305-r + 7.3.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 index ccdec51697..26b092a62d 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,113 +35,113 @@ 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-17 -Import-Package: org.eclipse.egit.core;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.attributes;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.credentials;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.info;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.credentials;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.efs;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.hosts;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.info;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.job;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.rebase;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.signing;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.storage;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.internal.util;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.settings;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.synchronize;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.3.0,7.4.0)", - org.eclipse.egit.core.util;version="[7.3.0,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api;version="[7.3.0,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", - org.eclipse.jgit.blame;version="[7.3.0,7.4.0)", - org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", - org.eclipse.jgit.events;version="[7.3.0,7.4.0)", - org.eclipse.jgit.ignore;version="[7.3.0,7.4.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", - org.eclipse.jgit.lib.internal;version="[7.3.0,7.4.0)", - org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", - org.eclipse.jgit.notes;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", - org.eclipse.jgit.submodule;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util;version="[7.3.0,7.4.0)", - org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", +Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.attributes;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.credentials;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.info;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.credentials;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.efs;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.hosts;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.info;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.rebase;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.signing;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.storage;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.internal.util;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.settings;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.synchronize;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.3.1,7.4.0)", + org.eclipse.egit.core.util;version="[7.3.1,7.4.0)", + org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api;version="[7.3.1,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", + org.eclipse.jgit.blame;version="[7.3.1,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.1,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", + org.eclipse.jgit.events;version="[7.3.1,7.4.0)", + org.eclipse.jgit.ignore;version="[7.3.1,7.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", + org.eclipse.jgit.lib.internal;version="[7.3.1,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.1,7.4.0)", + org.eclipse.jgit.notes;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", + org.eclipse.jgit.submodule;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util;version="[7.3.1,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.1,7.4.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.history;version="7.3.0", - org.eclipse.egit.ui.internal;version="7.3.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.3.0";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.history;version="7.3.1", + org.eclipse.egit.ui.internal;version="7.3.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.3.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.3.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 597115dec7..ff6e8119e4 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.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 a14a1bdf23..71174d8a80 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: 7.3.0.202506031305-r +Bundle-Version: 7.3.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 7f4fa5f0ca..a5aebfacde 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index e134faa683..ff9f4d6792 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.0.202506031305-r + 7.3.1-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.0.202506031305-r + 7.3.1-SNAPSHOT 4.0.13 17 3.40.0 From 4bdb744d893f2a1ead3257c1b6d315f1081af207 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Jun 2025 22:46:06 +0200 Subject: [PATCH 030/160] Prepare 7.4.0-SNAPSHOT builds Change-Id: I5695ed9ad170b843ae5027c2b2a5433a170d4a36 --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++---- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 214 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 288 insertions(+), 288 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 68fd2248d6..67d4393412 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-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 ded171101e..06d186e5d0 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.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="[7.3.1,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)" +Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.egit.core.test;version="7.3.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="7.4.0";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 ed74d60038..4c2f6c1946 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 - 7.3.1-SNAPSHOT + 7.4.0-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 bae44fa525..f1ba931305 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.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="[7.3.1,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.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="[7.3.1,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)", + org.eclipse.egit.core;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.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 2658e8ed9b..5d40917360 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 - 7.3.1-SNAPSHOT + 7.4.0-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 270f0376ca..a5d21ec3c4 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.3.1000,2.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)" -Export-Package: org.eclipse.egit.core;version="7.3.1"; +Export-Package: org.eclipse.egit.core;version="7.4.0"; 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="7.3.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.3.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.3.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.3.1"; + org.eclipse.egit.core.attributes;version="7.4.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.4.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.4.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.4.0"; 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="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.3.1";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.3.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.3.1"; + org.eclipse.egit.core.internal.credentials;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.4.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.4.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.4.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.3.1"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.3.1", - org.eclipse.egit.core.settings;version="7.3.1", - org.eclipse.egit.core.storage;version="7.3.1"; + org.eclipse.egit.core.project;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.4.0", + org.eclipse.egit.core.settings;version="7.4.0", + org.eclipse.egit.core.storage;version="7.4.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.3.1" + org.eclipse.egit.core.synchronize;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.4.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", - org.eclipse.jgit.diff;version="[7.3.1,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.events;version="[7.3.1,7.4.0)", - org.eclipse.jgit.internal.storage.file;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lfs;version="[7.3.1,7.4.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.merge;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.signing.ssh;version="[7.3.1,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", - org.eclipse.jgit.submodule;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.http;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.http.apache;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.sshd;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util.io;version="[7.3.1,7.4.0)" + org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", + org.eclipse.jgit.diff;version="[7.4.0,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.events;version="[7.4.0,7.5.0)", + org.eclipse.jgit.internal.storage.file;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lfs;version="[7.4.0,7.5.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.merge;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.signing.ssh;version="[7.4.0,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", + org.eclipse.jgit.submodule;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.http;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.http.apache;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.sshd;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util.io;version="[7.4.0,7.5.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 9f2e700df8..ef21d087ad 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-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 c2a190cb48..3b6fc063fc 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 05b155e8cc..b22f6cfc6c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 671756a845..24a4c4f6be 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 - 7.3.1-SNAPSHOT + 7.4.0-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 f9c65c618d..6d78978c5f 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", +Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.0,7.5.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="[7.3.1,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.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 4ee0875c16..71447b5870 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 - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0333f38851..d017bffb17 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.settings;version="[7.3.1,7.4.0)", - org.eclipse.egit.gitflow;version="[7.3.1,7.4.0)", - org.eclipse.egit.gitflow.op;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.actions;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.branch;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.commit;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.components;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.push;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.3.1,7.4.0)", - org.eclipse.egit.ui.internal.selection;version="[7.3.1,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revplot;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)" +Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.settings;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow.op;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.actions;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.branch;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.commit;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.components;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.push;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.4.0,7.5.0)", + org.eclipse.egit.ui.internal.selection;version="[7.4.0,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revplot;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.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="7.3.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.3.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.3.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.3.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.3.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.3.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.3.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.3.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.3.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.4.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.4.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.4.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.4.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.4.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.4.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 0a7ff212ce..168b783ea2 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 - 7.3.1-SNAPSHOT + 7.4.0-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 f188f542c0..9cb68dc4b1 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-17 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="7.3.1"; +Export-Package: org.eclipse.egit.gitflow;version="7.4.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="7.3.1"; + org.eclipse.egit.gitflow.op;version="7.4.0"; 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="7.3.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.1,7.4.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.0,7.5.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 610b5d61bc..2db4ff2e40 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e62a21127d..e19c338054 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index ebcc2e846d..10d7620ab3 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 - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0a79852bdd..9f0a821769 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 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="[7.3.1,7.4.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.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="[7.3.1,7.4.0)", - org.eclipse.egit.gitflow.op;version="[7.3.1,7.4.0)", - org.eclipse.egit.gitflow.ui;version="[7.3.1,7.4.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", - org.eclipse.jgit.junit;version="[7.3.1,7.4.0)", - org.eclipse.jgit.junit.http;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.resolver;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)", + org.eclipse.egit.gitflow;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow.op;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow.ui;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", + org.eclipse.jgit.junit.http;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.resolver;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.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 19c2242185..881f3b6a6a 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 - 7.3.1-SNAPSHOT + 7.4.0-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 index 26b092a62d..edb4d4ad08 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,113 +35,113 @@ 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-17 -Import-Package: org.eclipse.egit.core;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.attributes;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.credentials;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.info;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.credentials;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.efs;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.hosts;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.info;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.job;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.rebase;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.signing;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.storage;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.internal.util;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.op;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.project;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.settings;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.synchronize;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.3.1,7.4.0)", - org.eclipse.egit.core.util;version="[7.3.1,7.4.0)", - org.eclipse.jgit.annotations;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api;version="[7.3.1,7.4.0)", - org.eclipse.jgit.api.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.attributes;version="[7.3.1,7.4.0)", - org.eclipse.jgit.blame;version="[7.3.1,7.4.0)", - org.eclipse.jgit.diff;version="[7.3.1,7.4.0)", - org.eclipse.jgit.dircache;version="[7.3.1,7.4.0)", - org.eclipse.jgit.errors;version="[7.3.1,7.4.0)", - org.eclipse.jgit.events;version="[7.3.1,7.4.0)", - org.eclipse.jgit.ignore;version="[7.3.1,7.4.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib;version="[7.3.1,7.4.0)", - org.eclipse.jgit.lib.internal;version="[7.3.1,7.4.0)", - org.eclipse.jgit.merge;version="[7.3.1,7.4.0)", - org.eclipse.jgit.notes;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revplot;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.revwalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.storage.file;version="[7.3.1,7.4.0)", - org.eclipse.jgit.submodule;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport;version="[7.3.1,7.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk;version="[7.3.1,7.4.0)", - org.eclipse.jgit.treewalk.filter;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util;version="[7.3.1,7.4.0)", - org.eclipse.jgit.util.io;version="[7.3.1,7.4.0)", +Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.attributes;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.credentials;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.info;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.credentials;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.efs;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.hosts;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.info;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.rebase;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.signing;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.storage;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.internal.util;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.settings;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.synchronize;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.4.0,7.5.0)", + org.eclipse.egit.core.util;version="[7.4.0,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api;version="[7.4.0,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", + org.eclipse.jgit.blame;version="[7.4.0,7.5.0)", + org.eclipse.jgit.diff;version="[7.4.0,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", + org.eclipse.jgit.events;version="[7.4.0,7.5.0)", + org.eclipse.jgit.ignore;version="[7.4.0,7.5.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", + org.eclipse.jgit.lib.internal;version="[7.4.0,7.5.0)", + org.eclipse.jgit.merge;version="[7.4.0,7.5.0)", + org.eclipse.jgit.notes;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revplot;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", + org.eclipse.jgit.submodule;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util;version="[7.4.0,7.5.0)", + org.eclipse.jgit.util.io;version="[7.4.0,7.5.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.history;version="7.3.1", - org.eclipse.egit.ui.internal;version="7.3.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.3.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.3.1";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.history;version="7.4.0", + org.eclipse.egit.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.4.0";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 ff6e8119e4..05e3e1ec8a 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 71174d8a80..f9a057cebb 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: 7.3.1.qualifier +Bundle-Version: 7.4.0.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 a5aebfacde..b85e330d52 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index ff9f4d6792..37996d0def 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.3.1-SNAPSHOT + 7.4.0-SNAPSHOT 4.0.13 17 3.40.0 From 7a0c48cfc1d20a4bd52f45ac926407b2d9df9a7a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 19 Jun 2025 18:12:51 +0200 Subject: [PATCH 031/160] Update build to use 4.36 target platform - update EGit execution environment to JavaSE-21 required by Eclipse 4.36 (2025-06) - update target platform so that EGit UI tests can run on 4.36 - fix jetty bundles added to egit p2 repository - delete all older target platforms to reduce maintenance overhead Change-Id: I5bb87be6d385b829c5aafc97d3eed675742f5326 --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.repository/category.xml | 4 +- org.eclipse.egit.target/egit-4.26.target | 357 ----------------- org.eclipse.egit.target/egit-4.26.tpd | 7 - org.eclipse.egit.target/egit-4.27.target | 358 ----------------- org.eclipse.egit.target/egit-4.27.tpd | 7 - org.eclipse.egit.target/egit-4.28.target | 361 ----------------- org.eclipse.egit.target/egit-4.28.tpd | 7 - org.eclipse.egit.target/egit-4.29.target | 361 ----------------- org.eclipse.egit.target/egit-4.29.tpd | 7 - org.eclipse.egit.target/egit-4.30.target | 362 ----------------- org.eclipse.egit.target/egit-4.30.tpd | 7 - org.eclipse.egit.target/egit-4.31.target | 362 ----------------- org.eclipse.egit.target/egit-4.31.tpd | 7 - org.eclipse.egit.target/egit-4.32.target | 362 ----------------- org.eclipse.egit.target/egit-4.32.tpd | 7 - org.eclipse.egit.target/egit-4.33.target | 362 ----------------- org.eclipse.egit.target/egit-4.33.tpd | 7 - org.eclipse.egit.target/egit-4.34.target | 362 ----------------- org.eclipse.egit.target/egit-4.34.tpd | 7 - org.eclipse.egit.target/egit-4.35.target | 371 ------------------ org.eclipse.egit.target/egit-4.35.tpd | 7 - org.eclipse.egit.target/egit-4.36.target | 17 +- org.eclipse.egit.target/orbit/orbit-4.31.tpd | 55 --- org.eclipse.egit.target/orbit/orbit-4.32.tpd | 55 --- org.eclipse.egit.target/orbit/orbit-4.33.tpd | 55 --- org.eclipse.egit.target/orbit/orbit-4.34.tpd | 55 --- org.eclipse.egit.target/orbit/orbit-4.35.tpd | 53 --- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 3 - .../projects/swtbot-snapshot.tpd | 1 + .../releasetrain/4.26-2022-12.tpd | 20 - .../releasetrain/4.27-2023-03.tpd | 21 - .../releasetrain/4.28-2023-06.tpd | 24 -- .../releasetrain/4.29-2023-09.tpd | 24 -- .../releasetrain/4.30-2023-12.tpd | 25 -- .../releasetrain/4.31-2024-03.tpd | 25 -- .../releasetrain/4.32-2024-06.tpd | 25 -- .../releasetrain/4.33-2024-09.tpd | 25 -- .../releasetrain/4.34-2024-12.tpd | 25 -- .../releasetrain/4.35-2025-03.tpd | 36 -- .../releasetrain/4.36-2025-06.tpd | 11 + org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- pom.xml | 4 +- 49 files changed, 37 insertions(+), 4230 deletions(-) delete mode 100644 org.eclipse.egit.target/egit-4.26.target delete mode 100644 org.eclipse.egit.target/egit-4.26.tpd delete mode 100644 org.eclipse.egit.target/egit-4.27.target delete mode 100644 org.eclipse.egit.target/egit-4.27.tpd delete mode 100644 org.eclipse.egit.target/egit-4.28.target delete mode 100644 org.eclipse.egit.target/egit-4.28.tpd delete mode 100644 org.eclipse.egit.target/egit-4.29.target delete mode 100644 org.eclipse.egit.target/egit-4.29.tpd delete mode 100644 org.eclipse.egit.target/egit-4.30.target delete mode 100644 org.eclipse.egit.target/egit-4.30.tpd delete mode 100644 org.eclipse.egit.target/egit-4.31.target delete mode 100644 org.eclipse.egit.target/egit-4.31.tpd delete mode 100644 org.eclipse.egit.target/egit-4.32.target delete mode 100644 org.eclipse.egit.target/egit-4.32.tpd delete mode 100644 org.eclipse.egit.target/egit-4.33.target delete mode 100644 org.eclipse.egit.target/egit-4.33.tpd delete mode 100644 org.eclipse.egit.target/egit-4.34.target delete mode 100644 org.eclipse.egit.target/egit-4.34.tpd delete mode 100644 org.eclipse.egit.target/egit-4.35.target delete mode 100644 org.eclipse.egit.target/egit-4.35.tpd delete mode 100644 org.eclipse.egit.target/orbit/orbit-4.31.tpd delete mode 100644 org.eclipse.egit.target/orbit/orbit-4.32.tpd delete mode 100644 org.eclipse.egit.target/orbit/orbit-4.33.tpd delete mode 100644 org.eclipse.egit.target/orbit/orbit-4.34.tpd delete mode 100644 org.eclipse.egit.target/orbit/orbit-4.35.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.31-2024-03.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.32-2024-06.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.33-2024-09.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.34-2024-12.tpd delete mode 100644 org.eclipse.egit.target/releasetrain/4.35-2025-03.tpd diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF index 06d186e5d0..54266230dd 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", org.eclipse.jgit.util;version="[7.4.0,7.5.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.egit.core.test;version="7.4.0";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.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index f1ba931305..b7f3b8f676 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -30,4 +30,4 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.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)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index a5d21ec3c4..5facec49bf 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -61,7 +61,7 @@ Export-Package: org.eclipse.egit.core;version="7.4.0"; org.eclipse.egit.core.synchronize.dto;version="7.4.0";x-friends:="org.eclipse.egit.ui", org.eclipse.egit.core.util;version="7.4.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index 6d78978c5f..f87f18c526 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.egit.gitflow.test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index d017bffb17..fb99e20f83 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.egit.gitflow.ui Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index 9cb68dc4b1..5d34e5bdbb 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)" diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index 74767851dd..8e280dc19f 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -186,10 +186,10 @@ - + - + diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target deleted file mode 100644 index 4aa40a10f1..0000000000 --- a/org.eclipse.egit.target/egit-4.26.target +++ /dev/null @@ -1,357 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.26.tpd b/org.eclipse.egit.target/egit-4.26.tpd deleted file mode 100644 index b8a38d1ba9..0000000000 --- a/org.eclipse.egit.target/egit-4.26.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.26" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.26-2022-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target deleted file mode 100644 index 92df720d31..0000000000 --- a/org.eclipse.egit.target/egit-4.27.target +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.27.tpd b/org.eclipse.egit.target/egit-4.27.tpd deleted file mode 100644 index 3e5d389df7..0000000000 --- a/org.eclipse.egit.target/egit-4.27.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.27" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.27-2023-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target deleted file mode 100644 index 84f1419848..0000000000 --- a/org.eclipse.egit.target/egit-4.28.target +++ /dev/null @@ -1,361 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.28.tpd b/org.eclipse.egit.target/egit-4.28.tpd deleted file mode 100644 index cdc0c109fb..0000000000 --- a/org.eclipse.egit.target/egit-4.28.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.28" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.28-2023-06.tpd" diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target deleted file mode 100644 index 94ad663b07..0000000000 --- a/org.eclipse.egit.target/egit-4.29.target +++ /dev/null @@ -1,361 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.29.tpd b/org.eclipse.egit.target/egit-4.29.tpd deleted file mode 100644 index 41521d7b01..0000000000 --- a/org.eclipse.egit.target/egit-4.29.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.29" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.29-2023-09.tpd" diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target deleted file mode 100644 index 7f7586b491..0000000000 --- a/org.eclipse.egit.target/egit-4.30.target +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.30.tpd b/org.eclipse.egit.target/egit-4.30.tpd deleted file mode 100644 index d3e8470941..0000000000 --- a/org.eclipse.egit.target/egit-4.30.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.30" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.30-2023-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.31.target b/org.eclipse.egit.target/egit-4.31.target deleted file mode 100644 index a28b955743..0000000000 --- a/org.eclipse.egit.target/egit-4.31.target +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.31.tpd b/org.eclipse.egit.target/egit-4.31.tpd deleted file mode 100644 index 17711d5754..0000000000 --- a/org.eclipse.egit.target/egit-4.31.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.31" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.31-2024-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.32.target b/org.eclipse.egit.target/egit-4.32.target deleted file mode 100644 index a24690680b..0000000000 --- a/org.eclipse.egit.target/egit-4.32.target +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.32.tpd b/org.eclipse.egit.target/egit-4.32.tpd deleted file mode 100644 index cddd2b6d9f..0000000000 --- a/org.eclipse.egit.target/egit-4.32.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.32" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.32.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.32-2024-06.tpd" diff --git a/org.eclipse.egit.target/egit-4.33.target b/org.eclipse.egit.target/egit-4.33.target deleted file mode 100644 index cbd6442d3b..0000000000 --- a/org.eclipse.egit.target/egit-4.33.target +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.33.tpd b/org.eclipse.egit.target/egit-4.33.tpd deleted file mode 100644 index c1dd38f35f..0000000000 --- a/org.eclipse.egit.target/egit-4.33.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.33" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.33.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.33-2024-09.tpd" diff --git a/org.eclipse.egit.target/egit-4.34.target b/org.eclipse.egit.target/egit-4.34.target deleted file mode 100644 index ad9f6458c0..0000000000 --- a/org.eclipse.egit.target/egit-4.34.target +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.34.tpd b/org.eclipse.egit.target/egit-4.34.tpd deleted file mode 100644 index c56479755a..0000000000 --- a/org.eclipse.egit.target/egit-4.34.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.34" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.34.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.34-2024-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.35.target b/org.eclipse.egit.target/egit-4.35.target deleted file mode 100644 index f8ac6533a4..0000000000 --- a/org.eclipse.egit.target/egit-4.35.target +++ /dev/null @@ -1,371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.osgi - org.osgi.annotation.bundle - 2.0.0 - jar - - - org.osgi - org.osgi.annotation.versioning - 1.1.2 - jar - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - jar - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - jar - - - - - - - org.tukaani - xz - 1.10 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.15.0 - jar - - - org.apache.sshd - sshd-sftp - 2.15.0 - jar - - - - - - - org.mockito - mockito-core - 5.18.0 - jar - - - - - - - net.java.dev.jna - jna - 5.17.0 - jar - - - net.java.dev.jna - jna-platform - 5.17.0 - jar - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.21 - jar - - - org.eclipse.jetty - jetty-http - 12.0.21 - jar - - - org.eclipse.jetty - jetty-io - 12.0.21 - jar - - - org.eclipse.jetty - jetty-security - 12.0.21 - jar - - - org.eclipse.jetty - jetty-server - 12.0.21 - jar - - - org.eclipse.jetty - jetty-session - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util - 12.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - com.google.code.gson - gson - 2.13.1 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.17.5 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.5 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.80 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.80 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.80 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.80 - jar - - - - - - - org.assertj - assertj-core - 3.27.3 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.18.0 - jar - - - org.apache.commons - commons-compress - 1.27.1 - jar - - - org.apache.commons - commons-lang3 - 3.17.0 - jar - - - commons-io - commons-io - 2.19.0 - jar - - - commons-logging - commons-logging - 1.3.5 - jar - - - - - diff --git a/org.eclipse.egit.target/egit-4.35.tpd b/org.eclipse.egit.target/egit-4.35.tpd deleted file mode 100644 index d4cb9d5ca4..0000000000 --- a/org.eclipse.egit.target/egit-4.35.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.35" with source configurePhase - -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/orbit-4.35.tpd" -include "maven/dependencies.tpd" -include "releasetrain/4.35-2025-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index df38b02467..c30237f469 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -9,6 +9,7 @@ + @@ -54,9 +55,6 @@ - - - @@ -93,8 +91,15 @@ + + + + + + + @@ -108,9 +113,13 @@ + + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.31.tpd b/org.eclipse.egit.target/orbit/orbit-4.31.tpd deleted file mode 100644 index 7e54c73891..0000000000 --- a/org.eclipse.egit.target/orbit/orbit-4.31.tpd +++ /dev/null @@ -1,55 +0,0 @@ -target "orbit-4.31" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03" { - com.ibm.icu [74.2.0,74.2.0] - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - jakarta.activation-api [2.1.2,2.1.2] - jakarta.activation-api.source [2.1.2,2.1.2] - jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] - jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.batik.constants [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.css [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.i18n [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.util [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.commons.logging [1.2.0,1.2.0] - org.apache.commons.logging.source [1.2.0,1.2.0] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene.feature.group [4.31.0.v20240221-0830,4.31.0.v20240221-0830] - org.eclipse.orbit.xml-apis-ext [1.0.0.v20230923-0644,1.0.0.v20230923-0644] - org.hamcrest [2.2.0,2.2.0] - org.hamcrest.source [2.2.0,2.2.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.mortbay.jasper.apache-jsp [9.0.83,9.0.83] - org.objenesis [3.3,3.3] - org.objenesis.source [3.3,3.3] - org.objectweb.asm [9.6.0, 9.6.0] - org.objectweb.asm.source [9.6.0, 9.6.0] - org.objectweb.asm.tree [9.6.0,9.6.0] - org.objectweb.asm.tree.source [9.6.0,9.6.0] - org.objectweb.asm.tree.analysis [9.6.0,9.6.0] - org.objectweb.asm.tree.analysis.source [9.6.0,9.6.0] - org.objectweb.asm.util [9.6.0,9.6.0] - org.objectweb.asm.util.source [9.6.0,9.6.0] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.egit.target/orbit/orbit-4.32.tpd b/org.eclipse.egit.target/orbit/orbit-4.32.tpd deleted file mode 100644 index 3fd5e62fbf..0000000000 --- a/org.eclipse.egit.target/orbit/orbit-4.32.tpd +++ /dev/null @@ -1,55 +0,0 @@ -target "orbit-4.32" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06" { - com.ibm.icu [75.1.0,75.1.0] - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] - jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] - jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.batik.constants [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.css [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.i18n [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.util [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.commons.logging [1.2.0,1.2.0] - org.apache.commons.logging.source [1.2.0,1.2.0] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene.feature.group [4.32.0,4.32.0] - org.eclipse.orbit.xml-apis-ext [1.0.0.v20230923-0644,1.0.0.v20230923-0644] - org.hamcrest [2.2.0,2.2.0] - org.hamcrest.source [2.2.0,2.2.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.mortbay.jasper.apache-jsp [9.0.83,9.0.83] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] - org.objectweb.asm [9.7.0, 9.7.0] - org.objectweb.asm.source [9.7.0, 9.7.0] - org.objectweb.asm.tree [9.7.0,9.7.0] - org.objectweb.asm.tree.source [9.7.0,9.7.0] - org.objectweb.asm.tree.analysis [9.7.0,9.7.0] - org.objectweb.asm.tree.analysis.source [9.7.0,9.7.0] - org.objectweb.asm.util [9.7.0,9.7.0] - org.objectweb.asm.util.source [9.7.0,9.7.0] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.egit.target/orbit/orbit-4.33.tpd b/org.eclipse.egit.target/orbit/orbit-4.33.tpd deleted file mode 100644 index 1d5a614d08..0000000000 --- a/org.eclipse.egit.target/orbit/orbit-4.33.tpd +++ /dev/null @@ -1,55 +0,0 @@ -target "orbit-4.33" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" { - com.ibm.icu [75.1.0,75.1.0] - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] - jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] - jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.batik.constants [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.css [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.i18n [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.batik.util [1.17.0.v20231215-1130,1.17.0.v20231215-1130] - org.apache.commons.logging [1.2.0,1.2.0] - org.apache.commons.logging.source [1.2.0,1.2.0] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene.feature.group [4.33.0.v20240628-1000,4.33.0.v20240628-1000] - org.eclipse.orbit.xml-apis-ext [1.0.0.v20230923-0644,1.0.0.v20230923-0644] - org.hamcrest [2.2.0,2.2.0] - org.hamcrest.source [2.2.0,2.2.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.mortbay.jasper.apache-jsp [9.0.90,9.0.90] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] - org.objectweb.asm [9.7.0, 9.7.0] - org.objectweb.asm.source [9.7.0, 9.7.0] - org.objectweb.asm.tree [9.7.0,9.7.0] - org.objectweb.asm.tree.source [9.7.0,9.7.0] - org.objectweb.asm.tree.analysis [9.7.0,9.7.0] - org.objectweb.asm.tree.analysis.source [9.7.0,9.7.0] - org.objectweb.asm.util [9.7.0,9.7.0] - org.objectweb.asm.util.source [9.7.0,9.7.0] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.egit.target/orbit/orbit-4.34.tpd b/org.eclipse.egit.target/orbit/orbit-4.34.tpd deleted file mode 100644 index 8c92e0e4c3..0000000000 --- a/org.eclipse.egit.target/orbit/orbit-4.34.tpd +++ /dev/null @@ -1,55 +0,0 @@ -target "orbit-4.34" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12" { - com.ibm.icu [76.1.0,76.1.0] - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] - jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] - jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.batik.constants [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.css [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.i18n [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.util [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.commons.logging [1.2.0,1.2.0] - org.apache.commons.logging.source [1.2.0,1.2.0] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene.feature.group [4.34.0.v20240929-0900,4.34.0.v20240929-0900] - org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] - org.hamcrest [2.2.0,2.2.0] - org.hamcrest.source [2.2.0,2.2.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.mortbay.jasper.apache-jsp [9.0.96,9.0.96] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] - org.objectweb.asm [9.7.1, 9.7.1] - org.objectweb.asm.source [9.7.1, 9.7.1] - org.objectweb.asm.tree [9.7.1,9.7.1] - org.objectweb.asm.tree.source [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis.source [9.7.1,9.7.1] - org.objectweb.asm.util [9.7.1,9.7.1] - org.objectweb.asm.util.source [9.7.1,9.7.1] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.egit.target/orbit/orbit-4.35.tpd b/org.eclipse.egit.target/orbit/orbit-4.35.tpd deleted file mode 100644 index 5bc6b61db0..0000000000 --- a/org.eclipse.egit.target/orbit/orbit-4.35.tpd +++ /dev/null @@ -1,53 +0,0 @@ -target "orbit-4.35" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03" { - com.ibm.icu [76.1.0,76.1.0] - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] - jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] - org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.batik.constants [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.css [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.i18n [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.util [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.commons.logging [1.2.0,1.2.0] - org.apache.commons.logging.source [1.2.0,1.2.0] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.apache.xmlgraphics [2.10.0.v20241009-1200,2.10.0.v20241009-1200] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene-10.feature.jar [4.35.0.v20241221-1000,4.35.0.v20241221-1000] - org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] - org.hamcrest [2.2.0,2.2.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.source [2.2.0,2.2.0] - org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.mortbay.jasper.apache-jsp [9.0.96,9.0.96] - org.objectweb.asm [9.7.1, 9.7.1] - org.objectweb.asm.source [9.7.1, 9.7.1] - org.objectweb.asm.tree [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis [9.7.1,9.7.1] - org.objectweb.asm.util [9.7.1,9.7.1] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index e147087d35..96960e27a5 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -43,9 +43,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpcore [4.4.16,4.4.16] org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] org.apiguardian.api [1.1.2,1.1.2] - org.bndtools.headless.build.manager [7.1.0.202411251545,7.1.0.202411251545] - org.bndtools.templating [7.1.0.202411251545,7.1.0.202411251545] - org.bndtools.versioncontrol.ignores.manager [7.1.0.202411251545,7.1.0.202411251545] org.mortbay.jasper.apache-el [9.0.102,9.0.102] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] diff --git a/org.eclipse.egit.target/projects/swtbot-snapshot.tpd b/org.eclipse.egit.target/projects/swtbot-snapshot.tpd index c5bece2028..abf95ed0ee 100644 --- a/org.eclipse.egit.target/projects/swtbot-snapshot.tpd +++ b/org.eclipse.egit.target/projects/swtbot-snapshot.tpd @@ -2,6 +2,7 @@ target "swtbot-snapshot" with source configurePhase location swtbot-snapshot "https://download.eclipse.org/technology/swtbot/snapshots/" { org.eclipse.swtbot.eclipse.feature.group lazy + org.eclipse.swtbot.e4.finder lazy org.eclipse.swtbot.feature.group lazy org.eclipse.swtbot.eclipse.test.junit.feature.group lazy } \ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd b/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd deleted file mode 100644 index a16b258c20..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "4.26-2022-12" with source configurePhase - -location "https://download.eclipse.org/releases/2022-12/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd b/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd deleted file mode 100644 index 5a636348af..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd +++ /dev/null @@ -1,21 +0,0 @@ -target "4.27-2023-03" with source configurePhase - -location "https://download.eclipse.org/releases/2023-03" { - // Eclipse platform - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd b/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd deleted file mode 100644 index db87ba29c4..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd +++ /dev/null @@ -1,24 +0,0 @@ -target "4.28-2023-06" with source configurePhase - -location "https://download.eclipse.org/releases/2023-06" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd b/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd deleted file mode 100644 index 6f8ee85860..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd +++ /dev/null @@ -1,24 +0,0 @@ -target "4.29-2023-09" with source configurePhase - -location "https://download.eclipse.org/releases/2023-09" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd b/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd deleted file mode 100644 index 146fade001..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "4.30-2023-12" with source configurePhase - -location "https://download.eclipse.org/releases/2023-12" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.search.core lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.31-2024-03.tpd b/org.eclipse.egit.target/releasetrain/4.31-2024-03.tpd deleted file mode 100644 index 9014221cb7..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.31-2024-03.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "4.31-2024-03" with source configurePhase - -location "https://download.eclipse.org/releases/2024-03" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.search.core lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.32-2024-06.tpd b/org.eclipse.egit.target/releasetrain/4.32-2024-06.tpd deleted file mode 100644 index dd1addff56..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.32-2024-06.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "4.32-2024-06" with source configurePhase - -location "https://download.eclipse.org/staging/2024-06" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.search.core lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.33-2024-09.tpd b/org.eclipse.egit.target/releasetrain/4.33-2024-09.tpd deleted file mode 100644 index 196650e730..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.33-2024-09.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "4.33-2024-09" with source configurePhase - -location "https://download.eclipse.org/releases/2024-09" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.search.core lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.34-2024-12.tpd b/org.eclipse.egit.target/releasetrain/4.34-2024-12.tpd deleted file mode 100644 index 7bf8279cc0..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.34-2024-12.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "4.34-2024-12" with source configurePhase - -location "https://download.eclipse.org/releases/2024-12" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.search.core lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.35-2025-03.tpd b/org.eclipse.egit.target/releasetrain/4.35-2025-03.tpd deleted file mode 100644 index 5c7cbbb724..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.35-2025-03.tpd +++ /dev/null @@ -1,36 +0,0 @@ -target "4.35-2025-03" with source configurePhase - -location "https://download.eclipse.org/releases/2025-03" { - // Eclipse platform - biz.aQute.bnd.util lazy - biz.aQute.bndlib lazy - biz.aQute.repository - biz.aQute.resolve lazy - com.sun.el.javax.el lazy - javax.activation lazy - org.commonmark lazy - org.commonmark-gfm-tables lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.http.service.api lazy - org.eclipse.equinox.http.servlet lazy - org.eclipse.equinox.p2.director lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.jetty.ee8.security lazy - org.eclipse.jetty.ee8.server lazy - org.eclipse.jetty.ee8.servlet lazy - org.eclipse.sdk.ide lazy - org.eclipse.search.core lazy - org.osgi.service.http.whiteboard lazy - org.osgi.service.repository lazy - org.sat4j.core lazy - org.sat4j.pb lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} diff --git a/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd index 4d5e280fdf..a29f034bd9 100644 --- a/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd +++ b/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd @@ -6,8 +6,15 @@ location "https://download.eclipse.org/releases/2025-06" { biz.aQute.bndlib lazy biz.aQute.repository biz.aQute.resolve lazy + bndtools.jareditor lazy com.sun.el.javax.el lazy javax.activation lazy + org.bndtools.headless.build.manager lazy + org.bndtools.headless.build.plugin.gradle lazy + org.bndtools.templates.template lazy + org.bndtools.templating lazy + org.bndtools.versioncontrol.ignores.manager lazy + org.bndtools.versioncontrol.ignores.plugin.git lazy org.commonmark lazy org.commonmark-gfm-tables lazy org.eclipse.e4.tools.emf.ui lazy @@ -21,9 +28,13 @@ location "https://download.eclipse.org/releases/2025-06" { org.eclipse.equinox.http.servlet lazy org.eclipse.equinox.p2.director lazy org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jdt.core.manipulation lazy + org.eclipse.jdt.ui lazy org.eclipse.jetty.ee8.security lazy org.eclipse.jetty.ee8.server lazy org.eclipse.jetty.ee8.servlet lazy + org.eclipse.pde.bnd.ui lazy + org.eclipse.pde.core lazy org.eclipse.sdk.ide lazy org.eclipse.search.core lazy org.eclipse.swt.tools.base lazy diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 9f0a821769..5e8266db27 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ 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: 7.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 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)", diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index edb4d4ad08..9fe195f6d0 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.e4.ui.workbench;bundle-version="[1.14.0,2.0.0)", org.eclipse.ui.workbench;bundle-version="[3.127.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.egit.core.attributes;version="[7.4.0,7.5.0)", org.eclipse.egit.core.credentials;version="[7.4.0,7.5.0)", diff --git a/pom.xml b/pom.xml index 37996d0def..f196975b66 100644 --- a/pom.xml +++ b/pom.xml @@ -64,14 +64,14 @@ 3.9.0 7.4.0-SNAPSHOT 4.0.13 - 17 + 21 3.40.0 4.9.3.0 file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository https://download.eclipse.org/cbi/updates/license /home/data/httpd/download-staging.priv/egit /home/data/httpd/download.eclipse.org/egit/updates-nightly - egit-4.26 + egit-4.36 scm:git:https://git.eclipse.org/r/egit/egit.git From 7bde775dcfe399dc54bbcc84df1c1e8f90d8b432 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 19 Jun 2025 19:21:54 +0200 Subject: [PATCH 032/160] Add target platform for Eclipse 2025-09 (4.37) Change-Id: I7b8c9e21ed6bdbab637e62ac40899325f6f32a54 --- org.eclipse.egit.target/egit-4.37.target | 406 ++++++++++++++++++ org.eclipse.egit.target/egit-4.37.tpd | 7 + org.eclipse.egit.target/orbit/orbit-4.37.tpd | 75 ++++ .../releasetrain/4.37-2025-09.tpd | 48 +++ 4 files changed, 536 insertions(+) create mode 100644 org.eclipse.egit.target/egit-4.37.target create mode 100644 org.eclipse.egit.target/egit-4.37.tpd create mode 100644 org.eclipse.egit.target/orbit/orbit-4.37.tpd create mode 100644 org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target new file mode 100644 index 0000000000..c9bc2056f1 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.37.target @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + jar + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + jar + + + org.osgi + org.osgi.service.component.annotations + 1.5.1 + jar + + + org.osgi + org.osgi.service.metatype.annotations + 1.4.1 + jar + + + + + + + org.tukaani + xz + 1.10 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.15.0 + jar + + + org.apache.sshd + sshd-sftp + 2.15.0 + jar + + + + + + + org.mockito + mockito-core + 5.18.0 + jar + + + + + + + net.java.dev.jna + jna + 5.17.0 + jar + + + net.java.dev.jna + jna-platform + 5.17.0 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.21 + jar + + + org.eclipse.jetty + jetty-http + 12.0.21 + jar + + + org.eclipse.jetty + jetty-io + 12.0.21 + jar + + + org.eclipse.jetty + jetty-security + 12.0.21 + jar + + + org.eclipse.jetty + jetty-server + 12.0.21 + jar + + + org.eclipse.jetty + jetty-session + 12.0.21 + jar + + + org.eclipse.jetty + jetty-util + 12.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + com.google.code.gson + gson + 2.13.1 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.17.5 + jar + + + net.bytebuddy + byte-buddy-agent + 1.17.5 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.80 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.80 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.80 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.80 + jar + + + + + + + org.assertj + assertj-core + 3.27.3 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.18.0 + jar + + + org.apache.commons + commons-compress + 1.27.1 + jar + + + org.apache.commons + commons-lang3 + 3.17.0 + jar + + + commons-io + commons-io + 2.19.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.egit.target/egit-4.37.tpd b/org.eclipse.egit.target/egit-4.37.tpd new file mode 100644 index 0000000000..65a6153f66 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.37.tpd @@ -0,0 +1,7 @@ +target "egit-4.37" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.37.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.37-2025-09.tpd" diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd new file mode 100644 index 0000000000..b9f40d6d05 --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -0,0 +1,75 @@ +target "orbit-4.37" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09" { + aQute.libg [7.1.0.202411251545,7.1.0.202411251545] + bndtools.api [7.1.0.202411251545,7.1.0.202411251545] + com.ibm.icu [77.1.0,77.1.0] + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [1.7.2,1.7.2] + jakarta.activation-api [2.1.3,2.1.3] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.2,4.0.2] + junit-jupiter-api [5.13.1,5.13.1] + junit-jupiter-engine [5.13.1,5.13.1] + junit-jupiter-migrationsupport [5.13.1,5.13.1] + junit-jupiter-params [5.13.1,5.13.1] + junit-platform-commons [1.13.1,1.13.1] + junit-platform-engine [1.13.1,1.13.1] + junit-platform-launcher [1.13.1,1.13.1] + junit-platform-runner [1.13.1,1.13.1] + junit-platform-suite-api [1.13.1,1.13.1] + junit-platform-suite-commons [1.13.1,1.13.1] + junit-platform-suite-engine [1.13.1,1.13.1] + junit-vintage-engine [5.13.1,5.13.1] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.mortbay.jasper.apache-el [10.1.41,10.1.41] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] + org.eclipse.jetty.servlet-api [4.0.6,4.0.6] + org.apache.lucene.analysis-common [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] + org.hamcrest [2.2.0,2.2.0] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.source [2.2.0,2.2.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] + org.objectweb.asm [9.8.0, 9.8.0] + org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.tree [9.8.0, 9.8.0] + org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] + org.objectweb.asm.util [9.8.0, 9.8.0] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd b/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd new file mode 100644 index 0000000000..37863ca166 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd @@ -0,0 +1,48 @@ +target "4.37-2025-09" with source configurePhase + +location "https://download.eclipse.org/releases/2025-09" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + biz.aQute.repository + biz.aQute.resolve lazy + bndtools.jareditor lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.bndtools.headless.build.manager lazy + org.bndtools.headless.build.plugin.gradle lazy + org.bndtools.templates.template lazy + org.bndtools.templating lazy + org.bndtools.versioncontrol.ignores.manager lazy + org.bndtools.versioncontrol.ignores.plugin.git lazy + org.commonmark lazy + org.commonmark-gfm-tables lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jdt.core.manipulation lazy + org.eclipse.jdt.ui lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.pde.bnd.ui lazy + org.eclipse.pde.core lazy + org.eclipse.sdk.ide lazy + org.eclipse.search.core lazy + org.eclipse.swt.tools.base lazy + org.osgi.service.http.whiteboard lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} From a6a3a3908e940642fa4da5c11c578b6ba445c77a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 19 Jun 2025 18:13:48 +0200 Subject: [PATCH 033/160] GitDecorator: guard against already disposed display Change-Id: I22cfdbcac997471bd18be87e5b2cfb2fce8f6c9b --- .../eclipse/egit/ui/internal/decorators/GitDecorator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDecorator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDecorator.java index 3b15d5628c..3170f8b4de 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDecorator.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitDecorator.java @@ -28,6 +28,7 @@ import org.eclipse.jgit.events.ConfigChangedListener; import org.eclipse.jgit.events.ListenerHandle; import org.eclipse.jgit.lib.Repository; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; /** @@ -85,8 +86,11 @@ protected void postLabelEvent() { protected void fireLabelEvent() { LabelProviderChangedEvent event = new LabelProviderChangedEvent(this); // Re-trigger decoration process (in UI thread) - PlatformUI.getWorkbench().getDisplay() - .asyncExec(() -> fireLabelProviderChanged(event)); + Display display = PlatformUI.getWorkbench().getDisplay(); + if (display == null || display.isDisposed()) { + return; + } + display.asyncExec(() -> fireLabelProviderChanged(event)); } @Override From 234cff47ff225dd6b75120f44cc97ce31f5de435 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Jun 2025 22:36:16 +0200 Subject: [PATCH 034/160] Update jgit dependencies - bouncycastle to 1.81 - jetty to 12.0.22 Change-Id: Icc068b35f60ef270df4cca89382ad3d64660c673 --- org.eclipse.egit.target/egit-4.36.target | 26 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 26 +++++++++---------- .../maven/dependencies.tpd | 24 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index c30237f469..0249bfafe9 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -231,49 +231,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-http - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-io - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-security - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-server - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-session - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-util - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-util-ajax - 12.0.21 + 12.0.22 jar @@ -325,25 +325,25 @@ org.bouncycastle bcpg-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcprov-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcpkix-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcutil-jdk18on - 1.80 + 1.81 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index c9bc2056f1..469dcb16d8 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -231,49 +231,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-http - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-io - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-security - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-server - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-session - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-util - 12.0.21 + 12.0.22 jar org.eclipse.jetty jetty-util-ajax - 12.0.21 + 12.0.22 jar @@ -325,25 +325,25 @@ org.bouncycastle bcpg-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcprov-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcpkix-jdk18on - 1.80 + 1.81 jar org.bouncycastle bcutil-jdk18on - 1.80 + 1.81 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index eb14500314..6962b991f3 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -68,22 +68,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.80" + version = "1.81" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.80" + version = "1.81" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.80" + version = "1.81" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.80" + version = "1.81" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.21" + version = "12.0.22" } dependency { groupId = "jakarta.servlet" From b01329ec49e501f7ff40e001986131a08b727dd2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 23 Jun 2025 10:15:09 +0200 Subject: [PATCH 035/160] orbit-4.37: update lucene to 10.2.2.v20250621-0700 Change-Id: If0175ffdd8ca9af43566c4ae5316e2e4a6ebb356 --- org.eclipse.egit.target/egit-4.37.target | 8 ++++---- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 469dcb16d8..40f6d3231a 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -58,9 +58,9 @@ - - - + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index b9f40d6d05..ecb29be23d 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -46,9 +46,9 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.mortbay.jasper.apache-el [10.1.41,10.1.41] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.apache.lucene.analysis-common [10.2.1.v20250501-1000,10.2.1.v20250501-1000] - org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] - org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.analysis-common [10.2.2.v20250621-0700,10.2.2.v20250621-0700] + org.apache.lucene.analysis-smartcn [10.2.2.v20250621-0700,10.2.2.v20250621-0700] + org.apache.lucene.core [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] From e6555a651f2011232f720764c8295972183353e6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 23 Jun 2025 10:16:22 +0200 Subject: [PATCH 036/160] Remove org.eclipse.jetty.servlet-api we use jakarta.servlet-api 6.1.0 Change-Id: If12f8e36c6de118a5f2a034fca7bc301c81d170a --- org.eclipse.egit.target/egit-4.36.target | 3 +-- org.eclipse.egit.target/egit-4.37.target | 3 +-- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 1 - org.eclipse.egit.target/orbit/orbit-4.37.tpd | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 0249bfafe9..8db4d46ae7 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -57,7 +57,6 @@ - diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 40f6d3231a..ce0edbc326 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -57,7 +57,6 @@ - diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index 96960e27a5..c106c74624 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -45,7 +45,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apiguardian.api [1.1.2,1.1.2] org.mortbay.jasper.apache-el [9.0.102,9.0.102] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] org.apache.lucene.analysis-common [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index ecb29be23d..8b8bd868e9 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -45,7 +45,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apiguardian.api [1.1.2,1.1.2] org.mortbay.jasper.apache-el [10.1.41,10.1.41] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] - org.eclipse.jetty.servlet-api [4.0.6,4.0.6] org.apache.lucene.analysis-common [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.analysis-smartcn [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.core [10.2.2.v20250621-0700,10.2.2.v20250621-0700] From 42fa76d6ee70c8de38d3bacbf9011ec8b4949921 Mon Sep 17 00:00:00 2001 From: raghucssit Date: Tue, 3 Jun 2025 20:16:39 +0200 Subject: [PATCH 037/160] Configure common viewer limit for git repositories view Git repositories view stalls Eclipse IDE if it has more than 70k files in a working tree. Configure common viewer limit for this view to fix this performance issue. Bug: egit-92 Change-Id: I60247474c4ce80b84499c967103a4d04505fd3ed --- org.eclipse.egit.target/egit-4.36.target | 2 +- .../egit/ui/internal/repository/RepositoriesView.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 8db4d46ae7..6ec74db213 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java index e40a21d77e..bc72f5a294 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java @@ -178,6 +178,7 @@ import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import org.eclipse.ui.progress.WorkbenchJob; +import org.eclipse.ui.views.WorkbenchViewerSetup; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.PropertySheet; import org.eclipse.ui.views.properties.PropertySheetPage; @@ -436,8 +437,10 @@ public void createPartControl(Composite aParent) { @Override protected CommonViewer createCommonViewerObject(Composite aParent) { - return new RepositoriesCommonViewer(getViewSite().getId(), aParent, + RepositoriesCommonViewer repositoriesCommonViewer = new RepositoriesCommonViewer(getViewSite().getId(), aParent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); + WorkbenchViewerSetup.setupViewer(repositoriesCommonViewer); + return repositoriesCommonViewer; } private void setTopControl(CommonViewer viewer) { From 2668f58065a6f47c32435f9e374673fb4508ef86 Mon Sep 17 00:00:00 2001 From: Dirk Baumann Date: Thu, 5 Jun 2025 16:12:59 +0200 Subject: [PATCH 038/160] Fix for "1207896": Import Team Project Set can create local branch If a new local branch is created, it not uses the correct remote. This has been fixed. Additionally internationalized error messages. Change-Id: I29d60aad61f612cce2c7dd4995558f965070b739 Signed-off-by: Dirk Baumann --- .../eclipse/egit/core/internal/CoreText.java | 6 ++ .../internal/ProjectReferenceImporter.java | 55 ++++++++++++------- .../egit/core/internal/coretext.properties | 2 + 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java index c1b8a47c41..ebcfb8debe 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java @@ -540,6 +540,12 @@ public class CoreText extends NLS { /** */ public static String GitProjectSetCapability_ExportNoRemote; + /** */ + public static String GitProjectSetCapability_RemoteBranchNotFound; + + /** */ + public static String GitProjectSetCapability_RepositoryIsDirty; + /** */ public static String IgnoreOperation_error; diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java index de1707c3ac..d50379d2d6 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java @@ -14,7 +14,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -168,43 +167,61 @@ private static void checkoutBranchIfNecessary( } // Check for local changes if (RepositoryUtil.hasChanges(repository)) { - throw new TeamException(MessageFormat.format( - "Repository at folder {0} has uncommitted changes.", //$NON-NLS-1$ + throw new TeamException(NLS.bind( + CoreText.GitProjectSetCapability_RepositoryIsDirty, repository.getWorkTree())); } // compare with current branch String configuredBranch = projectReference.getBranch(); if (!configuredBranch.equals(currentBranch)) { - // Checkout configured branch - final String branchName = projectReference.getBranch(); - // check whether ref is in reference database + // prepare to checkout configured branch Ref ref = null; try { - ref = mapping.getRepository().getRefDatabase() - .findRef(branchName); + ref = repository.findRef(configuredBranch); } catch (IOException e) { throw new TeamException(e.getMessage()); } if (ref == null) { - // create new local branch - final CreateLocalBranchOperation createLocalBranchOperation = new CreateLocalBranchOperation( - mapping.getRepository(), branchName, ref, - BranchRebaseMode.NONE); + // if branch does not exist locally, find corresponding + // remote branch try { - createLocalBranchOperation.execute(monitor); - } catch (CoreException e) { + Set remoteNames = repository + .getRemoteNames(); + for (String remote : remoteNames) { + ref = repository.findRef( + Constants.R_REMOTES + remote + "/" //$NON-NLS-1$ + + configuredBranch); + if (ref != null) { + break; // remote branch found + } + } + if (ref == null) { + throw new TeamException(NLS.bind( + CoreText.GitProjectSetCapability_RemoteBranchNotFound, + configuredBranch, + repository.getIdentifier())); + } + } catch (IOException e) { throw new TeamException(e.getMessage()); } - } else { - // Checkout configured branch - final BranchOperation branchOperation = new BranchOperation( - repository, configuredBranch); + // create new local branch + CreateLocalBranchOperation createLocalBranchOperation = new CreateLocalBranchOperation( + repository, configuredBranch, ref, + BranchRebaseMode.NONE); try { - branchOperation.execute(monitor); + createLocalBranchOperation.execute(monitor); } catch (CoreException e) { throw new TeamException(e.getMessage()); } } + // Checkout configured branch + BranchOperation branchOperation = new BranchOperation( + repository, configuredBranch); + try { + branchOperation.execute(monitor); + } catch (CoreException e) { + throw new TeamException(e.getMessage()); + } } } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties index ecebd3ccaf..b92a0b122c 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties @@ -142,6 +142,8 @@ ProjectReference_InvalidTokensCount={0} tokens expected in project reference but GitProjectSetCapability_CloneToExistingDirectory=Destination directory {0} already exists and doesn''t contain the expected Git repository. Won''t clone {1} from {2} to prevent data loss. GitProjectSetCapability_ExportCouldNotGetBranch=Could not get current branch from repository of project {0}. GitProjectSetCapability_ExportNoRemote=No remote URL configured for current branch in repository of project {0}. +GitProjectSetCapability_RemoteBranchNotFound=Remote branch ''{0}'' not found in repository {1}. +GitProjectSetCapability_RepositoryIsDirty=Repository has uncommitted changes in folder {0}. CloneOperation_failed_cleanup=Clone operation failed, with failed cleanup: {0}. Manual cleanup may be required. CloneOperation_title=Cloning from {0} From b3cdf1a4eab9d563812403e6a14cb495258e61c5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 7 Jul 2025 23:41:36 +0200 Subject: [PATCH 039/160] Update jgit dependencies - bytebuddy to 1.17.6 - jetty to 12.0.23 and in orbit update - junit 5 to 5.13.3 - junit 5 platform to 1.13.3 Change-Id: Idfcec30068f8cb33b5780056a612e9c1976b9e84 --- org.eclipse.egit.target/egit-4.36.target | 22 ++++----- org.eclipse.egit.target/egit-4.37.target | 46 +++++++++---------- .../maven/dependencies.tpd | 20 ++++---- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 24 +++++----- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 6ec74db213..398741ec28 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-http - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-io - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-security - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-server - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-session - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-util - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-util-ajax - 12.0.22 + 12.0.23 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.5 + 1.17.6 jar net.bytebuddy byte-buddy-agent - 1.17.5 + 1.17.6 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index ce0edbc326..1d1b784fb2 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -30,18 +30,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-http - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-io - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-security - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-server - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-session - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-util - 12.0.22 + 12.0.23 jar org.eclipse.jetty jetty-util-ajax - 12.0.22 + 12.0.23 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.5 + 1.17.6 jar net.bytebuddy byte-buddy-agent - 1.17.5 + 1.17.6 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 6962b991f3..6aa3057ce1 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.5" + version = "1.17.6" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.5" + version = "1.17.6" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.22" + version = "12.0.23" } dependency { groupId = "jakarta.servlet" diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index 8b8bd868e9..a1b5835da5 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -18,18 +18,18 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] jakarta.xml.bind-api [4.0.2,4.0.2] - junit-jupiter-api [5.13.1,5.13.1] - junit-jupiter-engine [5.13.1,5.13.1] - junit-jupiter-migrationsupport [5.13.1,5.13.1] - junit-jupiter-params [5.13.1,5.13.1] - junit-platform-commons [1.13.1,1.13.1] - junit-platform-engine [1.13.1,1.13.1] - junit-platform-launcher [1.13.1,1.13.1] - junit-platform-runner [1.13.1,1.13.1] - junit-platform-suite-api [1.13.1,1.13.1] - junit-platform-suite-commons [1.13.1,1.13.1] - junit-platform-suite-engine [1.13.1,1.13.1] - junit-vintage-engine [5.13.1,5.13.1] + junit-jupiter-api [5.13.3,5.13.3] + junit-jupiter-engine [5.13.3,5.13.3] + junit-jupiter-migrationsupport [5.13.3,5.13.3] + junit-jupiter-params [5.13.3,5.13.3] + junit-platform-commons [1.13.3,1.13.3] + junit-platform-engine [1.13.3,1.13.3] + junit-platform-launcher [1.13.3,1.13.3] + junit-platform-runner [1.13.3,1.13.3] + junit-platform-suite-api [1.13.3,1.13.3] + junit-platform-suite-commons [1.13.3,1.13.3] + junit-platform-suite-engine [1.13.3,1.13.3] + junit-vintage-engine [5.13.3,5.13.3] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] From 73030cfd3fcb97ad91212761bd5a2acb7907390c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Jul 2025 10:22:15 +0200 Subject: [PATCH 040/160] Fix URLs in egit project set We missed to update the project set when we moved to GerritHub. Change-Id: I3f5f7d1e4876bc0a391ba2d84bcea0af732502bc --- egit.psf | 88 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/egit.psf b/egit.psf index 8e180e3e46..5267b4b5a8 100644 --- a/egit.psf +++ b/egit.psf @@ -1,49 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fb71f69534277d6695447773d3b9c8196636e44f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Jul 2025 12:05:44 +0200 Subject: [PATCH 041/160] EGit v7.4.0.202507080956-m1 Change-Id: I8a1d4091e2f9e739a51a166c8499f99f815193df Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 67d4393412..fdb0cc908b 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 54266230dd..85976de5be 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4c2f6c1946..9a3868dd92 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 b7f3b8f676..620955479c 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d40917360..561d48fb28 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 5facec49bf..1de2ddd3b8 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ef21d087ad..24ed890b7d 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 3b6fc063fc..6549b03669 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 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 b22f6cfc6c..10043cd339 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 24a4c4f6be..58070cb0ea 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 f87f18c526..9915773abb 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 71447b5870..d433c8a65d 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index fb99e20f83..62bc58ebd6 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 168b783ea2..427d021734 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 5d34e5bdbb..2f36247121 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 2db4ff2e40..85d7adacef 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e19c338054..d88def6e67 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 10d7620ab3..27de48abf8 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 5e8266db27..ae301e8f58 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Bundle-RequiredExecutionEnvironment: JavaSE-21 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881f3b6a6a..1ca73cfa08 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 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 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 index 9fe195f6d0..fb79b84ac0 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 05e3e1ec8a..a360cc94c1 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f9a057cebb..1190e124d0 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507080956-m1 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 b85e330d52..e065e33247 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index f196975b66..01a1d17d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0-SNAPSHOT + 7.4.0.202507080956-m1 4.0.13 21 3.40.0 From ce4908918731af028a7ea8cb161d9b4b38b276ab Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Jul 2025 16:12:56 +0200 Subject: [PATCH 042/160] Prepare 7.4.0-SNAPSHOT builds Change-Id: I1b71248049c5e630d354a308fa4562f505c3b9d2 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index fdb0cc908b..67d4393412 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-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 85976de5be..54266230dd 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.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)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 9a3868dd92..4c2f6c1946 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 - 7.4.0.202507080956-m1 + 7.4.0-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 620955479c..b7f3b8f676 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.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)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 561d48fb28..5d40917360 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 - 7.4.0.202507080956-m1 + 7.4.0-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 1de2ddd3b8..5facec49bf 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 24ed890b7d..ef21d087ad 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-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 6549b03669..3b6fc063fc 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 10043cd339..b22f6cfc6c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 58070cb0ea..24a4c4f6be 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 - 7.4.0.202507080956-m1 + 7.4.0-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 9915773abb..f87f18c526 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index d433c8a65d..71447b5870 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 - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 62bc58ebd6..fb99e20f83 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 427d021734..168b783ea2 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 - 7.4.0.202507080956-m1 + 7.4.0-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 2f36247121..5d34e5bdbb 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 85d7adacef..2db4ff2e40 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index d88def6e67..e19c338054 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 27de48abf8..10d7620ab3 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 - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index ae301e8f58..5e8266db27 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 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)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 1ca73cfa08..881f3b6a6a 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 - 7.4.0.202507080956-m1 + 7.4.0-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 index fb79b84ac0..9fe195f6d0 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index a360cc94c1..05e3e1ec8a 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 1190e124d0..f9a057cebb 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: 7.4.0.202507080956-m1 +Bundle-Version: 7.4.0.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 e065e33247..b85e330d52 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 01a1d17d7d..f196975b66 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0.202507080956-m1 + 7.4.0-SNAPSHOT 4.0.13 21 3.40.0 From 19dd90103c0d0cae2f0a38311fa0a70557eb2389 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 11 Jul 2025 18:15:13 +0200 Subject: [PATCH 043/160] [oomph] Update and cycle API baselines Add 7.3.0, remove 7.0.0. Also add a choice for the 4.37 target platform and remove choices for deleted platforms. Change-Id: Ibc74b73ef40b773c06511a917d107e315d80f91d --- tools/oomph/EGit.setup | 56 +++++++++++------------------------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index 4608cc8d04..88e10dcd10 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -114,52 +114,17 @@ - - - - - - - - - - + label="EGit 2025-06 (4.36) target"/> + Default target platform for EGit development. - - EGit 7.0.0 API baseline; to be used with branch stable-7.1 - EGit 7.2.0 API baseline; to be used with branch master + EGit 7.2.0 API baseline; to be used with branch stable-7.3 + + + EGit 7.3.0 API baseline; to be used with branch master Date: Tue, 15 Jul 2025 22:18:12 +0200 Subject: [PATCH 044/160] Staging View: extensible commit message toolbar Give the toolbar of the commit message component (the one containing the "Amend", "Sign Off", "Sign Commit", and "Gerrit Change ID" buttons) an ID and set it up to include dynamic contributions for that ID. Do the same in the CommitDialog, replacing the ToolBar and ToolItems used directly by a ToolBarManager and Actions. In the staging view, hook up the commit message preview to update if the commit message changes while the preview is visible. Provide new API for user code in the form of a CommitContext to get access to the repository and commit message in commands contributed to that toolbar. With this, external code can contribute via plugin.xml its own commands to the toolbar that can determine the repository state and that can modify the commit message. Bug: egit-97 Change-Id: I6bb9552ddc49a13419301ae392700f9e7f4890c2 --- org.eclipse.egit.ui.test/fragment.xml | 44 +++- .../test/commit/ShowCommitMessageHandler.java | 43 ++++ .../ui/test/stagview/CommitToolbarTest.java | 73 +++++++ org.eclipse.egit.ui/META-INF/MANIFEST.MF | 1 + .../eclipse/egit/ui/commit/CommitContext.java | 123 +++++++++++ .../egit/ui/commit/CommitContextUtils.java | 54 +++++ .../ui/internal/dialogs/CommitDialog.java | 206 ++++++++++-------- .../dialogs/DefaultCommitContext.java | 57 +++++ .../egit/ui/internal/staging/StagingView.java | 68 +++++- 9 files changed, 577 insertions(+), 92 deletions(-) create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/ShowCommitMessageHandler.java create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitToolbarTest.java create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContext.java create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContextUtils.java create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DefaultCommitContext.java diff --git a/org.eclipse.egit.ui.test/fragment.xml b/org.eclipse.egit.ui.test/fragment.xml index 1ea423136b..3cb239937e 100644 --- a/org.eclipse.egit.ui.test/fragment.xml +++ b/org.eclipse.egit.ui.test/fragment.xml @@ -16,7 +16,7 @@ - + @@ -66,6 +66,9 @@ + + + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/ShowCommitMessageHandler.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/ShowCommitMessageHandler.java new file mode 100644 index 0000000000..3a309d438a --- /dev/null +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/ShowCommitMessageHandler.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (C) 2025 Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.test.commit; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.egit.ui.commit.CommitContext; +import org.eclipse.egit.ui.commit.CommitContextUtils; +import org.eclipse.jgit.lib.Repository; + +public class ShowCommitMessageHandler extends AbstractHandler { + + public static final String NEW_MESSAGE = "Changed\n\nmessage\n"; + + public static record Data(Repository repository, String message) { + // Empty + } + + public static volatile Data lastData = null; + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + CommitContext context = CommitContextUtils.getCommitContext(event); + if (context != null) { + Repository repository = context.getRepository(); + if (repository != null) { + lastData = new Data(repository, context.getCommitMessage()); + context.setCommitMessage(NEW_MESSAGE); + } + } + return null; + } + +} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitToolbarTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitToolbarTest.java new file mode 100644 index 0000000000..fb35b6bd3b --- /dev/null +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitToolbarTest.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (C) 2025 Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.test.stagview; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import org.eclipse.egit.ui.common.StagingViewTester; +import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.egit.ui.test.TestUtil; +import org.eclipse.egit.ui.test.commit.ShowCommitMessageHandler; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.widgets.Text; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.junit.Test; + +public class CommitToolbarTest extends AbstractStagingViewTestCase { + + @Test + public void testCommitMessageContribution() throws Exception { + setContent("something"); + + StagingViewTester stagingViewTester = StagingViewTester + .openStagingView(); + stagingViewTester.setAuthor(TestUtil.TESTAUTHOR); + stagingViewTester.setCommitter(TestUtil.TESTCOMMITTER); + stagingViewTester.setCommitMessage("Commit message"); + stagingViewTester.setSignedOff(true); + String commitMessage = stagingViewTester.getCommitMessage(); + assertTrue("Should have a signed-off footer", + commitMessage.indexOf("Signed-off-by") > 0); + SWTBotView view = stagingViewTester.getView(); + view.bot().toolbarButtonWithTooltip("Test Commit Message Contribution") + .click(); + assertNotNull(ShowCommitMessageHandler.lastData); + Repository repo = ShowCommitMessageHandler.lastData.repository(); + assertNotNull("Repository should have been found", repo); + assertEquals("Unexpected repository", repo.getDirectory(), + repository.getDirectory()); + assertEquals("Unexpected commit message", + "Commit message\n\nSigned-off-by: " + TestUtil.TESTCOMMITTER, + ShowCommitMessageHandler.lastData.message()); + // Attention: just calling stagingViewTester.getCommitMessage() uses + // SWTUtils.getText(), which replaces all Text.DELIMITERs by "\n"! So + // get the text ourselves, without substitution, since we want to test + // that the line endings _are_ Text.DELIMITER. + StyledText widget = view.bot() + .styledTextWithLabel(UIText.StagingView_CommitMessage).widget; + String newMessage = UIThreadRunnable.syncExec(widget.getDisplay(), + () -> widget.getText()); + assertEquals("Commit message should have been changed", + ShowCommitMessageHandler.NEW_MESSAGE.replaceAll("\n", + Text.DELIMITER), + newMessage); + // The new message that was set has no signed-off-by line, so the sign + // off button should be unchecked. + assertFalse("Sign off should be unchecked", + stagingViewTester.getSignedOff()); + } + +} diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 9fe195f6d0..797b32aacd 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -85,6 +85,7 @@ Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.jgit.util.io;version="[7.4.0,7.5.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" Export-Package: org.eclipse.egit.ui;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.commit;version="7.4.0", org.eclipse.egit.ui.history;version="7.4.0", org.eclipse.egit.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", org.eclipse.egit.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContext.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContext.java new file mode 100644 index 0000000000..b13f215c0b --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContext.java @@ -0,0 +1,123 @@ +/******************************************************************************* + * Copyright (C) 2025, Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.commit; + +import org.eclipse.jgit.lib.Repository; + +/** + * Provides access to the context of a commit in progress: which repository, and + * the commit message. + *

+ * This can be used by custom commands contributed via plugin.xml to the + * {@link #COMMIT_MSG_TOOLBAR_ID} to access and modify the commit message. + *

+ *

+ * In plugin.xml, define a command, handler, and menu contribution + * to the toolbar: + * + * 

+ * <extension point="org.eclipse.ui.commands">
+ *    <command
+ *          categoryId="my.commandCategory"
+ *          id="my.CommandId"
+ *          name="My Command" />
+ * </extension>
+ * <extension point="org.eclipse.ui.commandImages">
+ *    <image commandId="my.CommandId" icon="some icon path" />
+ * </extension>
+ * <extension point="org.eclipse.ui.handlers">
+ *    <handler commandId="my.commandId">
+ *       <class class="my.package.MyCommandHandler" />
+ *    </handler>
+ * </extension>
+ * <extension point="org.eclipse.ui.menus">
+ *    <menuContribution
+ *          locationURI="toolbar:org.eclipse.egit.ui.commitMsgToolBar?after=additions">
+ *       <command
+ *            commandId="my.CommandId"
+ *            label="My Command"
+ *            style="push" />
+ *    </menuContribution>
+ * </extension>
+ *
+ * + * and implement your command handler: + * + * 
+ * package my.package;
+ *
+ * import org.eclipse.core.commands.AbstractHandler;
+ * import org.eclipse.core.commands.ExecutionEvent;
+ * import org.eclipse.core.commands.ExecutionException;
+ * import org.eclipse.egit.ui.commit.CommitContext;
+ * import org.eclipse.egit.ui.commit.CommitContextUtils;
+ *
+ * public class MyCommandHandler extends AbstractHandler {
+ *
+ *   public Object execute(ExecutionEvent event) throws ExecutionException {
+ *     CommitContext context = CommitContextUtils.getCommitContext(event);
+ *     if (context != null) {
+ *       // Do something
+ *     }
+ *     return null;
+ *   }
+ *
+ * }
+ *
+ * + * @since 7.4 + */ +public interface CommitContext { + + /** + * The ID of the commit message toolbar. This is the toolbar containing the + * "Amend", "Sign-Off", "Sign", and "Gerrit Change-Id" buttons. This ID can + * be used in plugin.xml to contribute additional commands to that toolbar, + * in both the staging view or in the commit dialog. + */ + static final String COMMIT_MSG_TOOLBAR_ID = "org.eclipse.egit.ui.commitMsgToolBar"; //$NON-NLS-1$ + + /** + * Retrieves the {@link Repository} this {@link CommitContext} relates to. + * Use this to obtain additional information about the commit being made, + * such as staged/unstaged changes, or commit message settings like the + * clean-up mode or the comment character. (Note that the current comment + * character is also available directly via {@link #getCommentChar()} as a + * convenience.) + * + * @return the {@link Repository}; may be {@code null}. + */ + Repository getRepository(); + + /** + * Retrieves the raw commit message text. The text uses plain LF as + * line delimiter and contains the raw message with no whitespace removed, + * no line-wrapping applied, and including all comment lines. + * + * @return the current commit message + */ + String getCommitMessage(); + + /** + * Retrieves the current comment character used in the raw commit message. + * + * @return the comment character + */ + char getCommentChar(); + + /** + * Sets the (raw) commit message. + * + * @param text + * the commit message to set + */ + void setCommitMessage(String text); +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContextUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContextUtils.java new file mode 100644 index 0000000000..b561c531b9 --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/commit/CommitContextUtils.java @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (C) 2025, Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.commit; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.runtime.Adapters; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.handlers.HandlerUtil; + +/** + * Utility operations on {@link CommitContext}s. + * + * @since 7.4 + */ +public final class CommitContextUtils { + + private CommitContextUtils() { + // No instantiation + } + + /** + * Obtains the {@link CommitContext} from an {@link ExecutionEvent}. Useful + * in command handlers to get the context. + * + * @param event + * {@link ExecutionEvent} of the command invocation + * @return the {@link CommitContext}, or {@code null} if none is found + */ + public static CommitContext getCommitContext(ExecutionEvent event) { + CommitContext context = null; + IWorkbenchPart part = HandlerUtil.getActivePart(event); + if (part != null) { + context = Adapters.adapt(part, CommitContext.class); + // If non-null now, we're in the staging view. + } + if (context == null) { + // In the commit dialog? + Shell shell = HandlerUtil.getActiveShell(event); + context = Adapters.adapt( + shell.getData(CommitContext.class.getCanonicalName()), + CommitContext.class); + } + return context; + } +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java index 6e74ad374a..0c7927a821 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java @@ -42,6 +42,7 @@ import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.UIUtils; +import org.eclipse.egit.ui.commit.CommitContext; import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.GitLabels; import org.eclipse.egit.ui.internal.UIIcons; @@ -63,6 +64,8 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IMessageProvider; @@ -115,6 +118,7 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -128,6 +132,7 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; @@ -138,6 +143,7 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.menus.IMenuService; import org.eclipse.ui.model.BaseWorkbenchContentProvider; import org.eclipse.ui.progress.WorkbenchJob; @@ -195,7 +201,7 @@ private Image getEditorImage(CommitItem item) { if (name != null) { ImageDescriptor descriptor = PlatformUI.getWorkbench() .getEditorRegistry().getImageDescriptor(name); - image = (Image) this.resourceManager.get(descriptor); + image = this.resourceManager.get(descriptor); } return image; } else @@ -205,7 +211,7 @@ private Image getEditorImage(CommitItem item) { private Image getDecoratedImage(Image base, ImageDescriptor decorator) { DecorationOverlayIcon decorated = new DecorationOverlayIcon(base, decorator, IDecoration.BOTTOM_RIGHT); - return (Image) this.resourceManager.get(decorated); + return this.resourceManager.get(decorated); } @Override @@ -364,13 +370,13 @@ public boolean select(Viewer viewer, Object parentElement, Text committerText; - ToolItem amendingItem; + private Action signedOffByAction; - ToolItem signedOffItem; + private Action addChangeIdAction; - ToolItem signCommitItem; + private Action amendPreviousCommitAction; - ToolItem changeIdItem; + private Action signCommitAction; ToolItem showUntrackedItem; @@ -1027,8 +1033,8 @@ public void widgetSelected(SelectionEvent e) { }); if (!allowToChangeSelection) { - amendingItem.setSelection(false); - amendingItem.setEnabled(false); + amendPreviousCommitAction.setChecked(false); + amendPreviousCommitAction.setEnabled(false); showUntrackedItem.setSelection(false); showUntrackedItem.setEnabled(false); checkAllItem.setEnabled(false); @@ -1067,6 +1073,32 @@ private void updateCommitButtons(boolean enable) { commitButton.setEnabled(enable); } + private static RowLayout createRowLayoutWithoutMargin() { + RowLayout layout = new RowLayout(); + layout.marginHeight = 0; + layout.marginWidth = 0; + layout.marginTop = 0; + layout.marginBottom = 0; + layout.marginLeft = 0; + layout.marginRight = 0; + return layout; + } + + private void addContributions(ToolBarManager toolBarManager, + Composite container) { + IMenuService menuService = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getService(IMenuService.class); + if (menuService != null) { + String toolbarUri = "toolbar:" //$NON-NLS-1$ + + CommitContext.COMMIT_MSG_TOOLBAR_ID; + menuService.populateContributionManager(toolBarManager, toolbarUri); + container.addDisposeListener(event -> { + menuService.releaseContributions(toolBarManager); + toolBarManager.dispose(); + }); + } + } + private Composite createMessageAndPersonArea(Composite container) { Composite messageAndPersonArea = toolkit.createComposite(container); @@ -1090,10 +1122,13 @@ private Composite createMessageAndPersonArea(Composite container) { GridLayoutFactory.fillDefaults().spacing(0, 0).numColumns(2) .applyTo(headerArea); - ToolBar messageToolbar = new ToolBar(headerArea, SWT.FLAT - | SWT.HORIZONTAL); + Composite toolbarContainer = new Composite(headerArea, SWT.NONE); + toolbarContainer.setBackground(null); + toolbarContainer.setLayout(createRowLayoutWithoutMargin()); GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL) - .grab(true, false).applyTo(messageToolbar); + .grab(true, false).applyTo(toolbarContainer); + ToolBarManager messageToolbar = new ToolBarManager(SWT.FLAT + | SWT.HORIZONTAL); addMessageDropDown(headerArea); @@ -1158,48 +1193,76 @@ protected CommitProposalProcessor getCommitProposalProcessor() { if (committer != null) committerText.setText(committer); - amendingItem = new ToolItem(messageToolbar, SWT.CHECK); - amendingItem.setSelection(amending); - if (amending) - amendingItem.setEnabled(false); // if already set, don't allow any - // changes - else if (!amendAllowed) - amendingItem.setEnabled(false); - amendingItem.setToolTipText(UIText.CommitDialog_AmendPreviousCommit); - Image amendImage = UIIcons.AMEND_COMMIT.createImage(); - UIUtils.hookDisposal(amendingItem, amendImage); - amendingItem.setImage(amendImage); - - signedOffItem = new ToolItem(messageToolbar, SWT.CHECK); - - signedOffItem.setToolTipText(UIText.CommitDialog_AddSOB); - Image signedOffImage = UIIcons.SIGNED_OFF.createImage(); - UIUtils.hookDisposal(signedOffItem, signedOffImage); - signedOffItem.setImage(signedOffImage); - - signCommitItem = new ToolItem(messageToolbar, SWT.CHECK); - - signCommitItem.setToolTipText(UIText.CommitDialog_SignCommit); - Image signCommitImage = UIIcons.SIGN_COMMIT.createImage(); - UIUtils.hookDisposal(signCommitItem, signCommitImage); - signCommitItem.setImage(signCommitImage); - - changeIdItem = new ToolItem(messageToolbar, SWT.CHECK); - Image changeIdImage = UIIcons.GERRIT.createImage(); - UIUtils.hookDisposal(changeIdItem, changeIdImage); - changeIdItem.setImage(changeIdImage); - changeIdItem.setToolTipText(UIText.CommitDialog_AddChangeIdLabel); + messageToolbar + .add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + amendPreviousCommitAction = new Action( + UIText.CommitDialog_AmendPreviousCommit, IAction.AS_CHECK_BOX) { + + @Override + public void run() { + commitMessageComponent.setAmendingButtonSelection(isChecked()); + updateMessage(); + } + }; + amendPreviousCommitAction.setImageDescriptor(UIIcons.AMEND_COMMIT); + amendPreviousCommitAction.setChecked(amending); + if (amending) { + // If already set don't allow any changes + amendPreviousCommitAction.setEnabled(false); + } else if (!amendAllowed) { + amendPreviousCommitAction.setEnabled(false); + } + messageToolbar.add(amendPreviousCommitAction); + + signedOffByAction = new Action(UIText.CommitDialog_AddSOB, + IAction.AS_CHECK_BOX) { + + @Override + public void run() { + commitMessageComponent.setSignedOffButtonSelection(isChecked()); + } + }; + signedOffByAction.setImageDescriptor(UIIcons.SIGNED_OFF); + messageToolbar.add(signedOffByAction); + + signCommitAction = new Action(UIText.CommitDialog_SignCommit, + IAction.AS_CHECK_BOX) { + + @Override + public void run() { + commitMessageComponent + .setSignCommitButtonSelection(isChecked()); + } + }; + signCommitAction.setImageDescriptor(UIIcons.SIGN_COMMIT); + messageToolbar.add(signCommitAction); + signCommitAction.setEnabled(true); + + addChangeIdAction = new Action(UIText.CommitDialog_AddChangeIdLabel, + IAction.AS_CHECK_BOX) { + + @Override + public void run() { + commitMessageComponent.setChangeIdButtonSelection(isChecked()); + } + }; + addChangeIdAction.setImageDescriptor(UIIcons.GERRIT); + messageToolbar.add(addChangeIdAction); + + addContributions(messageToolbar, toolbarContainer); + + messageToolbar.createControl(toolbarContainer); final ICommitMessageComponentNotifications listener = new ICommitMessageComponentNotifications() { @Override public void updateSignedOffToggleSelection(boolean selection) { - signedOffItem.setSelection(selection); + signedOffByAction.setChecked(selection); } @Override public void updateChangeIdToggleSelection(boolean selection) { - changeIdItem.setSelection(selection); + addChangeIdAction.setChecked(selection); if (isGerritRepo) { pushSettings.setVisible(!selection); pushSettings.getControl().getParent().requestLayout(); @@ -1208,7 +1271,7 @@ public void updateChangeIdToggleSelection(boolean selection) { @Override public void updateSignCommitToggleSelection(boolean selection) { - signCommitItem.setSelection(selection); + signCommitAction.setChecked(selection); } @Override @@ -1229,44 +1292,17 @@ public void statusUpdated() { commitMessageComponent.setAmending(amending); commitMessageComponent.setFilesToCommit(getFileList()); - amendingItem.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent arg0) { - commitMessageComponent.setAmendingButtonSelection(amendingItem - .getSelection()); - } - }); - - changeIdItem.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent arg0) { - commitMessageComponent.setChangeIdButtonSelection(changeIdItem - .getSelection()); - } - }); - - signedOffItem.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent arg0) { - commitMessageComponent - .setSignedOffButtonSelection(signedOffItem - .getSelection()); - } - }); - - signCommitItem.setEnabled(true); - // TODO UIText.CommitDialog_Sign_Not_Available - signCommitItem.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - commitMessageComponent.setSignCommitButtonSelection( - signCommitItem.getSelection()); - } - }); - commitMessageComponent.updateUI(); commitMessageComponent.enableListeners(true); + container.getShell().setData(CommitContext.class.getCanonicalName(), + new DefaultCommitContext(commitText) { + @Override + public Repository getRepository() { + return repository; + } + }); + return messageAndPersonArea; } @@ -1330,12 +1366,12 @@ && getPreferenceStore().getBoolean(UIPreferences.BLOCK_COMMIT) } private boolean isCommitWithoutFilesAllowed() { - if (filesViewer.getCheckedElements().length > 0) + if (filesViewer.getCheckedElements().length > 0) { return true; - - if (amendingItem.getSelection()) + } + if (amendPreviousCommitAction.isChecked()) { return true; - + } return CommitHelper.isCommitWithoutFilesAllowed(repository); } @@ -1522,7 +1558,7 @@ protected void okPressed() { commitMessage = commitMessageComponent.getCommitMessage(); author = commitMessageComponent.getAuthor(); committer = commitMessageComponent.getCommitter(); - createChangeId = changeIdItem.getSelection(); + createChangeId = addChangeIdAction.isChecked(); signCommit = commitMessageComponent.isSignCommit(); IDialogSettings settings = org.eclipse.egit.ui.Activator diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DefaultCommitContext.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DefaultCommitContext.java new file mode 100644 index 0000000000..2b7e50563f --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DefaultCommitContext.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (C) 2025, Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.dialogs; + +import org.eclipse.egit.core.internal.Utils; +import org.eclipse.egit.ui.commit.CommitContext; +import org.eclipse.swt.widgets.Text; + +/** + * A base implementation of a {@link CommitContext} that uses a + * {@link SpellcheckableMessageArea} for the commit message. + */ +public abstract class DefaultCommitContext implements CommitContext { + + private final SpellcheckableMessageArea text; + + /** + * Creates a new instance. + * + * @param text + * {@link SpellcheckableMessageArea} containing the commit + * message + */ + public DefaultCommitContext(SpellcheckableMessageArea text) { + this.text = text; + } + + @Override + public String getCommitMessage() { + return Utils.normalizeLineEndings(text.getText()); + } + + @Override + public char getCommentChar() { + return text.getCommentChar(); + } + + @Override + public void setCommitMessage(String msg) { + if (msg == null) { + text.setText(""); //$NON-NLS-1$ + } else { + String normalized = Utils.normalizeLineEndings(msg); + normalized = normalized.replaceAll("\n", Text.DELIMITER); //$NON-NLS-1$ + text.setText(normalized); + } + } + +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 9b6fa86dc3..e3baf50a69 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2011, 2022 Bernard Leach and others. + * Copyright (C) 2011, 2025 Bernard Leach and others. * Copyright (C) 2015 SAP SE (Christian Georgi ) * Copyright (C) 2015 Denis Zygann * Copyright (C) 2016 IBM (Daniel Megert ) @@ -84,6 +84,7 @@ import org.eclipse.egit.ui.JobFamilies; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.UIUtils; +import org.eclipse.egit.ui.commit.CommitContext; import org.eclipse.egit.ui.internal.ActionUtils; import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.CompareUtils; @@ -110,6 +111,7 @@ import org.eclipse.egit.ui.internal.dialogs.CommitMessageComponent; import org.eclipse.egit.ui.internal.dialogs.CommitMessageComponentState; import org.eclipse.egit.ui.internal.dialogs.CommitMessageComponentStateManager; +import org.eclipse.egit.ui.internal.dialogs.DefaultCommitContext; import org.eclipse.egit.ui.internal.dialogs.ICommitMessageComponentNotifications; import org.eclipse.egit.ui.internal.dialogs.SpellcheckableMessageArea; import org.eclipse.egit.ui.internal.operations.DeletePathsOperationUI; @@ -145,6 +147,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.LocalResourceManager; +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocumentListener; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.util.PropertyChangeEvent; @@ -235,6 +239,7 @@ import org.eclipse.ui.IPartService; import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.ISelectionService; +import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPartReference; @@ -249,6 +254,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.handlers.IHandlerService; +import org.eclipse.ui.menus.IMenuService; import org.eclipse.ui.operations.UndoRedoActionGroup; import org.eclipse.ui.part.IShowInSource; import org.eclipse.ui.part.IShowInTarget; @@ -767,8 +773,18 @@ public void indexDiffChanged(Repository repository, private boolean disposed; + private CommitContext commitContext; + + @Override + public T getAdapter(Class adapter) { + if (adapter == CommitContext.class) { + return adapter.cast(commitContext); + } + return super.getAdapter(adapter); + } + private Image getImage(ImageDescriptor descriptor) { - return (Image) this.resources.get(descriptor); + return this.resources.get(descriptor); } private void createPersonLabel(Composite parent, ImageDescriptor image, @@ -996,6 +1012,19 @@ public void widgetSelected(SelectionEvent e) { ToolBarManager commitMessageToolBarManager = new ToolBarManager( SWT.FLAT | SWT.HORIZONTAL); + IDocumentListener updatePreview = new IDocumentListener() { + + @Override + public void documentChanged(DocumentEvent event) { + previewer.setText(commitMessageComponent.getRepository(), + commitMessageComponent.getCommitMessage()); + } + + @Override + public void documentAboutToBeChanged(DocumentEvent event) { + // Nothing + } + }; previewAction = new Action(UIText.StagingView_Preview_Commit_Message, IAction.AS_CHECK_BOX) { @@ -1009,7 +1038,11 @@ public void run() { previewer .setText(commitMessageComponent.getRepository(), commitMessageComponent.getCommitMessage()); + commitMessageText.getDocument() + .addDocumentListener(updatePreview); } else { + commitMessageText.getDocument() + .removeDocumentListener(updatePreview); previewLayout.topControl = commitMessageText; commitMessageSection .setText(UIText.StagingView_CommitMessage); @@ -1024,7 +1057,8 @@ public void run() { }; previewAction.setImageDescriptor(UIIcons.ELCL16_PREVIEW); commitMessageToolBarManager.add(previewAction); - commitMessageToolBarManager.add(new Separator()); + commitMessageToolBarManager + .add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); amendPreviousCommitAction = new Action( UIText.StagingView_Ammend_Previous_Commit, IAction.AS_CHECK_BOX) { @@ -1075,6 +1109,9 @@ public void run() { addChangeIdAction.setImageDescriptor(UIIcons.GERRIT); commitMessageToolBarManager.add(addChangeIdAction); + addContributions(commitMessageToolBarManager, + commitMessageToolbarComposite); + commitMessageToolBarManager .createControl(commitMessageToolbarComposite); @@ -1138,6 +1175,13 @@ protected IHandlerService getHandlerService() { commitMessageText.getTextWidget(), UIText.CommitDialog_ContentAssist); + commitContext = new DefaultCommitContext(commitMessageText) { + @Override + public Repository getRepository() { + return getCurrentRepository(); + } + }; + commitMessagePreview = new Composite(commitMessageTextComposite, SWT.NONE); commitMessagePreview.setLayout(new FillLayout()); @@ -1453,6 +1497,20 @@ else if (element instanceof StagingFolderEntry) service.showBusyForFamily(org.eclipse.egit.core.JobFamilies.INDEX_DIFF_CACHE_UPDATE); } + private void addContributions(ToolBarManager toolBarManager, + Composite container) { + IMenuService menuService = getSite().getService(IMenuService.class); + if (menuService != null) { + String toolbarUri = "toolbar:" //$NON-NLS-1$ + + CommitContext.COMMIT_MSG_TOOLBAR_ID; + menuService.populateContributionManager(toolBarManager, toolbarUri); + container.addDisposeListener(event -> { + menuService.releaseContributions(toolBarManager); + toolBarManager.dispose(); + }); + } + } + private void updateTitle(boolean force) { ViewerLabel label = titleLabels.computeIfAbsent( titleNode.getRepository().getDirectory(), @@ -2405,7 +2463,7 @@ private TreeViewer createViewer(Composite parent, boolean unstaged, Tree tree = viewer.getTree(); // Paint an indicator at the end of the column. tree.addListener(SWT.MeasureItem, event -> { - Object obj = ((TreeItem) event.item).getData(); + Object obj = event.item.getData(); if (obj instanceof StagingEntry) { StagingEntry entry = (StagingEntry) obj; String text = getConflictText(entry); @@ -2429,7 +2487,7 @@ private TreeViewer createViewer(Composite parent, boolean unstaged, // middle of the label text in the hover. return; } - Object obj = ((TreeItem) event.item).getData(); + Object obj = event.item.getData(); if (obj instanceof StagingEntry) { StagingEntry entry = (StagingEntry) obj; String text = getConflictText(entry); From ae02d4b403e04800fa21d4a66b226c32d0433b27 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 23 Jul 2025 00:28:45 +0200 Subject: [PATCH 045/160] Fix tycho.scmUrl The egit repository was moved to GerritHub, hence now use the GitHub URL where GerritHub replicates all submitted changes to. Bug: egit-98 Change-Id: I11bcf0fd838962566005b97de727b16261075538 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f196975b66..23f4f27dab 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ /home/data/httpd/download-staging.priv/egit /home/data/httpd/download.eclipse.org/egit/updates-nightly egit-4.36 - scm:git:https://git.eclipse.org/r/egit/egit.git + scm:git:https://github.com/eclipse-egit/egit -Degit.test.tmpdir=${egit.test.tmpdir} From ec960817dc4b0b6e303df506e0d37858a5bbe25d Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 23 Jul 2025 22:09:37 +0200 Subject: [PATCH 046/160] [themes] Fix light theme in staging and history views In the staging view, give the staged and unstaged tree viewers a white background when active. The light gray default background makes them look inactive, especially since the commit message StyledText behaves like an editor and has the configured editor background, which is white by default. In the history view, remove the gap between the commit message and the diff part, and also change the background on the commit message to white. The light gray reduces contrast with the gray text used for the commit headers too much. In the dark theme, override this with more specific selectors that set "background-color: inherit" to get the default dark theme behavior. The selectors must be more specific because the egit.css is loaded for *all* themes as it has no themeId in the pom.xml. With selectors of equal specificity the backgrounds would remain white also in the dark theme, which don't want of course. Note that since commit 42fa76d6e, the EGit baseline is Eclipse 4.36 (2025-06), so compatibility of these styling changes with earlier Eclipse themes is not an issue anymore. EGit 7.4.0 will not be installable on older Eclipses. Bug: egit-57 Change-Id: I015ce6e65c750e4f6f647c6d8f836d23d643a77d --- .../css/e4-dark_egit_prefstyle.css | 24 +++++++------------ org.eclipse.egit.ui/css/egit.css | 21 +++++++++++++++- .../history/CommitAndDiffComponent.java | 3 ++- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/org.eclipse.egit.ui/css/e4-dark_egit_prefstyle.css b/org.eclipse.egit.ui/css/e4-dark_egit_prefstyle.css index ec93b79061..08ed3adf26 100644 --- a/org.eclipse.egit.ui/css/e4-dark_egit_prefstyle.css +++ b/org.eclipse.egit.ui/css/e4-dark_egit_prefstyle.css @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2022 Andrea Guarinoni and others. + * Copyright (c) 2014, 2025 Andrea Guarinoni and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -33,27 +33,21 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-eclipse-egit-ui { 'org.eclipse.egit.ui.UncommittedChangeForegroundColor=114,157,186' } -/* - * The default e4_dark_partstyle.css has .MPart Composite > StyledText with a lighter background. - * Override this with a more specific selector. - */ -.MPart Composite > StyledText.org-eclipse-egit-ui-CommitAndDiffComponent { - background-color: inherit; - color: inherit; -} - /* * Use a darker background for the tables in the Git history page. The default dark theme assigns * a slightly lighter background otherwise; we want the default background color as is used for * other views (#2F2F2F; decimal 47,47,47). */ -Table.org-eclipse-egit-ui-GitHistoryPage { +.MPart Table.org-eclipse-egit-ui-GitHistoryPage { background-color: inherit; } -/* - * Same for the staged/unstaged tree viewers in the staging view. - */ -.MPart Section Tree.org-eclipse-egit-ui-StagingView { +/* Default for the commit and diff component in the git history view. */ +.MPart ScrolledComposite Composite StyledText.org-eclipse-egit-ui-CommitAndDiffComponent { + background-color: inherit; +} + +/* Same for the staged/unstaged tree viewers in the staging view. */ +.MPartStack.active .MPart Form Composite Section Composite Tree.org-eclipse-egit-ui-StagingView { background-color: inherit; } diff --git a/org.eclipse.egit.ui/css/egit.css b/org.eclipse.egit.ui/css/egit.css index 4a740a4e04..eac14ffa38 100644 --- a/org.eclipse.egit.ui/css/egit.css +++ b/org.eclipse.egit.ui/css/egit.css @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Thomas Wolf + * Copyright (c) 2018, 2025 Thomas Wolf and others * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,3 +12,22 @@ Text.org-eclipse-egit-ui-FindToolbar-noResults { background-color: #FF9696; } + +/* + * Restore the background of the staged and unstaged items viewers. The light gray + * background indicates an inactive view, but if it is active, we want these viewers + * show "active". With gray, it looks particularly jarring in the staging view because + * the commit message StyledText follows the editor background, which is normally + * white in the light theme. + */ +.MPartStack.active .MPart Form Composite Section Tree.org-eclipse-egit-ui-StagingView { + background-color: #FFFFFF; +} + +/* + * Restore contrast in the CommitAndDiffComponent. The new light gray background + * doesn't go well with the gray commit message headers. + */ +.MPart ScrolledComposite StyledText.org-eclipse-egit-ui-CommitAndDiffComponent { + background-color: #FFFFFF; +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java index 681ca2ddd5..6cc08247a7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java @@ -97,7 +97,8 @@ public CommitAndDiffComponent(Composite parent, IWorkbenchPartSite site) { SWT.NONE); commentAndDiffScrolledComposite.setContent(commentAndDiffComposite); commentAndDiffComposite - .setLayout(GridLayoutFactory.fillDefaults().create()); + .setLayout(GridLayoutFactory.fillDefaults().spacing(0, 0) + .create()); commentViewer = new CommitMessageViewer(commentAndDiffComposite, site); commentViewer.getControl().setLayoutData( From db380f4e8bf80d1bf39daae63d021cb6f28bce18 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 23 Jul 2025 23:29:37 +0200 Subject: [PATCH 047/160] [releng] Enforce baseline Eclipse 4.36 (2025-06) Since we have no older target platforms anymore, 4.36 is our new baseline. Commit 42fa76d6ee also makes use of a class that exists only since 4.34 (2024-12), so anything earlier wouldn't work anymore. Ensure that EGit 7.4.0 can only be installed on Eclipse 4.36 or newer by bumping all platform bundle requirements to the versions shipped with Eclipse 4.36. Change-Id: If48037c14fb07d084064d596561011840cbbfafd --- .../META-INF/MANIFEST.MF | 10 ++-- .../META-INF/MANIFEST.MF | 10 ++-- org.eclipse.egit.core/META-INF/MANIFEST.MF | 16 +++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 18 +++---- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 14 ++--- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 52 +++++++++---------- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF index 54266230dd..138bf3975b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.egit.core.junit Bundle-SymbolicName: org.eclipse.egit.core.junit Bundle-Version: 7.4.0.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)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index b7f3b8f676..b916b43d9e 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ 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: 7.4.0.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)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.0)", org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 5facec49bf..ec3b38f687 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", - org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", - org.eclipse.equinox.security;bundle-version="[1.3.1000,2.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)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", + org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", + org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", + org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" Export-Package: org.eclipse.egit.core;version="7.4.0"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, @@ -66,7 +66,7 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", - org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", + org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", org.eclipse.jgit.api;version="[7.4.0,7.5.0)", org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index f87f18c526..fa449c4ec4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.jgit.junit;version="[7.4.0,7.5.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)", +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.0)", org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index fb99e20f83..5a712b0886 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -37,15 +37,15 @@ Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", org.eclipse.jgit.revplot;version="[7.4.0,7.5.0)", org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", org.eclipse.jgit.util;version="[7.4.0,7.5.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)", - org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", - org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", - org.eclipse.jface.databinding;bundle-version="[1.14.0,2.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)" +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.9.400,4.0.0)", + org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.15.300,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" Export-Package: org.eclipse.egit.gitflow.ui;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", org.eclipse.egit.gitflow.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", org.eclipse.egit.gitflow.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index 5d34e5bdbb..c2c51ee0ab 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" Export-Package: org.eclipse.egit.gitflow;version="7.4.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 5e8266db27..0355d4120b 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -7,17 +7,17 @@ Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 -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.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)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, + org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.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.core.net.proxy;bundle-version="[1.5.700,2.0.0)", org.eclipse.egit.gitflow;version="[7.4.0,7.5.0)", org.eclipse.egit.gitflow.op;version="[7.4.0,7.5.0)", org.eclipse.egit.gitflow.ui;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 797b32aacd..8fd9cd7e33 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -7,32 +7,32 @@ Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -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.core.variables;bundle-version="[3.5.100,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", - org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", - org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.9.500,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.22.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.20.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.600,4.0.0)", - org.eclipse.compare;bundle-version="[3.8.500,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.14.400,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.10.400,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.11.500,4.0.0)", - org.eclipse.equinox.security;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.help;bundle-version="[3.9.100,4.0.0)", - org.eclipse.search;bundle-version="[3.14.300,4.0.0)";resolution:=optional, - org.eclipse.debug.ui;bundle-version="[3.17.100,4.0.0)";resolution:=optional, - org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="[3.27.100,4.0.0)";resolution:=optional, - org.eclipse.ui.views;bundle-version="[3.11.300,4.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.11.0,2.0.0)", - org.eclipse.e4.core.services;bundle-version="[2.3.400,3.0.0)", - org.eclipse.e4.ui.workbench;bundle-version="[1.14.0,2.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.127.0,4.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.9.400,4.0.0)", + org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", + org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.28.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.22.600,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.19.200,4.0.0)", + org.eclipse.compare;bundle-version="[3.11.400,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.20.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.13.100,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.13.500,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", + org.eclipse.help;bundle-version="[3.10.500,4.0.0)", + org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, + org.eclipse.debug.ui;bundle-version="[3.18.800,4.0.0)";resolution:=optional, + org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="[3.35.0,4.0.0)";resolution:=optional, + org.eclipse.ui.views;bundle-version="[3.12.600,4.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.13.100,2.0.0)", + org.eclipse.e4.core.services;bundle-version="[2.5.200,3.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.18.0,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", From baa35b4f40e7ded1642d7ca10d06dcc39e07c8a3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 29 Jul 2025 15:07:07 +0200 Subject: [PATCH 048/160] EGit v7.4.0.202507290921-m2 Change-Id: Iba75daaba11d3ddc763c988b20adb0eeb26a519f Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 67d4393412..321bc5b4bf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 138bf3975b..d8b83c241d 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4c2f6c1946..81d7631683 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 b916b43d9e..30722adc96 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d40917360..6cf21be218 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 ec3b38f687..d484ba57eb 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ef21d087ad..a18b1e9cf6 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 3b6fc063fc..403ab51a79 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 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 b22f6cfc6c..5539a5f431 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 24a4c4f6be..52203ed389 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 fa449c4ec4..bc7981e5ae 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 71447b5870..afbb0cb199 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 5a712b0886..cbf65f40b0 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 168b783ea2..bc7d3f2812 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 c2c51ee0ab..d3fb653b2a 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 2db4ff2e40..6d94f0f6f7 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e19c338054..3aeebce490 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 10d7620ab3..ec13c99ae6 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0355d4120b..86529bd11e 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881f3b6a6a..dc76b67e1a 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 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 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 index 8fd9cd7e33..88c22dd102 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 05e3e1ec8a..c07b19619f 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f9a057cebb..1a580d9af9 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202507290921-m2 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 b85e330d52..307d7942d9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 23f4f27dab..ae34003a69 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0-SNAPSHOT + 7.4.0.202507290921-m2 4.0.13 21 3.40.0 From 04d3d8f2b8afa6f4051944836d044acd50565edb Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 30 Jul 2025 00:32:35 +0200 Subject: [PATCH 049/160] Prepare 7.4.0-SNAPSHOT builds Change-Id: I8d3dceb4de3534f6bc83066593f4fa78fb9539e8 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 321bc5b4bf..67d4393412 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-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 d8b83c241d..138bf3975b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 81d7631683..4c2f6c1946 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 - 7.4.0.202507290921-m2 + 7.4.0-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 30722adc96..b916b43d9e 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 6cf21be218..5d40917360 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 - 7.4.0.202507290921-m2 + 7.4.0-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 d484ba57eb..ec3b38f687 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index a18b1e9cf6..ef21d087ad 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-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 403ab51a79..3b6fc063fc 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 5539a5f431..b22f6cfc6c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 52203ed389..24a4c4f6be 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 - 7.4.0.202507290921-m2 + 7.4.0-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 bc7981e5ae..fa449c4ec4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index afbb0cb199..71447b5870 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 - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index cbf65f40b0..5a712b0886 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bc7d3f2812..168b783ea2 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 - 7.4.0.202507290921-m2 + 7.4.0-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 d3fb653b2a..c2c51ee0ab 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 6d94f0f6f7..2db4ff2e40 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 3aeebce490..e19c338054 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index ec13c99ae6..10d7620ab3 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 - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 86529bd11e..0355d4120b 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index dc76b67e1a..881f3b6a6a 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 - 7.4.0.202507290921-m2 + 7.4.0-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 index 88c22dd102..8fd9cd7e33 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index c07b19619f..05e3e1ec8a 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 1a580d9af9..f9a057cebb 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: 7.4.0.202507290921-m2 +Bundle-Version: 7.4.0.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 307d7942d9..b85e330d52 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index ae34003a69..23f4f27dab 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0.202507290921-m2 + 7.4.0-SNAPSHOT 4.0.13 21 3.40.0 From 0f25ce7c2637232e5f3680369b9ed91358264b33 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 30 Jul 2025 00:52:54 +0200 Subject: [PATCH 050/160] Update JGit dependencies - commons-codec to 1.19.0 - commons-io to 2.20.0 - commons-lang3 to 3.18.0 and orbit - junit 5 to 5.13.4 - junit-platform to 1.13.4 - org.mortbay.jasper.apache-el to 10.1.43 - org.commonmark.ext-gfm-tables to 0.25.0 Change-Id: Ic650fff8bd60ea84772de35f8c2bf376ad84221f --- org.eclipse.egit.target/egit-4.36.target | 8 ++-- org.eclipse.egit.target/egit-4.37.target | 40 +++++++++---------- .../maven/dependencies.tpd | 6 +-- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 27 +++++++------ .../releasetrain/4.37-2025-09.tpd | 3 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 398741ec28..eb594085b8 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -372,7 +372,7 @@ commons-codec commons-codec - 1.18.0 + 1.19.0 jar @@ -384,13 +384,13 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.18.0 jar commons-io commons-io - 2.19.0 + 2.20.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 1d1b784fb2..648225675f 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -30,18 +30,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -55,11 +55,12 @@ - + + @@ -69,7 +70,7 @@ - + @@ -100,13 +101,12 @@ - - + @@ -372,7 +372,7 @@ commons-codec commons-codec - 1.18.0 + 1.19.0 jar @@ -384,13 +384,13 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.18.0 jar commons-io commons-io - 2.19.0 + 2.20.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 6aa3057ce1..6f048c2047 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -9,7 +9,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.18.0" + version = "1.19.0" } dependency { groupId = "org.apache.commons" @@ -19,12 +19,12 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.17.0" + version = "3.18.0" } dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.19.0" + version = "2.20.0" } dependency { groupId = "commons-logging" diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index a1b5835da5..6bbe629311 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -18,18 +18,18 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] jakarta.xml.bind-api [4.0.2,4.0.2] - junit-jupiter-api [5.13.3,5.13.3] - junit-jupiter-engine [5.13.3,5.13.3] - junit-jupiter-migrationsupport [5.13.3,5.13.3] - junit-jupiter-params [5.13.3,5.13.3] - junit-platform-commons [1.13.3,1.13.3] - junit-platform-engine [1.13.3,1.13.3] - junit-platform-launcher [1.13.3,1.13.3] - junit-platform-runner [1.13.3,1.13.3] - junit-platform-suite-api [1.13.3,1.13.3] - junit-platform-suite-commons [1.13.3,1.13.3] - junit-platform-suite-engine [1.13.3,1.13.3] - junit-vintage-engine [5.13.3,5.13.3] + junit-jupiter-api [5.13.4,5.13.4] + junit-jupiter-engine [5.13.4,5.13.4] + junit-jupiter-migrationsupport [5.13.4,5.13.4] + junit-jupiter-params [5.13.4,5.13.4] + junit-platform-commons [1.13.4,1.13.4] + junit-platform-engine [1.13.4,1.13.4] + junit-platform-launcher [1.13.4,1.13.4] + junit-platform-runner [1.13.4,1.13.4] + junit-platform-suite-api [1.13.4,1.13.4] + junit-platform-suite-commons [1.13.4,1.13.4] + junit-platform-suite-engine [1.13.4,1.13.4] + junit-vintage-engine [5.13.4,5.13.4] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] @@ -43,11 +43,12 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpcore [4.4.16,4.4.16] org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] org.apiguardian.api [1.1.2,1.1.2] - org.mortbay.jasper.apache-el [10.1.41,10.1.41] + org.mortbay.jasper.apache-el [10.1.43,10.1.43] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.apache.lucene.analysis-common [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.analysis-smartcn [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.core [10.2.2.v20250621-0700,10.2.2.v20250621-0700] + org.commonmark.ext-gfm-tables [0.25.0,0.25.0] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] diff --git a/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd b/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd index 37863ca166..c498de6567 100644 --- a/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd +++ b/org.eclipse.egit.target/releasetrain/4.37-2025-09.tpd @@ -16,13 +16,12 @@ location "https://download.eclipse.org/releases/2025-09" { org.bndtools.versioncontrol.ignores.manager lazy org.bndtools.versioncontrol.ignores.plugin.git lazy org.commonmark lazy - org.commonmark-gfm-tables lazy org.eclipse.e4.tools.emf.ui lazy org.eclipse.e4.tools.services lazy org.eclipse.e4.ui.progress lazy org.eclipse.e4.ui.workbench lazy org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.ecf.filetransfer lazy org.eclipse.emf.sdk.feature.group lazy org.eclipse.equinox.http.service.api lazy org.eclipse.equinox.http.servlet lazy From dc6b0f4f9a9126a1f7b1034e0cfa3d25295a7599 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 30 Jul 2025 09:39:11 +0200 Subject: [PATCH 051/160] Remove dangling to fix oomph setup configuration Bug: egit-100 Change-Id: I19013de78290e8cee666ef59f37bcd2eda391fd3 --- tools/oomph/EGit.setup | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index 88e10dcd10..ae92189710 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -125,7 +125,6 @@ label="EGit 2025-09 (4.37) target"/> Default target platform for EGit development. - Date: Tue, 5 Aug 2025 21:52:33 +0200 Subject: [PATCH 052/160] Update org.apache.commons:commons-compress to 1.28.0 Change-Id: Ib2f45f237a4e700f0023a36fc30c322ec37e96b4 --- org.eclipse.egit.target/egit-4.36.target | 4 ++-- org.eclipse.egit.target/egit-4.37.target | 4 ++-- org.eclipse.egit.target/maven/dependencies.tpd | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index eb594085b8..2e108268ce 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -378,7 +378,7 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 648225675f..4536ca8707 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -378,7 +378,7 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 6f048c2047..3529133414 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -14,7 +14,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.27.1" + version = "1.28.0" } dependency { groupId = "org.apache.commons" From b880afcaae35ed7520cb948f43563536d86c0055 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Aug 2025 00:09:59 +0200 Subject: [PATCH 053/160] Update jgit dependencies - bytebuddy to 1.17.7 - jetty to 12.1.0 - mockito to 5.19.0 - org.assertj:assertj-core to 3.27.4 and orbit dependency - org.commonmark.ext-gfm-tables to 0.25.1 Change-Id: Ib9c5b41d06fd326f35e6c1a35254c7d3c7c5f128 --- org.eclipse.egit.target/egit-4.36.target | 26 ++++++++--------- org.eclipse.egit.target/egit-4.37.target | 28 +++++++++---------- .../maven/dependencies.tpd | 24 ++++++++-------- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 2 +- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 2e108268ce..548804d379 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -204,7 +204,7 @@ org.mockito mockito-core - 5.18.0 + 5.19.0 jar @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-http - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-io - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-security - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-server - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-session - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-util - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-util-ajax - 12.0.23 + 12.1.0 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.6 + 1.17.7 jar net.bytebuddy byte-buddy-agent - 1.17.6 + 1.17.7 jar @@ -352,7 +352,7 @@ org.assertj assertj-core - 3.27.3 + 3.27.4 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 4536ca8707..86e9e1d4d2 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -204,7 +204,7 @@ org.mockito mockito-core - 5.18.0 + 5.19.0 jar @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-http - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-io - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-security - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-server - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-session - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-util - 12.0.23 + 12.1.0 jar org.eclipse.jetty jetty-util-ajax - 12.0.23 + 12.1.0 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.6 + 1.17.7 jar net.bytebuddy byte-buddy-agent - 1.17.6 + 1.17.7 jar @@ -352,7 +352,7 @@ org.assertj assertj-core - 3.27.3 + 3.27.4 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 3529133414..d8d1e524b4 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -55,7 +55,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.3" + version = "3.27.4" } } @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.6" + version = "1.17.7" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.6" + version = "1.17.7" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.23" + version = "12.1.0" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.18.0" + version = "5.19.0" } } diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index 6bbe629311..83f5bf11e2 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -48,7 +48,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.lucene.analysis-common [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.analysis-smartcn [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.apache.lucene.core [10.2.2.v20250621-0700,10.2.2.v20250621-0700] - org.commonmark.ext-gfm-tables [0.25.0,0.25.0] + org.commonmark.ext-gfm-tables [0.25.1,0.25.1] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] From a704cecbf7451025d27c3081bec8908c0cefe340 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Aug 2025 12:59:44 +0200 Subject: [PATCH 054/160] EGit v7.4.0.202508191000-m3 Change-Id: I4dbb8f993f41968077f8d0836cb6035397830f71 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 67d4393412..e3ad93313d 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 138bf3975b..78b187532b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4c2f6c1946..3212406c69 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 b916b43d9e..0d61b8f9a5 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d40917360..4eb28d5f8c 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 ec3b38f687..94d746c4da 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ef21d087ad..363466bdcf 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 3b6fc063fc..16b1d2ef16 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 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 b22f6cfc6c..5df39420e9 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 24a4c4f6be..7cbf7e8f45 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 fa449c4ec4..9af7ea3cbf 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 71447b5870..0b17dbb960 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 5a712b0886..14a1ee3b13 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 168b783ea2..aa5e295227 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 c2c51ee0ab..a46bd5b70c 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 2db4ff2e40..43ccf93fa1 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e19c338054..dc12236c14 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 10d7620ab3..b846e783c4 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0355d4120b..7fce4383e4 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881f3b6a6a..ec9e06aba3 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 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 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 index 8fd9cd7e33..fdbc970ec5 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 05e3e1ec8a..00f4d2662b 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f9a057cebb..94a26bca69 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508191000-m3 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 b85e330d52..421c38179b 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 23f4f27dab..82e0df7dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0-SNAPSHOT + 7.4.0.202508191000-m3 4.0.13 21 3.40.0 From 7aea8fd031f8f2679288e4c51f17cf45713e975d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Aug 2025 14:22:27 +0200 Subject: [PATCH 055/160] Prepare 7.4.0-SNAPSHOT builds Change-Id: I92094cc10033d6c87ff02058e382e36938cdb053 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index e3ad93313d..67d4393412 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-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 78b187532b..138bf3975b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3212406c69..4c2f6c1946 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 - 7.4.0.202508191000-m3 + 7.4.0-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 0d61b8f9a5..b916b43d9e 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 4eb28d5f8c..5d40917360 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 - 7.4.0.202508191000-m3 + 7.4.0-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 94d746c4da..ec3b38f687 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 363466bdcf..ef21d087ad 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-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 16b1d2ef16..3b6fc063fc 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 5df39420e9..b22f6cfc6c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 7cbf7e8f45..24a4c4f6be 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 - 7.4.0.202508191000-m3 + 7.4.0-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 9af7ea3cbf..fa449c4ec4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 0b17dbb960..71447b5870 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 - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 14a1ee3b13..5a712b0886 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index aa5e295227..168b783ea2 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 - 7.4.0.202508191000-m3 + 7.4.0-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 a46bd5b70c..c2c51ee0ab 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 43ccf93fa1..2db4ff2e40 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index dc12236c14..e19c338054 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index b846e783c4..10d7620ab3 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 - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 7fce4383e4..0355d4120b 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index ec9e06aba3..881f3b6a6a 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 - 7.4.0.202508191000-m3 + 7.4.0-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 index fdbc970ec5..8fd9cd7e33 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 00f4d2662b..05e3e1ec8a 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94a26bca69..f9a057cebb 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: 7.4.0.202508191000-m3 +Bundle-Version: 7.4.0.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 421c38179b..b85e330d52 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 82e0df7dc0..23f4f27dab 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0.202508191000-m3 + 7.4.0-SNAPSHOT 4.0.13 21 3.40.0 From f6edeeceba1304c167ff1aca3bc17541d097b99a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 25 Aug 2025 23:19:53 +0200 Subject: [PATCH 056/160] Update apache sshd to 2.16.0 Release notes: https://mina.apache.org/sshd-project/download_2.16.0.html Change-Id: Id7de15993031291c249d1d4f3abfee50968e1f10 --- org.eclipse.egit.target/egit-4.36.target | 6 +++--- org.eclipse.egit.target/egit-4.37.target | 6 +++--- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 548804d379..0f19e3591d 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -188,13 +188,13 @@ org.apache.sshd sshd-osgi - 2.15.0 + 2.16.0 jar org.apache.sshd sshd-sftp - 2.15.0 + 2.16.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 86e9e1d4d2..319d873778 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -188,13 +188,13 @@ org.apache.sshd sshd-osgi - 2.15.0 + 2.16.0 jar org.apache.sshd sshd-sftp - 2.15.0 + 2.16.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index d8d1e524b4..dd8cf1b243 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -224,12 +224,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.15.0" + version = "2.16.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.15.0" + version = "2.16.0" } } From b838f6e1736b6aad8c48dc6b0df2fe703d0f6bdd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 26 Aug 2025 17:07:31 +0200 Subject: [PATCH 057/160] EGit v7.4.0.202508261455-rc1 Change-Id: Idb6e49ffe97e2e17406491cb6d9cbd6768038a4f Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 67d4393412..a5188e09b0 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 138bf3975b..d4461d4d89 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4c2f6c1946..75de0af9a3 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 b916b43d9e..32a12bdc33 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d40917360..c668060f8a 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 ec3b38f687..6bfed04fc7 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ef21d087ad..b6df188378 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 3b6fc063fc..8dae1704b7 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 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 b22f6cfc6c..f29edfa74b 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 24a4c4f6be..dbae113b43 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 fa449c4ec4..bf1e031c6e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 71447b5870..0b29a3e86f 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 5a712b0886..77db4f9997 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 168b783ea2..561629df11 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 c2c51ee0ab..8739a42922 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 2db4ff2e40..5cf2cacad3 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e19c338054..4361309f65 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 10d7620ab3..d321819380 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0355d4120b..0156876d08 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881f3b6a6a..22539d0c8e 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 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 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 index 8fd9cd7e33..438b6cc441 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 05e3e1ec8a..9298d6453d 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f9a057cebb..cc4a784a9d 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202508261455-rc1 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 b85e330d52..4cf31faf0f 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 23f4f27dab..6e87611d84 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0-SNAPSHOT + 7.4.0.202508261455-rc1 4.0.13 21 3.40.0 From 193bbea31fe0f4d1dd2b9fadfd0de9fc68931472 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 Aug 2025 00:17:49 +0200 Subject: [PATCH 058/160] Prepare 7.4.0-SNAPSHOT builds Change-Id: Iad587d3e6a443b7f9e4024d6bf1eeb87b3845bdc --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a5188e09b0..67d4393412 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-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 d4461d4d89..138bf3975b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 75de0af9a3..4c2f6c1946 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 - 7.4.0.202508261455-rc1 + 7.4.0-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 32a12bdc33..b916b43d9e 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index c668060f8a..5d40917360 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 - 7.4.0.202508261455-rc1 + 7.4.0-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 6bfed04fc7..ec3b38f687 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index b6df188378..ef21d087ad 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-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 8dae1704b7..3b6fc063fc 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index f29edfa74b..b22f6cfc6c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index dbae113b43..24a4c4f6be 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 - 7.4.0.202508261455-rc1 + 7.4.0-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 bf1e031c6e..fa449c4ec4 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 0b29a3e86f..71447b5870 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 - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 77db4f9997..5a712b0886 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 561629df11..168b783ea2 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 - 7.4.0.202508261455-rc1 + 7.4.0-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 8739a42922..c2c51ee0ab 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 5cf2cacad3..2db4ff2e40 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 4361309f65..e19c338054 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index d321819380..10d7620ab3 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 - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0156876d08..0355d4120b 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 22539d0c8e..881f3b6a6a 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 - 7.4.0.202508261455-rc1 + 7.4.0-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 index 438b6cc441..8fd9cd7e33 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 9298d6453d..05e3e1ec8a 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index cc4a784a9d..f9a057cebb 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: 7.4.0.202508261455-rc1 +Bundle-Version: 7.4.0.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 4cf31faf0f..b85e330d52 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 6e87611d84..23f4f27dab 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0.202508261455-rc1 + 7.4.0-SNAPSHOT 4.0.13 21 3.40.0 From 0a0feb0d1023961dc7dbfe995d1019ead728b793 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Sep 2025 11:22:48 +0200 Subject: [PATCH 059/160] EGit v7.4.0.202509020913-r Change-Id: I3f0c1c46f7f578b258c387b9bcd5c4176f304458 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 67d4393412..2d64689e1a 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 138bf3975b..aa2aef2a31 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4c2f6c1946..99e5844c8e 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 b916b43d9e..1ed15d7b7f 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d40917360..14b7fb6727 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 ec3b38f687..092fe5bae4 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index ef21d087ad..0122e39778 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 3b6fc063fc..10bff27cce 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r 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 b22f6cfc6c..86d84129c4 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 24a4c4f6be..e9ec9457a3 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 fa449c4ec4..9074dfd042 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 71447b5870..3f8eb187a3 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 5a712b0886..2cc2a7cd88 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 168b783ea2..a87cb4c1a5 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 c2c51ee0ab..53ac5efb9c 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 2db4ff2e40..350307b0d4 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index e19c338054..7a40b0ec82 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 10d7620ab3..f591357536 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 0355d4120b..d60c23b6b5 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881f3b6a6a..26aaf4bf13 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 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 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 index 8fd9cd7e33..4062f8fe45 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 05e3e1ec8a..933d0ba195 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f9a057cebb..5b4247fbc5 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: 7.4.0.qualifier +Bundle-Version: 7.4.0.202509020913-r 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 b85e330d52..f553c13faf 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r org.eclipse.egit diff --git a/pom.xml b/pom.xml index 23f4f27dab..5c66635d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0-SNAPSHOT + 7.4.0.202509020913-r 4.0.13 21 3.40.0 From 716e7b0090c4b2408be13851b9454ca154f4f2da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Sep 2025 23:43:02 +0200 Subject: [PATCH 060/160] Prepare 7.4.1-SNAPSHOT builds Change-Id: I62419680dffe10b4d5ed522b24e77365716efd4b --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 216 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 289 insertions(+), 289 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 2d64689e1a..1e6d3ddd17 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.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 aa2aef2a31..6401ec0d49 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)" +Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.4.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="7.4.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 99e5844c8e..fcc5fdec93 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 - 7.4.0.202509020913-r + 7.4.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 1ed15d7b7f..84b44139a7 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.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="[7.4.0,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)", + org.eclipse.egit.core;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.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 14b7fb6727..db845cdd31 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 - 7.4.0.202509020913-r + 7.4.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 092fe5bae4..f6f60780b3 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.4.0"; +Export-Package: org.eclipse.egit.core;version="7.4.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="7.4.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.4.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.4.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.4.0"; + org.eclipse.egit.core.attributes;version="7.4.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.4.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.4.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.4.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="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.4.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.4.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.4.0"; + org.eclipse.egit.core.internal.credentials;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.4.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.4.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.4.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.4.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.4.0", - org.eclipse.egit.core.settings;version="7.4.0", - org.eclipse.egit.core.storage;version="7.4.0"; + org.eclipse.egit.core.project;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.4.1", + org.eclipse.egit.core.settings;version="7.4.1", + org.eclipse.egit.core.storage;version="7.4.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.4.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.4.0" + org.eclipse.egit.core.synchronize;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.4.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.4.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", - org.eclipse.jgit.diff;version="[7.4.0,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.events;version="[7.4.0,7.5.0)", - org.eclipse.jgit.internal.storage.file;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lfs;version="[7.4.0,7.5.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.merge;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.signing.ssh;version="[7.4.0,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", - org.eclipse.jgit.submodule;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.http;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.http.apache;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.sshd;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util.io;version="[7.4.0,7.5.0)" + org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", + org.eclipse.jgit.diff;version="[7.4.1,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.events;version="[7.4.1,7.5.0)", + org.eclipse.jgit.internal.storage.file;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lfs;version="[7.4.1,7.5.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.merge;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.signing.ssh;version="[7.4.1,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", + org.eclipse.jgit.submodule;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.http;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.http.apache;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.sshd;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util.io;version="[7.4.1,7.5.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 0122e39778..cabf46fb95 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.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 10bff27cce..399606d181 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.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 86d84129c4..33bce580c1 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.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 e9ec9457a3..b05e83475e 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 - 7.4.0.202509020913-r + 7.4.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 9074dfd042..15210f135c 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", +Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.1,7.5.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.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 3f8eb187a3..b1030a2730 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 - 7.4.0.202509020913-r + 7.4.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 index 2cc2a7cd88..eb30cf3ed4 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.settings;version="[7.4.0,7.5.0)", - org.eclipse.egit.gitflow;version="[7.4.0,7.5.0)", - org.eclipse.egit.gitflow.op;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.actions;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.branch;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.commit;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.components;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.push;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.4.0,7.5.0)", - org.eclipse.egit.ui.internal.selection;version="[7.4.0,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revplot;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)" +Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.settings;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow.op;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.actions;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.branch;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.commit;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.components;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.push;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.4.1,7.5.0)", + org.eclipse.egit.ui.internal.selection;version="[7.4.1,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revplot;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.4.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.4.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.4.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.4.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.4.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.4.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.4.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.4.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.4.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.4.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.4.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.4.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index a87cb4c1a5..2793690738 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 - 7.4.0.202509020913-r + 7.4.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 53ac5efb9c..7e8939b075 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.4.0"; +Export-Package: org.eclipse.egit.gitflow;version="7.4.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="7.4.0"; + org.eclipse.egit.gitflow.op;version="7.4.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="7.4.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.0,7.5.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.1,7.5.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 350307b0d4..e7bcb0683c 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 7a40b0ec82..99ce1e0998 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.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 f591357536..d22b8ebe63 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 - 7.4.0.202509020913-r + 7.4.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index d60c23b6b5..2439667f65 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,26 +13,26 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.0,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.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.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.4.0,7.5.0)", - org.eclipse.egit.gitflow.op;version="[7.4.0,7.5.0)", - org.eclipse.egit.gitflow.ui;version="[7.4.0,7.5.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.0,7.5.0)", - org.eclipse.jgit.junit.http;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.resolver;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)", + org.eclipse.egit.gitflow;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow.op;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow.ui;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", + org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", + org.eclipse.jgit.junit.http;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.resolver;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.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 26aaf4bf13..a3b234f9cd 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 - 7.4.0.202509020913-r + 7.4.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 index 4062f8fe45..0f5fd3af4b 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,114 +35,114 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.attributes;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.credentials;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.info;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.credentials;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.efs;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.hosts;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.info;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.job;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.rebase;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.signing;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.storage;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.internal.util;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.settings;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.synchronize;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.4.0,7.5.0)", - org.eclipse.egit.core.util;version="[7.4.0,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api;version="[7.4.0,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.0,7.5.0)", - org.eclipse.jgit.blame;version="[7.4.0,7.5.0)", - org.eclipse.jgit.diff;version="[7.4.0,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.0,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", - org.eclipse.jgit.events;version="[7.4.0,7.5.0)", - org.eclipse.jgit.ignore;version="[7.4.0,7.5.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.0,7.5.0)", - org.eclipse.jgit.lib.internal;version="[7.4.0,7.5.0)", - org.eclipse.jgit.merge;version="[7.4.0,7.5.0)", - org.eclipse.jgit.notes;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revplot;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.0,7.5.0)", - org.eclipse.jgit.submodule;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.0,7.5.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.0,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util;version="[7.4.0,7.5.0)", - org.eclipse.jgit.util.io;version="[7.4.0,7.5.0)", +Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.attributes;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.credentials;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.info;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.credentials;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.efs;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.hosts;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.info;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.rebase;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.signing;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.storage;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.internal.util;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.settings;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.synchronize;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.4.1,7.5.0)", + org.eclipse.egit.core.util;version="[7.4.1,7.5.0)", + org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api;version="[7.4.1,7.5.0)", + org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", + org.eclipse.jgit.blame;version="[7.4.1,7.5.0)", + org.eclipse.jgit.diff;version="[7.4.1,7.5.0)", + org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", + org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", + org.eclipse.jgit.events;version="[7.4.1,7.5.0)", + org.eclipse.jgit.ignore;version="[7.4.1,7.5.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", + org.eclipse.jgit.lib.internal;version="[7.4.1,7.5.0)", + org.eclipse.jgit.merge;version="[7.4.1,7.5.0)", + org.eclipse.jgit.notes;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revplot;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", + org.eclipse.jgit.submodule;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", + org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util;version="[7.4.1,7.5.0)", + org.eclipse.jgit.util.io;version="[7.4.1,7.5.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.commit;version="7.4.0", - org.eclipse.egit.ui.history;version="7.4.0", - org.eclipse.egit.ui.internal;version="7.4.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.4.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.4.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.4.0";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.commit;version="7.4.1", + org.eclipse.egit.ui.history;version="7.4.1", + org.eclipse.egit.ui.internal;version="7.4.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.4.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.4.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 933d0ba195..0ed7fde221 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.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 5b4247fbc5..cf742eefd1 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: 7.4.0.202509020913-r +Bundle-Version: 7.4.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 f553c13faf..219f2945a9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 5c66635d2c..ff6ad018d7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.0.202509020913-r + 7.4.1-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.0.202509020913-r + 7.4.1-SNAPSHOT 4.0.13 21 3.40.0 From 6aef951ff3ae8e2b023f2bb36cdf4af64cb61849 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Sep 2025 23:44:16 +0200 Subject: [PATCH 061/160] Prepare 7.5.0-SNAPSHOT builds Change-Id: Icc00b6cabe4922c0e35bf1f52733b5955a3656ee --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 216 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 289 insertions(+), 289 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 1e6d3ddd17..df3a1e89cf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-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 6401ec0d49..e3c5ba40fb 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)" +Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.4.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="7.5.0";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 fcc5fdec93..a5f8562e68 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 - 7.4.1-SNAPSHOT + 7.5.0-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 84b44139a7..13bb9a76c3 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.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="[7.4.1,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)", + org.eclipse.egit.core;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.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 db845cdd31..12050e94e8 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 - 7.4.1-SNAPSHOT + 7.5.0-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 f6f60780b3..e1685d8134 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.4.1"; +Export-Package: org.eclipse.egit.core;version="7.5.0"; 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="7.4.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.4.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.4.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.4.1"; + org.eclipse.egit.core.attributes;version="7.5.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.5.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.5.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.5.0"; 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="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.4.1";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.4.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.4.1"; + org.eclipse.egit.core.internal.credentials;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.5.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.5.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.5.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.4.1"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.4.1", - org.eclipse.egit.core.settings;version="7.4.1", - org.eclipse.egit.core.storage;version="7.4.1"; + org.eclipse.egit.core.project;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.5.0", + org.eclipse.egit.core.settings;version="7.5.0", + org.eclipse.egit.core.storage;version="7.5.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.4.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.4.1" + org.eclipse.egit.core.synchronize;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.5.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", - org.eclipse.jgit.diff;version="[7.4.1,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.events;version="[7.4.1,7.5.0)", - org.eclipse.jgit.internal.storage.file;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lfs;version="[7.4.1,7.5.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.merge;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.signing.ssh;version="[7.4.1,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", - org.eclipse.jgit.submodule;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.http;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.http.apache;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.sshd;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util.io;version="[7.4.1,7.5.0)" + org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", + org.eclipse.jgit.diff;version="[7.5.0,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.events;version="[7.5.0,7.6.0)", + org.eclipse.jgit.internal.storage.file;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lfs;version="[7.5.0,7.6.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.merge;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.signing.ssh;version="[7.5.0,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", + org.eclipse.jgit.submodule;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.http;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.http.apache;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.sshd;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util.io;version="[7.5.0,7.6.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 cabf46fb95..78e9d9d2f1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-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 399606d181..b41cf471d3 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 33bce580c1..fa269eb924 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index b05e83475e..95a6503db8 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 - 7.4.1-SNAPSHOT + 7.5.0-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 15210f135c..b1be00acfb 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", +Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.0,7.6.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.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 b1030a2730..de9fbc710f 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 - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index eb30cf3ed4..e2edae3496 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.settings;version="[7.4.1,7.5.0)", - org.eclipse.egit.gitflow;version="[7.4.1,7.5.0)", - org.eclipse.egit.gitflow.op;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.actions;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.branch;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.commit;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.components;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.push;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.4.1,7.5.0)", - org.eclipse.egit.ui.internal.selection;version="[7.4.1,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revplot;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)" +Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.settings;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow.op;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.actions;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.branch;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.commit;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.components;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.push;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.5.0,7.6.0)", + org.eclipse.egit.ui.internal.selection;version="[7.5.0,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revplot;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.4.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.4.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.4.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.4.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.4.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.4.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.4.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.5.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.5.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.5.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.5.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.5.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.5.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 2793690738..bd2096945a 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 - 7.4.1-SNAPSHOT + 7.5.0-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 7e8939b075..85d83bc490 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.4.1"; +Export-Package: org.eclipse.egit.gitflow;version="7.5.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="7.4.1"; + org.eclipse.egit.gitflow.op;version="7.5.0"; 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="7.4.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.1,7.5.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.0,7.6.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index e7bcb0683c..9864495347 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 99ce1e0998..8a6f5d2f66 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index d22b8ebe63..e998f0fc13 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 - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2439667f65..2749d84af6 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,26 +13,26 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.4.1,7.5.0)", + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.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.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.4.1,7.5.0)", - org.eclipse.egit.gitflow.op;version="[7.4.1,7.5.0)", - org.eclipse.egit.gitflow.ui;version="[7.4.1,7.5.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", - org.eclipse.jgit.junit;version="[7.4.1,7.5.0)", - org.eclipse.jgit.junit.http;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.resolver;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)", + org.eclipse.egit.gitflow;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow.op;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow.ui;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", + org.eclipse.jgit.junit.http;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.resolver;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.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 a3b234f9cd..4093584802 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 - 7.4.1-SNAPSHOT + 7.5.0-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 index 0f5fd3af4b..b2c2ba8ac5 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,114 +35,114 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.attributes;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.credentials;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.info;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.credentials;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.efs;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.hosts;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.info;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.job;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.rebase;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.signing;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.storage;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.internal.util;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.op;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.project;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.settings;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.synchronize;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.4.1,7.5.0)", - org.eclipse.egit.core.util;version="[7.4.1,7.5.0)", - org.eclipse.jgit.annotations;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api;version="[7.4.1,7.5.0)", - org.eclipse.jgit.api.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.attributes;version="[7.4.1,7.5.0)", - org.eclipse.jgit.blame;version="[7.4.1,7.5.0)", - org.eclipse.jgit.diff;version="[7.4.1,7.5.0)", - org.eclipse.jgit.dircache;version="[7.4.1,7.5.0)", - org.eclipse.jgit.errors;version="[7.4.1,7.5.0)", - org.eclipse.jgit.events;version="[7.4.1,7.5.0)", - org.eclipse.jgit.ignore;version="[7.4.1,7.5.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib;version="[7.4.1,7.5.0)", - org.eclipse.jgit.lib.internal;version="[7.4.1,7.5.0)", - org.eclipse.jgit.merge;version="[7.4.1,7.5.0)", - org.eclipse.jgit.notes;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revplot;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.revwalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.storage.file;version="[7.4.1,7.5.0)", - org.eclipse.jgit.submodule;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport;version="[7.4.1,7.5.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk;version="[7.4.1,7.5.0)", - org.eclipse.jgit.treewalk.filter;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util;version="[7.4.1,7.5.0)", - org.eclipse.jgit.util.io;version="[7.4.1,7.5.0)", +Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.attributes;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.credentials;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.info;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.credentials;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.efs;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.hosts;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.info;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.rebase;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.signing;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.storage;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.internal.util;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.settings;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.synchronize;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.5.0,7.6.0)", + org.eclipse.egit.core.util;version="[7.5.0,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api;version="[7.5.0,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", + org.eclipse.jgit.blame;version="[7.5.0,7.6.0)", + org.eclipse.jgit.diff;version="[7.5.0,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", + org.eclipse.jgit.events;version="[7.5.0,7.6.0)", + org.eclipse.jgit.ignore;version="[7.5.0,7.6.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", + org.eclipse.jgit.lib.internal;version="[7.5.0,7.6.0)", + org.eclipse.jgit.merge;version="[7.5.0,7.6.0)", + org.eclipse.jgit.notes;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revplot;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", + org.eclipse.jgit.submodule;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util;version="[7.5.0,7.6.0)", + org.eclipse.jgit.util.io;version="[7.5.0,7.6.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.commit;version="7.4.1", - org.eclipse.egit.ui.history;version="7.4.1", - org.eclipse.egit.ui.internal;version="7.4.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.4.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.4.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.4.1";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.commit;version="7.5.0", + org.eclipse.egit.ui.history;version="7.5.0", + org.eclipse.egit.ui.internal;version="7.5.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.5.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.5.0";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 0ed7fde221..7bf135ef40 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index cf742eefd1..94ec95fee1 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: 7.4.1.qualifier +Bundle-Version: 7.5.0.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 219f2945a9..af95e6376e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index ff6ad018d7..589ef315a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.4.1-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.13 21 3.40.0 From db827c15c79dda12ab508ac8b69956344e7b6916 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 13 Sep 2025 10:24:41 +0200 Subject: [PATCH 062/160] [oomph] Update and cycle API baselines Add 7.4.0, remove 7.1.0. Change-Id: I1593e3d1e23063ff0b655827337c708fdb41a8c4 --- tools/oomph/EGit.setup | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index ae92189710..78cf7606e2 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -125,15 +125,6 @@ label="EGit 2025-09 (4.37) target"/> Default target platform for EGit development. - - EGit 7.1.0 API baseline; to be used with branch stable-7.2 - - EGit 7.3.0 API baseline; to be used with branch master + EGit 7.3.0 API baseline; to be used with branch stable-7.4 + + + EGit 7.4.0 API baseline; to be used with branch master Date: Sat, 13 Sep 2025 10:41:47 +0200 Subject: [PATCH 063/160] [releng] Set lower bound for Bouncy Castle to 1.81 Require Bouncy Castle 1.81. It was still 1.80, which *should* not have caused any issues since JGit requires 1.81 anyway, but let's be consistent. Change-Id: I5dc3b6340212233fa771f4423f0c0f43ed9b0942 --- org.eclipse.egit.core/META-INF/MANIFEST.MF | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index e1685d8134..cb5277cd64 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -62,10 +62,10 @@ Export-Package: org.eclipse.egit.core;version="7.5.0"; org.eclipse.egit.core.util;version="7.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.bc;version="[1.80.0,2.0.0)", - org.bouncycastle.pkcs;version="[1.80.0,2.0.0)", +Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.81.0,2.0.0)", + org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", + org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", org.eclipse.jgit.api;version="[7.5.0,7.6.0)", From 6cbc966e936e8cedcf2f8f6c9fd02344c84e5388 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 13 Sep 2025 10:44:02 +0200 Subject: [PATCH 064/160] [releng] Consistently use and require Java 21 The MANIFEST.MF files all required JavaSE-21, but the classpath still used JavaSE-17, and compiler compliance was also still Java 17. Change all that consistently to Java 21. Change-Id: I8d86a3b7d8fea1acc20671854c036488ba68b37b --- org.eclipse.egit.core.junit/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.core.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.core/.classpath | 2 +- org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.gitflow.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.gitflow.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.gitflow/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.ui.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.egit.ui/.classpath | 2 +- org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs | 6 +++--- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/org.eclipse.egit.core.junit/.classpath b/org.eclipse.egit.core.junit/.classpath index 8dc2fcad59..a6297e53cf 100644 --- a/org.eclipse.egit.core.junit/.classpath +++ b/org.eclipse.egit.core.junit/.classpath @@ -5,7 +5,7 @@ - + diff --git a/org.eclipse.egit.core.junit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.core.junit/.settings/org.eclipse.jdt.core.prefs index 859862f4d1..77b00fae61 100644 --- a/org.eclipse.egit.core.junit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.core.junit/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.core.test/.classpath b/org.eclipse.egit.core.test/.classpath index 8dc2fcad59..a6297e53cf 100644 --- a/org.eclipse.egit.core.test/.classpath +++ b/org.eclipse.egit.core.test/.classpath @@ -5,7 +5,7 @@ - + diff --git a/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs index c341a35ff2..a674f4401f 100644 --- a/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.core.test/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.core/.classpath b/org.eclipse.egit.core/.classpath index e3378d07f0..09629341ea 100644 --- a/org.eclipse.egit.core/.classpath +++ b/org.eclipse.egit.core/.classpath @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs index 91151ee9b3..ee5d77004f 100644 --- a/org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.core/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.gitflow.test/.classpath b/org.eclipse.egit.gitflow.test/.classpath index f69c88ac79..8c7d1afc29 100644 --- a/org.eclipse.egit.gitflow.test/.classpath +++ b/org.eclipse.egit.gitflow.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.jdt.core.prefs index c341a35ff2..a674f4401f 100644 --- a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.gitflow.ui/.classpath b/org.eclipse.egit.gitflow.ui/.classpath index 21e4abde1b..804e3a0937 100644 --- a/org.eclipse.egit.gitflow.ui/.classpath +++ b/org.eclipse.egit.gitflow.ui/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.jdt.core.prefs index 91151ee9b3..ee5d77004f 100644 --- a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.gitflow/.classpath b/org.eclipse.egit.gitflow/.classpath index 21e4abde1b..804e3a0937 100644 --- a/org.eclipse.egit.gitflow/.classpath +++ b/org.eclipse.egit.gitflow/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.egit.gitflow/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.gitflow/.settings/org.eclipse.jdt.core.prefs index 91151ee9b3..ee5d77004f 100644 --- a/org.eclipse.egit.gitflow/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.gitflow/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.ui.test/.classpath b/org.eclipse.egit.ui.test/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.egit.ui.test/.classpath +++ b/org.eclipse.egit.ui.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.core.prefs index c341a35ff2..a674f4401f 100644 --- a/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/org.eclipse.egit.ui/.classpath b/org.eclipse.egit.ui/.classpath index e3378d07f0..09629341ea 100644 --- a/org.eclipse.egit.ui/.classpath +++ b/org.eclipse.egit.ui/.classpath @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs index 2714bd8f53..1c8005576c 100644 --- a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false From 2cab6b35fd27f6a821021d5b3876e909c8f6fc1f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 25 Sep 2025 22:54:23 +0200 Subject: [PATCH 065/160] Update jgit dependencies - bouncycastle to 1.82 - com.google.code.gson:gson to 2.13.2 - jetty to 12.1.1 - jna to 5.18.0 - org.apache.commons:commons-lang3 to 3.19.0 - org.assertj:assertj-core to 3.27.6 - org.mockito:mockito-core to 5.20.0 Change-Id: Iede34107539feb4f70ec184f178d9e8b4e48c090 --- org.eclipse.egit.target/egit-4.36.target | 38 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 38 +++++++++---------- .../maven/dependencies.tpd | 36 +++++++++--------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 0f19e3591d..2857a2ffbb 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -204,7 +204,7 @@ org.mockito mockito-core - 5.19.0 + 5.20.0 jar @@ -214,13 +214,13 @@ net.java.dev.jna jna - 5.17.0 + 5.18.0 jar net.java.dev.jna jna-platform - 5.17.0 + 5.18.0 jar @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-http - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-io - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-security - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-server - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-session - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-util - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-util-ajax - 12.1.0 + 12.1.1 jar @@ -298,7 +298,7 @@ com.google.code.gson gson - 2.13.1 + 2.13.2 jar @@ -324,25 +324,25 @@ org.bouncycastle bcpg-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcprov-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcpkix-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcutil-jdk18on - 1.81 + 1.82 jar @@ -352,7 +352,7 @@ org.assertj assertj-core - 3.27.4 + 3.27.6 jar @@ -384,7 +384,7 @@ org.apache.commons commons-lang3 - 3.18.0 + 3.19.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 319d873778..8b0a211648 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -204,7 +204,7 @@ org.mockito mockito-core - 5.19.0 + 5.20.0 jar @@ -214,13 +214,13 @@ net.java.dev.jna jna - 5.17.0 + 5.18.0 jar net.java.dev.jna jna-platform - 5.17.0 + 5.18.0 jar @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-http - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-io - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-security - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-server - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-session - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-util - 12.1.0 + 12.1.1 jar org.eclipse.jetty jetty-util-ajax - 12.1.0 + 12.1.1 jar @@ -298,7 +298,7 @@ com.google.code.gson gson - 2.13.1 + 2.13.2 jar @@ -324,25 +324,25 @@ org.bouncycastle bcpg-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcprov-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcpkix-jdk18on - 1.81 + 1.82 jar org.bouncycastle bcutil-jdk18on - 1.81 + 1.82 jar @@ -352,7 +352,7 @@ org.assertj assertj-core - 3.27.4 + 3.27.6 jar @@ -384,7 +384,7 @@ org.apache.commons commons-lang3 - 3.18.0 + 3.19.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index dd8cf1b243..5e47eb59e3 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -19,7 +19,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.18.0" + version = "3.19.0" } dependency { groupId = "commons-io" @@ -55,7 +55,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.4" + version = "3.27.6" } } @@ -68,22 +68,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.81" + version = "1.82" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.81" + version = "1.82" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.81" + version = "1.82" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.81" + version = "1.82" } } @@ -114,7 +114,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.13.1" + version = "2.13.2" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.0" + version = "12.1.1" } dependency { groupId = "jakarta.servlet" @@ -193,12 +193,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.17.0" + version = "5.18.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.17.0" + version = "5.18.0" } } @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.19.0" + version = "5.20.0" } } From 3cb1efcb0230cbe40d308071537097a6c1815429 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 7 Oct 2025 10:34:24 +0200 Subject: [PATCH 066/160] Update jna to 5.18.1 Release notes: https://github.com/java-native-access/jna/blob/master/CHANGES.md Change-Id: I16983f4ab64de832a6db8c92da252d9f6e9a1162 --- org.eclipse.egit.target/egit-4.36.target | 6 +++--- org.eclipse.egit.target/egit-4.37.target | 6 +++--- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 2857a2ffbb..522ca29b56 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -214,13 +214,13 @@ net.java.dev.jna jna - 5.18.0 + 5.18.1 jar net.java.dev.jna jna-platform - 5.18.0 + 5.18.1 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 8b0a211648..b855e18da0 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -214,13 +214,13 @@ net.java.dev.jna jna - 5.18.0 + 5.18.1 jar net.java.dev.jna jna-platform - 5.18.0 + 5.18.1 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 5e47eb59e3..c5bf9729e1 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -193,12 +193,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.18.0" + version = "5.18.1" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.18.0" + version = "5.18.1" } } From d5df000c086dc3bdafabc82df069eb389f4e6ef1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 7 Oct 2025 14:16:45 +0200 Subject: [PATCH 067/160] Add egit-4.38 target platform for Eclipse IDE 2025-12 Change-Id: If7e4fdcd24518368e891e99c8905e7988285a592 --- org.eclipse.egit.target/egit-4.38.target | 405 ++++++++++++++++++ org.eclipse.egit.target/egit-4.38.tpd | 7 + org.eclipse.egit.target/orbit/orbit-4.38.tpd | 75 ++++ .../releasetrain/4.38-2025-12.tpd | 47 ++ 4 files changed, 534 insertions(+) create mode 100644 org.eclipse.egit.target/egit-4.38.target create mode 100644 org.eclipse.egit.target/egit-4.38.tpd create mode 100644 org.eclipse.egit.target/orbit/orbit-4.38.tpd create mode 100644 org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target new file mode 100644 index 0000000000..71c1107156 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.38.target @@ -0,0 +1,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + jar + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + jar + + + org.osgi + org.osgi.service.component.annotations + 1.5.1 + jar + + + org.osgi + org.osgi.service.metatype.annotations + 1.4.1 + jar + + + + + + + org.tukaani + xz + 1.10 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.16.0 + jar + + + org.apache.sshd + sshd-sftp + 2.16.0 + jar + + + + + + + org.mockito + mockito-core + 5.20.0 + jar + + + + + + + net.java.dev.jna + jna + 5.18.1 + jar + + + net.java.dev.jna + jna-platform + 5.18.1 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.1.1 + jar + + + org.eclipse.jetty + jetty-http + 12.1.1 + jar + + + org.eclipse.jetty + jetty-io + 12.1.1 + jar + + + org.eclipse.jetty + jetty-security + 12.1.1 + jar + + + org.eclipse.jetty + jetty-server + 12.1.1 + jar + + + org.eclipse.jetty + jetty-session + 12.1.1 + jar + + + org.eclipse.jetty + jetty-util + 12.1.1 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.1.1 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + com.google.code.gson + gson + 2.13.2 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.17.7 + jar + + + net.bytebuddy + byte-buddy-agent + 1.17.7 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.82 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.82 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.82 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.82 + jar + + + + + + + org.assertj + assertj-core + 3.27.6 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.19.0 + jar + + + org.apache.commons + commons-compress + 1.28.0 + jar + + + org.apache.commons + commons-lang3 + 3.19.0 + jar + + + commons-io + commons-io + 2.20.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.egit.target/egit-4.38.tpd b/org.eclipse.egit.target/egit-4.38.tpd new file mode 100644 index 0000000000..51c7ecd45e --- /dev/null +++ b/org.eclipse.egit.target/egit-4.38.tpd @@ -0,0 +1,7 @@ +target "egit-4.38" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.38.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.38-2025-12.tpd" diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd new file mode 100644 index 0000000000..ad097213e7 --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -0,0 +1,75 @@ +target "orbit-4.38" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" { + aQute.libg [7.1.0.202411251545,7.1.0.202411251545] + bndtools.api [7.1.0.202411251545,7.1.0.202411251545] + com.ibm.icu [77.1.0,77.1.0] + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [1.7.2,1.7.2] + jakarta.activation-api [2.1.4,2.1.4] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.4,4.0.4] + javax.servlet-api [3.1.0,3.1.0] + junit-jupiter-api [5.14.0,5.14.0] + junit-jupiter-engine [5.14.0,5.14.0] + junit-jupiter-migrationsupport [5.14.0,5.14.0] + junit-jupiter-params [5.14.0,5.14.0] + junit-platform-commons [1.14.0,1.14.0] + junit-platform-engine [1.14.0,1.14.0] + junit-platform-launcher [1.14.0,1.14.0] + junit-platform-runner [1.14.0,1.14.0] + junit-platform-suite-api [1.14.0,1.14.0] + junit-platform-suite-commons [1.14.0,1.14.0] + junit-platform-suite-engine [1.14.0,1.14.0] + junit-vintage-engine [5.14.0,5.14.0] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] + org.apache.lucene.analysis-common [10.3.0.v20250914-0700,10.3.0.v20250914-0700] + org.apache.lucene.analysis-smartcn [10.3.0.v20250914-0700,10.3.0.v20250914-0700] + org.apache.lucene.core [10.3.0.v20250914-0700,10.3.0.v20250914-0700] + org.commonmark [0.26.0,0.26.0] + org.commonmark.ext-gfm-tables [0.26.0,0.26.0] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] + org.hamcrest [2.2.0,2.2.0] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.source [2.2.0,2.2.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.objectweb.asm [9.8.0, 9.8.0] + org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.tree [9.8.0, 9.8.0] + org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] + org.objectweb.asm.util [9.8.0, 9.8.0] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd b/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd new file mode 100644 index 0000000000..d3cca98507 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd @@ -0,0 +1,47 @@ +target "4.38-2025-12" with source configurePhase + +location "https://download.eclipse.org/staging/2025-12" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + biz.aQute.repository + biz.aQute.resolve lazy + bndtools.jareditor lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.bndtools.headless.build.manager lazy + org.bndtools.headless.build.plugin.gradle lazy + org.bndtools.templates.template lazy + org.bndtools.templating lazy + org.bndtools.versioncontrol.ignores.manager lazy + org.bndtools.versioncontrol.ignores.plugin.git lazy + org.commonmark lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jdt.core.manipulation lazy + org.eclipse.jdt.ui lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.pde.bnd.ui lazy + org.eclipse.pde.core lazy + org.eclipse.sdk.ide lazy + org.eclipse.search.core lazy + org.eclipse.swt.tools.base lazy + org.osgi.service.http.whiteboard lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} From 4c87e8d6387e36cb71ad62b29794b6236ea6cd06 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 7 Oct 2025 16:26:41 +0200 Subject: [PATCH 068/160] EGit v7.5.0.202510071400-m1 Change-Id: I6adf055d2bf816a25275620ec37a4573e3e37818 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index df3a1e89cf..b66daff8c3 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 e3c5ba40fb..d2258915ec 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a5f8562e68..3c9520d2f3 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 13bb9a76c3..9368a4d02f 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 12050e94e8..10a91f9140 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 cb5277cd64..ba282322c5 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 78e9d9d2f1..91fb7ddf0d 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 b41cf471d3..e0d0dac756 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 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 fa269eb924..2186a9bd6e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95a6503db8..95d109c1a3 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 b1be00acfb..563326a909 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index de9fbc710f..e0be8f49e0 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index e2edae3496..ce6285685a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bd2096945a..23c34fc68b 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 85d83bc490..b96cf24dbd 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 9864495347..5a553a49fa 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8a6f5d2f66..b9b2ddc330 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e998f0fc13..9745c88b90 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2749d84af6..bf106f746b 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 4093584802..cb7833efcc 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 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 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 index b2c2ba8ac5..6781624b20 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7bf135ef40..4243f108b0 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94ec95fee1..b6f78936d5 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510071400-m1 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 af95e6376e..cce3bbd16b 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 589ef315a0..3eb16802e5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0-SNAPSHOT + 7.5.0.202510071400-m1 4.0.13 21 3.40.0 From 7e9ee83c679daa24df9747046e52ec0485e1bfe8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Oct 2025 01:53:20 +0200 Subject: [PATCH 069/160] Prepare 7.5.0-SNAPSHOT builds Change-Id: I3feb82ce7aff519e0ee9188c20842e8ef3eefd26 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index b66daff8c3..df3a1e89cf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-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 d2258915ec..e3c5ba40fb 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 3c9520d2f3..a5f8562e68 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 - 7.5.0.202510071400-m1 + 7.5.0-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 9368a4d02f..13bb9a76c3 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 10a91f9140..12050e94e8 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 - 7.5.0.202510071400-m1 + 7.5.0-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 ba282322c5..cb5277cd64 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 91fb7ddf0d..78e9d9d2f1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-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 e0d0dac756..b41cf471d3 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 2186a9bd6e..fa269eb924 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95d109c1a3..95a6503db8 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 - 7.5.0.202510071400-m1 + 7.5.0-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 563326a909..b1be00acfb 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index e0be8f49e0..de9fbc710f 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 - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index ce6285685a..e2edae3496 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 23c34fc68b..bd2096945a 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 - 7.5.0.202510071400-m1 + 7.5.0-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 b96cf24dbd..85d83bc490 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 5a553a49fa..9864495347 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index b9b2ddc330..8a6f5d2f66 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9745c88b90..e998f0fc13 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 - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index bf106f746b..2749d84af6 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index cb7833efcc..4093584802 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 - 7.5.0.202510071400-m1 + 7.5.0-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 index 6781624b20..b2c2ba8ac5 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 4243f108b0..7bf135ef40 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index b6f78936d5..94ec95fee1 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: 7.5.0.202510071400-m1 +Bundle-Version: 7.5.0.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 cce3bbd16b..af95e6376e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 3eb16802e5..589ef315a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202510071400-m1 + 7.5.0-SNAPSHOT 4.0.13 21 3.40.0 From b71e7a44df017eb8aa1d589fb7dab383264767a1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 16 Oct 2025 01:24:04 +0200 Subject: [PATCH 070/160] Update JGit dependencies and orbit Update dependencies - bytebuddy to 1.17.8 - jetty to 12.1.2 Update orbit - asm to 9.9.0 - com.github.weisj.jsvg to 2.0.0 - commonmark to 0.27.0 - hamcrest to 3.0.0 - also in older target platforms since latest swtbot needs this version to run ui tests - switch from bundle dependency to package import since 3.0 has no split packages anymore - lucene to 10.3.1.v20251013-1000 Change-Id: Ida46c7072ad5cc432301f0314ecee78950c55fc3 --- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 4 +- org.eclipse.egit.target/egit-4.36.target | 26 +++++----- org.eclipse.egit.target/egit-4.37.target | 26 +++++----- org.eclipse.egit.target/egit-4.38.target | 48 +++++++++---------- .../maven/dependencies.tpd | 20 ++++---- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 4 +- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 4 +- org.eclipse.egit.target/orbit/orbit-4.38.tpd | 26 +++++----- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 5 +- 10 files changed, 83 insertions(+), 85 deletions(-) diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 13bb9a76c3..0be6ab24bc 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -12,9 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)", - org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", - org.hamcrest.library;bundle-version="[1.3.0,2.0.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.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="[7.5.0,7.6.0)", @@ -27,6 +25,7 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", org.eclipse.jgit.util;version="[7.5.0,7.6.0)", + org.hamcrest;version="[3.0.0,4.0.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.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index b1be00acfb..5094b37668 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", + org.hamcrest;version="[3.0.0,4.0.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)", - org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)" diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 522ca29b56..c613cafb9b 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -61,12 +61,12 @@ - + - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-http - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-io - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-security - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-server - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-session - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util-ajax - 12.1.1 + 12.1.2 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 jar net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index b855e18da0..795f023c7c 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -62,12 +62,12 @@ - + - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-http - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-io - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-security - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-server - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-session - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util-ajax - 12.1.1 + 12.1.2 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 jar net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 71c1107156..31df4a9480 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -57,25 +57,25 @@ - - - - - + + + + + - + - + - - - - - + + + + + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-http - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-io - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-security - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-server - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-session - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util - 12.1.1 + 12.1.2 jar org.eclipse.jetty jetty-util-ajax - 12.1.1 + 12.1.2 jar @@ -308,13 +308,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 jar net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index c5bf9729e1..3a14d3c77b 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.7" + version = "1.17.8" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.7" + version = "1.17.8" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.1" + version = "12.1.2" } dependency { groupId = "jakarta.servlet" diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index c106c74624..5b709f5944 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -49,12 +49,12 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] - org.hamcrest [2.2.0,2.2.0] + org.hamcrest [3.0.0,3.0.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.source [2.2.0,2.2.0] + org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index 83f5bf11e2..6704b87d28 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -50,12 +50,12 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.lucene.core [10.2.2.v20250621-0700,10.2.2.v20250621-0700] org.commonmark.ext-gfm-tables [0.25.1,0.25.1] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] - org.hamcrest [2.2.0,2.2.0] + org.hamcrest [3.0.0,3.0.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.source [2.2.0,2.2.0] + org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd index ad097213e7..a80782d455 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.38.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -10,7 +10,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.github.weisj.jsvg [1.7.2,1.7.2] + com.github.weisj.jsvg [2.0.0,2.0.0] jakarta.activation-api [2.1.4,2.1.4] jakarta.annotation-api [1.3.5,1.3.5] jakarta.annotation-api [2.1.1,2.1.1] @@ -45,25 +45,25 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] org.apiguardian.api [1.1.2,1.1.2] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] - org.apache.lucene.analysis-common [10.3.0.v20250914-0700,10.3.0.v20250914-0700] - org.apache.lucene.analysis-smartcn [10.3.0.v20250914-0700,10.3.0.v20250914-0700] - org.apache.lucene.core [10.3.0.v20250914-0700,10.3.0.v20250914-0700] - org.commonmark [0.26.0,0.26.0] - org.commonmark.ext-gfm-tables [0.26.0,0.26.0] + org.apache.lucene.analysis-common [10.3.1.v20251013-1000,10.3.1.v20251013-1000] + org.apache.lucene.analysis-smartcn [10.3.1.v20251013-1000,10.3.1.v20251013-1000] + org.apache.lucene.core [10.3.1.v20251013-1000,10.3.1.v20251013-1000] + org.commonmark [0.27.0,0.27.0] + org.commonmark.ext-gfm-tables [0.27.0,0.27.0] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] - org.hamcrest [2.2.0,2.2.0] + org.hamcrest [3.0.0,3.0.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.source [2.2.0,2.2.0] + org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.objectweb.asm [9.8.0, 9.8.0] - org.objectweb.asm.source [9.8.0, 9.8.0] - org.objectweb.asm.tree [9.8.0, 9.8.0] - org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] - org.objectweb.asm.util [9.8.0, 9.8.0] + org.objectweb.asm [9.9.0, 9.9.0] + org.objectweb.asm.source [9.9.0, 9.9.0] + org.objectweb.asm.tree [9.9.0, 9.9.0] + org.objectweb.asm.tree.analysis [9.9.0, 9.9.0] + org.objectweb.asm.util [9.9.0, 9.9.0] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] org.opentest4j [1.3.0,1.3.0] diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 2749d84af6..bf8fef1e77 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -13,9 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)", - org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", - org.hamcrest.library;bundle-version="[1.3.0,2.0.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", org.eclipse.egit.gitflow;version="[7.5.0,7.6.0)", @@ -46,6 +44,7 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.swtbot.swt.finder.utils, org.eclipse.swtbot.swt.finder.waits, org.eclipse.swtbot.swt.finder.widgets, + org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13.0,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", org.junit.runner;version="[4.13.0,5.0.0)", From b3583dabd576cdf4c18cf86ea94a5561ae209899 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 23 Oct 2025 12:51:34 +0200 Subject: [PATCH 071/160] Update jetty to 12.1.3 Change-Id: I554df1f38bd73ee4d7cdea8bafd6070ba1a48c72 --- org.eclipse.egit.target/egit-4.36.target | 18 +++++++++--------- org.eclipse.egit.target/egit-4.37.target | 18 +++++++++--------- org.eclipse.egit.target/egit-4.38.target | 18 +++++++++--------- org.eclipse.egit.target/maven/dependencies.tpd | 16 ++++++++-------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index c613cafb9b..f629209fc3 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-http - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-io - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-security - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-server - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-session - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util-ajax - 12.1.2 + 12.1.3 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 795f023c7c..015efa1516 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-http - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-io - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-security - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-server - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-session - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util-ajax - 12.1.2 + 12.1.3 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 31df4a9480..37c10effa7 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -230,49 +230,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-http - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-io - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-security - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-server - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-session - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util - 12.1.2 + 12.1.3 jar org.eclipse.jetty jetty-util-ajax - 12.1.2 + 12.1.3 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 3a14d3c77b..cd1b130f9c 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.2" + version = "12.1.3" } dependency { groupId = "jakarta.servlet" From 4ba7531befb63e8e73aa5c1ae09aaa89249e34e1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 26 Oct 2025 00:15:58 +0200 Subject: [PATCH 072/160] Remove hamcrest 1.3 since JGit updated to hamcrest 3.0 Change-Id: I0c7227dd04d7bbcdf37b7f7b55af4d9237a0be31 --- org.eclipse.egit.target/egit-4.36.target | 6 +----- org.eclipse.egit.target/egit-4.37.target | 6 +----- org.eclipse.egit.target/egit-4.38.target | 6 +----- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 4 ---- org.eclipse.egit.target/orbit/orbit-4.37.tpd | 4 ---- org.eclipse.egit.target/orbit/orbit-4.38.tpd | 4 ---- 6 files changed, 3 insertions(+), 27 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index f629209fc3..61642b3a09 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -62,10 +62,6 @@ - - - - diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 015efa1516..13b78453ef 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -63,10 +63,6 @@ - - - - diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 37c10effa7..1d5ea349eb 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -64,10 +64,6 @@ - - - - diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index 5b709f5944..d771f2fb57 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -50,10 +50,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [3.0.0,3.0.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index 6704b87d28..b315b5884b 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -51,10 +51,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.commonmark.ext-gfm-tables [0.25.1,0.25.1] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [3.0.0,3.0.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd index a80782d455..a4b0e8b780 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.38.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -52,10 +52,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.commonmark.ext-gfm-tables [0.27.0,0.27.0] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [3.0.0,3.0.0] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] From 2da407ff65f46c4c62c562f30bb89ef294ddf342 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 26 Oct 2025 22:00:50 +0100 Subject: [PATCH 073/160] Update slf4j to 2.0.17 Bug: egit-111 Change-Id: Ia07e11f35786f6d16a3160dbd0fcc4c35668a93b --- org.eclipse.egit.target/egit-4.36.target | 6 +++--- org.eclipse.egit.target/egit-4.37.target | 6 +++--- org.eclipse.egit.target/egit-4.38.target | 6 +++--- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 61642b3a09..d1c3c18c05 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -168,13 +168,13 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.17 jar org.slf4j slf4j-simple - 1.7.36 + 2.0.17 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 13b78453ef..51f8a2445d 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -168,13 +168,13 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.17 jar org.slf4j slf4j-simple - 1.7.36 + 2.0.17 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 1d5ea349eb..04b0f02b38 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -168,13 +168,13 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.17 jar org.slf4j slf4j-simple - 1.7.36 + 2.0.17 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index cd1b130f9c..76fdb1137d 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -242,12 +242,12 @@ maven slf4j dependency { groupId = "org.slf4j" artifactId = "slf4j-api" - version = "1.7.36" + version = "2.0.17" } dependency { groupId = "org.slf4j" artifactId = "slf4j-simple" - version = "1.7.36" + version = "2.0.17" } } diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index bf8fef1e77..3ae34d5d37 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -54,4 +54,4 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.mockito.junit;version="[5.4.0,6.0.0)", org.mockito.stubbing;version="[5.4.0,6.0.0)", org.osgi.framework;version="[1.4.0,2.0.0)", - org.slf4j;version="[1.7.0,2.0.0)" + org.slf4j;version="[1.7.0,3.0.0)" From 1ce00c0722afb2943504126c3a21ed7e8a726911 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Oct 2025 15:53:28 +0100 Subject: [PATCH 074/160] Add org.apache.aries.spifly.dynamic.bundle and its dependencies to the target platform and the p2 repository. This was missed in the update to slf4j 2.0.17 (Ia07e11f35786f) which needs spifly to load slf4j implementations dynamically at runtime in an OSGi runtime environment. Change-Id: Ifef62c48143dc7103210274f82663084b397336d --- org.eclipse.egit.repository/category.xml | 18 ++++++++++++++++++ org.eclipse.egit.target/egit-4.36.target | 4 +++- org.eclipse.egit.target/egit-4.37.target | 4 +++- org.eclipse.egit.target/egit-4.38.target | 4 +++- org.eclipse.egit.target/orbit/orbit-4.36.tpd | 2 ++ org.eclipse.egit.target/orbit/orbit-4.37.tpd | 2 ++ org.eclipse.egit.target/orbit/orbit-4.38.tpd | 2 ++ 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index 8e280dc19f..91693f0ce9 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -234,6 +234,24 @@ + + + + + + + + + + + + + + + + + + Versioning with Git and integration with Gerrit Code Review diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index d1c3c18c05..1dbab34ae6 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -44,6 +44,7 @@ + @@ -68,6 +69,7 @@ + diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 51f8a2445d..6f197964ed 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -44,6 +44,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 04b0f02b38..3a0b492c37 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -45,6 +45,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/org.eclipse.egit.target/orbit/orbit-4.36.tpd b/org.eclipse.egit.target/orbit/orbit-4.36.tpd index d771f2fb57..e5c792b322 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.36.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.36.tpd @@ -32,6 +32,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 junit-vintage-engine [5.12.2,5.12.2] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] @@ -56,6 +57,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] org.objectweb.asm [9.8.0, 9.8.0] org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.commons [9.8.0, 9.8.0] org.objectweb.asm.tree [9.8.0, 9.8.0] org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] org.objectweb.asm.util [9.8.0, 9.8.0] diff --git a/org.eclipse.egit.target/orbit/orbit-4.37.tpd b/org.eclipse.egit.target/orbit/orbit-4.37.tpd index b315b5884b..7973b06266 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.37.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.37.tpd @@ -32,6 +32,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 junit-vintage-engine [5.13.4,5.13.4] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] @@ -57,6 +58,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] org.objectweb.asm [9.8.0, 9.8.0] org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.commons [9.8.0, 9.8.0] org.objectweb.asm.tree [9.8.0, 9.8.0] org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] org.objectweb.asm.util [9.8.0, 9.8.0] diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd index a4b0e8b780..caa85e1f3a 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.38.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -33,6 +33,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 junit-vintage-engine [5.14.0,5.14.0] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] @@ -57,6 +58,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.objectweb.asm [9.9.0, 9.9.0] org.objectweb.asm.source [9.9.0, 9.9.0] + org.objectweb.asm.commons [9.9.0,9.9.0] org.objectweb.asm.tree [9.9.0, 9.9.0] org.objectweb.asm.tree.analysis [9.9.0, 9.9.0] org.objectweb.asm.util [9.9.0, 9.9.0] From bfe4117246dbc7f9c01cbfad588b27041bbbe702 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Oct 2025 04:00:51 +0100 Subject: [PATCH 075/160] EGit v7.5.0.202510290248-m Change-Id: I13973c9dd1e4148439468c458469e50c7868183c Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index df3a1e89cf..a8fb52b04c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 e3c5ba40fb..464031ed8e 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a5f8562e68..5f2d4956c3 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 0be6ab24bc..57bfe91c32 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 12050e94e8..76ebf9eef7 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 cb5277cd64..fddd280ec4 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 78e9d9d2f1..a0c94df390 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 b41cf471d3..415d1a759e 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m 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 fa269eb924..d05b0ef7e4 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95a6503db8..688f63b356 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 5094b37668..04185ff72d 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index de9fbc710f..1a2dad20c4 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index e2edae3496..4a0037540c 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bd2096945a..86284f5d9d 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 85d83bc490..a5f9d4facf 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 9864495347..512c8c53b6 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8a6f5d2f66..57c4e8cebd 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e998f0fc13..72b46e5d09 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 3ae34d5d37..d5c3a29e4a 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 4093584802..ae8f9eb203 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 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 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 index b2c2ba8ac5..00073cf5ad 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7bf135ef40..1298109d9f 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94ec95fee1..58363853d9 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202510290248-m 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 af95e6376e..fb348675e7 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m org.eclipse.egit diff --git a/pom.xml b/pom.xml index 589ef315a0..82986c5afe 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0-SNAPSHOT + 7.5.0.202510290248-m 4.0.13 21 3.40.0 From f8e70b4b5ea260080ffc8d0f59fc7ae6b48d10cb Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Oct 2025 14:26:22 +0100 Subject: [PATCH 076/160] EGit v7.5.0.202510290248-m2 Change-Id: Ide405e02fe2e62360dc772567c0b51aab392a782 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a8fb52b04c..615324fb61 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 464031ed8e..f52480f8fe 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 5f2d4956c3..d54595b11e 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 57bfe91c32..2dffabd886 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 76ebf9eef7..c0873d2bbd 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 fddd280ec4..4360a40ce6 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index a0c94df390..946e20cd95 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 415d1a759e..6177ca3e6c 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 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 d05b0ef7e4..9ede3c710d 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 688f63b356..a74b6131dd 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 04185ff72d..e4f3fe3360 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 1a2dad20c4..569b3fb09b 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 4a0037540c..bb6b967bd2 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 86284f5d9d..937a820f36 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 a5f9d4facf..13f7882db7 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 512c8c53b6..3c4bcb46f2 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 57c4e8cebd..eadd732c2b 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 72b46e5d09..8914b5813f 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index d5c3a29e4a..947add95e4 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index ae8f9eb203..3a8711cba0 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 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 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 index 00073cf5ad..2ec9f81655 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 1298109d9f..dd8d5f0c97 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 58363853d9..a083b4da04 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: 7.5.0.202510290248-m +Bundle-Version: 7.5.0.202510290248-m2 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 fb348675e7..50e9db43f9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 82986c5afe..abcbc4c133 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202510290248-m + 7.5.0.202510290248-m2 4.0.13 21 3.40.0 From f01590777030e1d39392d09313614ed6ae5161d0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 30 Oct 2025 10:41:07 +0100 Subject: [PATCH 077/160] Prepare 7.5.0-SNAPSHOT builds Change-Id: Id535e33641d93ce8907d5ca9abce9c3d011145f8 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 615324fb61..df3a1e89cf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-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 f52480f8fe..e3c5ba40fb 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index d54595b11e..a5f8562e68 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 - 7.5.0.202510290248-m2 + 7.5.0-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 2dffabd886..0be6ab24bc 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index c0873d2bbd..12050e94e8 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 - 7.5.0.202510290248-m2 + 7.5.0-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 4360a40ce6..cb5277cd64 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 946e20cd95..78e9d9d2f1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-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 6177ca3e6c..b41cf471d3 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 9ede3c710d..fa269eb924 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index a74b6131dd..95a6503db8 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 - 7.5.0.202510290248-m2 + 7.5.0-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 e4f3fe3360..5094b37668 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 569b3fb09b..de9fbc710f 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 - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index bb6b967bd2..e2edae3496 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 937a820f36..bd2096945a 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 - 7.5.0.202510290248-m2 + 7.5.0-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 13f7882db7..85d83bc490 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 3c4bcb46f2..9864495347 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index eadd732c2b..8a6f5d2f66 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 8914b5813f..e998f0fc13 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 - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 947add95e4..3ae34d5d37 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 3a8711cba0..4093584802 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 - 7.5.0.202510290248-m2 + 7.5.0-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 index 2ec9f81655..b2c2ba8ac5 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index dd8d5f0c97..7bf135ef40 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index a083b4da04..94ec95fee1 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: 7.5.0.202510290248-m2 +Bundle-Version: 7.5.0.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 50e9db43f9..af95e6376e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index abcbc4c133..589ef315a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202510290248-m2 + 7.5.0-SNAPSHOT 4.0.13 21 3.40.0 From 3495c5ec5cebd3919eeaeb836db30295cde959aa Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Mon, 3 Nov 2025 11:06:07 +0100 Subject: [PATCH 078/160] BranchOperationsUI: Update UI elements sooner after checkout Originally, after a checkout was performed, a refresh on the decorator was performed without updating the decorator's cache. This had the consequence that the UI (labels, nodes, staging view, etc) were not really updated since the cache still contained the old state of the repository i.e. the old branch name. The code has been corrected and it clears the cache for the affected repository before asking for a UI refresh, forcing the cache to fetch the name of the branch again before updating the UI. Bug: egit-114 Change-Id: I50d7d9d42203d7bbc793fd527337de126bc42462 --- .../org/eclipse/egit/ui/internal/branch/BranchOperationUI.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java index 92aeb6ff45..8af3fffe7b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java @@ -40,6 +40,7 @@ import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.UIRepositoryUtils; import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.egit.ui.internal.decorators.DecoratorRepositoryStateCache; import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator; import org.eclipse.egit.ui.internal.dialogs.NonDeletedFilesDialog; import org.eclipse.egit.ui.internal.repository.CreateBranchWizard; @@ -278,6 +279,8 @@ public IStatus run(IProgressMonitor monitor) { return Activator .createErrorStatus(UIText.BranchAction_branchFailed, e); } finally { + Arrays.stream(repositories) + .forEach(DecoratorRepositoryStateCache.INSTANCE::clear); GitLightweightDecorator.refresh(); monitor.done(); } From 1e497e4a5927be430905ac17869f6790672b527b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 10 Nov 2025 16:20:57 +0100 Subject: [PATCH 079/160] Update JGit dependencies - commons-io:commons-io to 2.21.0 - commons-codec:commons-codec to 1.20.0 Change-Id: I4ac7a949f064e7c8c592ffbe3db3a1e4471f9d87 --- org.eclipse.egit.target/egit-4.36.target | 6 +++--- org.eclipse.egit.target/egit-4.37.target | 6 +++--- org.eclipse.egit.target/egit-4.38.target | 6 +++--- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 1dbab34ae6..0896bbdf4d 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.19.0 + 1.20.0 jar @@ -388,7 +388,7 @@ commons-io commons-io - 2.20.0 + 2.21.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 6f197964ed..a6b61dbe24 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.19.0 + 1.20.0 jar @@ -388,7 +388,7 @@ commons-io commons-io - 2.20.0 + 2.21.0 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 3a0b492c37..98e0dc1f91 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.19.0 + 1.20.0 jar @@ -388,7 +388,7 @@ commons-io commons-io - 2.20.0 + 2.21.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 76fdb1137d..9ca32bb661 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -9,7 +9,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.19.0" + version = "1.20.0" } dependency { groupId = "org.apache.commons" @@ -24,7 +24,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.20.0" + version = "2.21.0" } dependency { groupId = "commons-logging" From e36c9fb64eba1c433c3c85e761b7c2715605563f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 18 Nov 2025 16:24:02 +0100 Subject: [PATCH 080/160] Update Orbit 4.38 dependencies - junit to 5.14.1 - junit-platform to 1.14.1 - com.ibm.icu to 78.1.0 Change-Id: I43e0d2bb019d5733a870d4f2b4c0a58621acc286 --- org.eclipse.egit.target/egit-4.38.target | 28 ++++++++++---------- org.eclipse.egit.target/orbit/orbit-4.38.tpd | 26 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 98e0dc1f91..3f4967ae2e 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -31,18 +31,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd index caa85e1f3a..231cc13c52 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.38.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -5,7 +5,7 @@ target "orbit-4.38" with source configurePhase location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" { aQute.libg [7.1.0.202411251545,7.1.0.202411251545] bndtools.api [7.1.0.202411251545,7.1.0.202411251545] - com.ibm.icu [77.1.0,77.1.0] + com.ibm.icu [78.1.0,78.1.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] @@ -19,18 +19,18 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 jakarta.xml.bind-api [2.3.3,2.3.3] jakarta.xml.bind-api [4.0.4,4.0.4] javax.servlet-api [3.1.0,3.1.0] - junit-jupiter-api [5.14.0,5.14.0] - junit-jupiter-engine [5.14.0,5.14.0] - junit-jupiter-migrationsupport [5.14.0,5.14.0] - junit-jupiter-params [5.14.0,5.14.0] - junit-platform-commons [1.14.0,1.14.0] - junit-platform-engine [1.14.0,1.14.0] - junit-platform-launcher [1.14.0,1.14.0] - junit-platform-runner [1.14.0,1.14.0] - junit-platform-suite-api [1.14.0,1.14.0] - junit-platform-suite-commons [1.14.0,1.14.0] - junit-platform-suite-engine [1.14.0,1.14.0] - junit-vintage-engine [5.14.0,5.14.0] + junit-jupiter-api [5.14.1,5.14.1] + junit-jupiter-engine [5.14.1,5.14.1] + junit-jupiter-migrationsupport [5.14.1,5.14.1] + junit-jupiter-params [5.14.1,5.14.1] + junit-platform-commons [1.14.1,1.14.1] + junit-platform-engine [1.14.1,1.14.1] + junit-platform-launcher [1.14.1,1.14.1] + junit-platform-runner [1.14.1,1.14.1] + junit-platform-suite-api [1.14.1,1.14.1] + junit-platform-suite-commons [1.14.1,1.14.1] + junit-platform-suite-engine [1.14.1,1.14.1] + junit-vintage-engine [5.14.1,5.14.1] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] From 87ad500944fbceec2436fccc3be728b3e55a810d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 18 Nov 2025 16:40:10 +0100 Subject: [PATCH 081/160] Update jgit dependencies - bytebuddy to 1.18.1 - commons-lang3 to 3.20.0 - jetty to 12.1.4 Change-Id: I46dc23e688f69b338f9201b513d7822c886af5f6 --- org.eclipse.egit.target/egit-4.36.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.38.target | 24 +++++++++---------- .../maven/dependencies.tpd | 22 ++++++++--------- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 0896bbdf4d..1af3d87968 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-http - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-io - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-security - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-server - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-session - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util-ajax - 12.1.3 + 12.1.4 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.18.1 jar net.bytebuddy byte-buddy-agent - 1.17.8 + 1.18.1 jar @@ -382,7 +382,7 @@ org.apache.commons commons-lang3 - 3.19.0 + 3.20.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index a6b61dbe24..d76b4ab11a 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-http - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-io - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-security - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-server - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-session - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util-ajax - 12.1.3 + 12.1.4 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.18.1 jar net.bytebuddy byte-buddy-agent - 1.17.8 + 1.18.1 jar @@ -382,7 +382,7 @@ org.apache.commons commons-lang3 - 3.19.0 + 3.20.0 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 3f4967ae2e..7aee34848f 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-http - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-io - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-security - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-server - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-session - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util - 12.1.3 + 12.1.4 jar org.eclipse.jetty jetty-util-ajax - 12.1.3 + 12.1.4 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.18.1 jar net.bytebuddy byte-buddy-agent - 1.17.8 + 1.18.1 jar @@ -382,7 +382,7 @@ org.apache.commons commons-lang3 - 3.19.0 + 3.20.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 9ca32bb661..969f4d4ff7 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -19,7 +19,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.19.0" + version = "3.20.0" } dependency { groupId = "commons-io" @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.17.8" + version = "1.18.1" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.17.8" + version = "1.18.1" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.3" + version = "12.1.4" } dependency { groupId = "jakarta.servlet" From 40afdd84441637c5b2fada3bd4216e658eb002fe Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 19 Nov 2025 00:00:51 +0100 Subject: [PATCH 082/160] EGit v7.5.0.202511181624-m3 Change-Id: I7ad3c1e8a5266deed985982532a9f41fc40bc36f Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index df3a1e89cf..0b245475ee 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 e3c5ba40fb..8e55aa4e94 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a5f8562e68..75d66d9059 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 0be6ab24bc..4282abb902 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 12050e94e8..3b6c21059f 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 cb5277cd64..068aa1fda6 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 78e9d9d2f1..3ca4207b22 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 b41cf471d3..fddd2b5560 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 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 fa269eb924..a9c1bb515b 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95a6503db8..724c840026 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 5094b37668..6209531adf 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index de9fbc710f..e73fabb8c5 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index e2edae3496..62f84e8d7b 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bd2096945a..35766f9c67 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 85d83bc490..4ba938b669 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 9864495347..ba0198d1b7 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8a6f5d2f66..be341c444d 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e998f0fc13..37c6feaacf 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 3ae34d5d37..c97531a98c 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 4093584802..24031616b4 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 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 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 index b2c2ba8ac5..1756f719ed 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7bf135ef40..1353e1190f 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94ec95fee1..8823fc55a5 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511181624-m3 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 af95e6376e..0c94d30633 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 589ef315a0..b03445fb0c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0-SNAPSHOT + 7.5.0.202511181624-m3 4.0.13 21 3.40.0 From 95192d439525b06e66aefb5150f83c4b23f08688 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 19 Nov 2025 12:28:05 +0100 Subject: [PATCH 083/160] Prepare 7.5.0-SNAPSHOT builds Change-Id: I46f8c7cb78b2a3773ec472db2fbeef1839eff4ae --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 0b245475ee..df3a1e89cf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-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 8e55aa4e94..e3c5ba40fb 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 75d66d9059..a5f8562e68 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 - 7.5.0.202511181624-m3 + 7.5.0-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 4282abb902..0be6ab24bc 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 3b6c21059f..12050e94e8 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 - 7.5.0.202511181624-m3 + 7.5.0-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 068aa1fda6..cb5277cd64 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 3ca4207b22..78e9d9d2f1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-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 fddd2b5560..b41cf471d3 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index a9c1bb515b..fa269eb924 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 724c840026..95a6503db8 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 - 7.5.0.202511181624-m3 + 7.5.0-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 6209531adf..5094b37668 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index e73fabb8c5..de9fbc710f 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 - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 62f84e8d7b..e2edae3496 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 35766f9c67..bd2096945a 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 - 7.5.0.202511181624-m3 + 7.5.0-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 4ba938b669..85d83bc490 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index ba0198d1b7..9864495347 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index be341c444d..8a6f5d2f66 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 37c6feaacf..e998f0fc13 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 - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index c97531a98c..3ae34d5d37 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 24031616b4..4093584802 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 - 7.5.0.202511181624-m3 + 7.5.0-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 index 1756f719ed..b2c2ba8ac5 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 1353e1190f..7bf135ef40 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8823fc55a5..94ec95fee1 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: 7.5.0.202511181624-m3 +Bundle-Version: 7.5.0.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 0c94d30633..af95e6376e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index b03445fb0c..589ef315a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202511181624-m3 + 7.5.0-SNAPSHOT 4.0.13 21 3.40.0 From 514726c911db56619e02715c45d8d2edef5a9b8e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 21 Nov 2025 12:55:02 +0100 Subject: [PATCH 084/160] Update org.tukaani:xz to 1.11 Change-Id: I1d4a6b514cfe4fc88e3d4cda213df6499eb53f95 --- org.eclipse.egit.target/egit-4.36.target | 4 ++-- org.eclipse.egit.target/egit-4.37.target | 4 ++-- org.eclipse.egit.target/egit-4.38.target | 4 ++-- org.eclipse.egit.target/maven/dependencies.tpd | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 1af3d87968..ad8f30559e 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.10 + 1.11 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index d76b4ab11a..ebc967de87 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.10 + 1.11 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 7aee34848f..86fb55f977 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.10 + 1.11 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 969f4d4ff7..db547e2856 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -260,7 +260,7 @@ maven xz dependency { groupId = "org.tukaani" artifactId = "xz" - version = "1.10" + version = "1.11" } } From 34a30e9bdf4178ee685411fdcffb3128abedccdf Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Thu, 20 Nov 2025 09:02:38 +0100 Subject: [PATCH 085/160] org.eclipse.egit.ui.api: Create the package and make it API Move these classes into it: - IBranchNameProvider - ICommitMessageProvider - ICommitMessageProvider2 - CommitMessageWithCaretPosition (necessary because it is the return type of ICommitMessageProvider2.getCommitMessageWithPosition) Bug: egit-119 Change-Id: I021ef476934872f2d61c781792f20f0cdcf6952f --- .../ui/internal/dialogs/CommitMessageBuilderTest.java | 6 +++--- .../egit/ui/test/stagview/CommitMessageProvidersTest.java | 6 +++--- .../TestCommitMessageProviderExtensionFactory.java | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 1 + org.eclipse.egit.ui/schema/commitMessageProvider.exsd | 8 ++++---- .../egit/ui/{ => api}/CommitMessageWithCaretPosition.java | 4 +++- .../eclipse/egit/ui/{ => api}/IBranchNameProvider.java | 4 +++- .../eclipse/egit/ui/{ => api}/ICommitMessageProvider.java | 6 ++++-- .../egit/ui/{ => api}/ICommitMessageProvider2.java | 3 ++- .../egit/ui/internal/dialogs/CommitMessageBuilder.java | 6 +++--- .../egit/ui/internal/dialogs/CommitMessageComponent.java | 2 +- .../egit/ui/internal/repository/CreateBranchPage.java | 2 +- .../src/org/eclipse/egit/ui/internal/uitext.properties | 2 +- 13 files changed, 30 insertions(+), 22 deletions(-) rename org.eclipse.egit.ui/src/org/eclipse/egit/ui/{ => api}/CommitMessageWithCaretPosition.java (97%) rename org.eclipse.egit.ui/src/org/eclipse/egit/ui/{ => api}/IBranchNameProvider.java (94%) rename org.eclipse.egit.ui/src/org/eclipse/egit/ui/{ => api}/ICommitMessageProvider.java (94%) rename org.eclipse.egit.ui/src/org/eclipse/egit/ui/{ => api}/ICommitMessageProvider2.java (96%) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java index 1437de4734..52c06d4b53 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java @@ -21,9 +21,9 @@ import org.eclipse.core.resources.IResource; import org.eclipse.egit.core.test.GitTestCase; import org.eclipse.egit.core.test.TestRepository; -import org.eclipse.egit.ui.CommitMessageWithCaretPosition; -import org.eclipse.egit.ui.ICommitMessageProvider; -import org.eclipse.egit.ui.ICommitMessageProvider2; +import org.eclipse.egit.ui.api.CommitMessageWithCaretPosition; +import org.eclipse.egit.ui.api.ICommitMessageProvider; +import org.eclipse.egit.ui.api.ICommitMessageProvider2; import org.eclipse.jgit.lib.Constants; import org.junit.After; import org.junit.Before; diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitMessageProvidersTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitMessageProvidersTest.java index 8cdb8ca6ff..2b21deb284 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitMessageProvidersTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/CommitMessageProvidersTest.java @@ -13,9 +13,9 @@ import static org.junit.Assert.assertEquals; import org.eclipse.core.resources.IResource; -import org.eclipse.egit.ui.CommitMessageWithCaretPosition; -import org.eclipse.egit.ui.ICommitMessageProvider; -import org.eclipse.egit.ui.ICommitMessageProvider2; +import org.eclipse.egit.ui.api.CommitMessageWithCaretPosition; +import org.eclipse.egit.ui.api.ICommitMessageProvider; +import org.eclipse.egit.ui.api.ICommitMessageProvider2; import org.eclipse.egit.ui.common.StagingViewTester; import org.junit.After; import org.junit.Test; diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/TestCommitMessageProviderExtensionFactory.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/TestCommitMessageProviderExtensionFactory.java index 18393f8756..d25ff6ca24 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/TestCommitMessageProviderExtensionFactory.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/TestCommitMessageProviderExtensionFactory.java @@ -17,7 +17,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IExecutableExtensionFactory; -import org.eclipse.egit.ui.ICommitMessageProvider; +import org.eclipse.egit.ui.api.ICommitMessageProvider; public class TestCommitMessageProviderExtensionFactory implements IExecutableExtensionFactory { diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index b2c2ba8ac5..48fbd0283e 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -85,6 +85,7 @@ Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", org.eclipse.jgit.util.io;version="[7.5.0,7.6.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" Export-Package: org.eclipse.egit.ui;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.api;version="7.5.0", org.eclipse.egit.ui.commit;version="7.5.0", org.eclipse.egit.ui.history;version="7.5.0", org.eclipse.egit.ui.internal;version="7.5.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", diff --git a/org.eclipse.egit.ui/schema/commitMessageProvider.exsd b/org.eclipse.egit.ui/schema/commitMessageProvider.exsd index cb9562f0aa..8675c0225e 100644 --- a/org.eclipse.egit.ui/schema/commitMessageProvider.exsd +++ b/org.eclipse.egit.ui/schema/commitMessageProvider.exsd @@ -57,10 +57,10 @@ - Points to the implementation class of the org.eclipse.egit.ui.ICommitMessageProvider. + Points to the implementation class of the org.eclipse.egit.ui.api.ICommitMessageProvider. - + @@ -82,8 +82,8 @@ - There is an interface org.eclipse.egit.ui.ICommitMessageProvider, which you must implement to use the extension point. -There is an interface org.eclipse.egit.ui.ICommitMessageProvider2, which extends ICommitMessageProvider. Implement this interface, if you want to provide a commit message and a caret position. + There is an interface org.eclipse.egit.ui.api.ICommitMessageProvider, which you must implement to use the extension point. +There is an interface org.eclipse.egit.ui.api.ICommitMessageProvider2, which extends ICommitMessageProvider. Implement this interface, if you want to provide a commit message and a caret position. diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/CommitMessageWithCaretPosition.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java similarity index 97% rename from org.eclipse.egit.ui/src/org/eclipse/egit/ui/CommitMessageWithCaretPosition.java rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java index e1ba4b5937..6549256d42 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/CommitMessageWithCaretPosition.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java @@ -8,12 +8,14 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.egit.ui; +package org.eclipse.egit.ui.api; import java.util.Objects; /** * This class represents a commit message with a caret position. + * + * @since 7.5 */ public class CommitMessageWithCaretPosition { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/IBranchNameProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/IBranchNameProvider.java similarity index 94% rename from org.eclipse.egit.ui/src/org/eclipse/egit/ui/IBranchNameProvider.java rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/IBranchNameProvider.java index a5d3d798d0..90b1e4d496 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/IBranchNameProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/IBranchNameProvider.java @@ -9,10 +9,12 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.egit.ui; +package org.eclipse.egit.ui.api; /** * A branch name provider suggests a branch name based on current context. + * + * @since 7.5 */ public interface IBranchNameProvider { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider.java similarity index 94% rename from org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider.java rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider.java index 361faf3465..3adb26ef8d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider.java @@ -9,7 +9,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.egit.ui; +package org.eclipse.egit.ui.api; import org.eclipse.core.resources.IResource; import org.eclipse.egit.ui.internal.dialogs.CommitDialog; @@ -17,9 +17,11 @@ /** * This interface must be implemented to be a commit message provider. A commit * message provider provides the complete or a fragment of a commit message. - * This message will be added to the text field in the {@link CommitDialog}.
+ * This message will be added to the text field in the {@link CommitDialog}. + *
* * @see CommitDialog + * @since 7.5 */ public interface ICommitMessageProvider { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider2.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider2.java similarity index 96% rename from org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider2.java rename to org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider2.java index ede529f7b1..9c54f20c60 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/ICommitMessageProvider2.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/ICommitMessageProvider2.java @@ -9,7 +9,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.egit.ui; +package org.eclipse.egit.ui.api; import org.eclipse.core.resources.IResource; import org.eclipse.egit.ui.internal.dialogs.CommitDialog; @@ -22,6 +22,7 @@ * * @see ICommitMessageProvider * @see CommitDialog + * @since 7.5 */ public interface ICommitMessageProvider2 extends ICommitMessageProvider { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java index 64089264be..85338f54ff 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java @@ -27,9 +27,9 @@ import org.eclipse.egit.core.internal.util.ProjectUtil; import org.eclipse.egit.core.internal.util.ResourceUtil; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.CommitMessageWithCaretPosition; -import org.eclipse.egit.ui.ICommitMessageProvider; -import org.eclipse.egit.ui.ICommitMessageProvider2; +import org.eclipse.egit.ui.api.CommitMessageWithCaretPosition; +import org.eclipse.egit.ui.api.ICommitMessageProvider; +import org.eclipse.egit.ui.api.ICommitMessageProvider2; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java index ddf317c69d..969b090277 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java @@ -30,10 +30,10 @@ import org.eclipse.egit.core.op.EGitGpgConfig; import org.eclipse.egit.core.util.RevCommitUtils; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.CommitMessageWithCaretPosition; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.UIUtils.IPreviousValueProposalHandler; +import org.eclipse.egit.ui.api.CommitMessageWithCaretPosition; import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.commit.CommitHelper; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java index 93c50efa87..59b23902bb 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java @@ -34,8 +34,8 @@ import org.eclipse.egit.core.internal.SafeRunnable; import org.eclipse.egit.core.internal.Utils; import org.eclipse.egit.core.op.CreateLocalBranchOperation; -import org.eclipse.egit.ui.IBranchNameProvider; import org.eclipse.egit.ui.UIUtils; +import org.eclipse.egit.ui.api.IBranchNameProvider; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.ValidationUtils; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 7981272a66..2e69b50038 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -914,7 +914,7 @@ CommitDialog_Path=Path CommitDialog_Title=Commit Changes to {0} CommitDialog_IgnoreErrors=Ignore warnings and errors CommitDialog_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them -CommitDialog_WrongTypeOfCommitMessageProvider=The CommitMessageProvider extension {0} contributed by {1} has the wrong type (it must implement org.eclipse.egit.ui.ICommitMessageProvider) +CommitDialog_WrongTypeOfCommitMessageProvider=The CommitMessageProvider extension {0} contributed by {1} has the wrong type (it must implement org.eclipse.egit.ui.api.ICommitMessageProvider) CommitDialog_ErrorCreatingCommitMessageProvider=The CommitMessageProvider extension {0} contributed by {1} could not be created CommitDialog_CaretPositionOutOfBounds=The ICommitMessageProvider2 implementation {0} provided the caret position {1}, which exceeds the length of the commit message or is negative. The caret position is ignored. CommitDialog_IgnoreCaretPosition=Found multiple implementations of ICommitMessageProvider2. Ignoring caret positioning for {0}. From aa9d269438ed942ab05161dbee562769f561087b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 23 Nov 2025 00:58:54 +0100 Subject: [PATCH 086/160] Migrate CommitMessageWithCaretPosition to a Java record Change-Id: I33fe0f1a449bc951d071f8227a248e1eaa7cf556 --- .../dialogs/CommitMessageBuilderTest.java | 44 ++++++------- .../api/CommitMessageWithCaretPosition.java | 64 ++----------------- .../dialogs/CommitMessageBuilder.java | 6 +- .../dialogs/CommitMessageComponent.java | 4 +- 4 files changed, 33 insertions(+), 85 deletions(-) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java index 52c06d4b53..f0548e47f7 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilderTest.java @@ -58,7 +58,7 @@ public void commitMessageProvider_noProvider() throws Exception { CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals("", commitMessageWithPosition.getMessage()); + assertEquals("", commitMessageWithPosition.message()); } @Test @@ -71,7 +71,7 @@ public void commitMessageProvider_oneProvider() throws Exception { CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals(message, commitMessageWithPosition.getMessage()); + assertEquals(message, commitMessageWithPosition.message()); } @Test @@ -86,7 +86,7 @@ public void commitMessageProvider_twoProviders() throws Exception { .build(); assertEquals(message1 + "\n\n" + message2, - commitMessageWithPosition.getMessage()); + commitMessageWithPosition.message()); } @Test @@ -98,7 +98,7 @@ public void commitMessageProvider_oneCrashingProvider() throws Exception { CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals("", commitMessageWithPosition.getMessage()); + assertEquals("", commitMessageWithPosition.message()); } @Test @@ -111,9 +111,9 @@ public void commitMessageProvider_oneCrashingProviderWithCaretPosition() { CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals("", commitMessageWithPosition.getMessage()); + assertEquals("", commitMessageWithPosition.message()); assertEquals(CommitMessageComponentState.CARET_DEFAULT_POSITION, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -129,7 +129,7 @@ public void commitMessageProvider_twoProvidersSecondOneCrashing() CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals(message, commitMessageWithPosition.getMessage()); + assertEquals(message, commitMessageWithPosition.message()); } @Test @@ -145,7 +145,7 @@ public void commitMessageProvider_twoProvidersFirstOneCrashing() CommitMessageWithCaretPosition commitMessageWithPosition = commitMessageBuilder .build(); - assertEquals(message, commitMessageWithPosition.getMessage()); + assertEquals(message, commitMessageWithPosition.message()); } @Test @@ -165,7 +165,7 @@ public void commitMessageProvider_multipleProvidersWithCrashAndNull() .build(); assertEquals(multiLineMessage + "\n\n" + message1, - commitMessageWithPosition.getMessage()); + commitMessageWithPosition.message()); } @Test @@ -176,7 +176,7 @@ public void commitMessageProvider_oneProviderWithCaretPositioning() { message, caretPosition); assertEquals(caretPosition, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -187,7 +187,7 @@ public void commitMessageProvider_oneProviderWithCaretPositionEqualsMessageLengt message, caretPosition); assertEquals(caretPosition, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -197,7 +197,7 @@ public void commitMessageProvider_oneProviderWithInvalidNegativeCaretPosition() message, -42); assertEquals(0, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -206,7 +206,7 @@ public void commitMessageProvider_oneProviderWithInvalidCaretPositionExceedingMe CommitMessageWithCaretPosition commitMessageWithPosition = getCommitMessageWithCaretPosition( message, message.length() + 1); - assertEquals(0, commitMessageWithPosition.getDesiredCaretPosition()); + assertEquals(0, commitMessageWithPosition.caretPosition()); } private CommitMessageWithCaretPosition getCommitMessageWithCaretPosition( @@ -242,7 +242,7 @@ public void commitMessageProvider_twoProvidersFirstWithCaretPositioning() { .build(); assertEquals(caretPositionInSingleLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -266,7 +266,7 @@ public void commitMessageProvider_twoProvidersSecondWithCaretPositioning() { assertEquals( singleLineMessage.length() + "\n\n".length() + caretPositionInMultiLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -290,7 +290,7 @@ public void commitMessageProvider_twoProvidersSecondWithCaretPositionZero() { assertEquals( singleLineMessage.length() + "\n\n".length() + caretPositionInMultiLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -312,7 +312,7 @@ public void commitMessageProvider_twoProvidersSecondWithUndefinedCaretPosition() .build(); assertEquals(CommitMessageComponentState.CARET_DEFAULT_POSITION, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -337,7 +337,7 @@ public void commitMessageProvider_twoProvidersWithCaretPositioning() { .build(); assertEquals(caretPositionInSingleLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -364,7 +364,7 @@ public void commitMessageProvider_twoProvidersWithCaretPositioningFirstWithUndef assertEquals( singleLineMessage.length() + "\n\n".length() + caretPositionInMultiLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -389,7 +389,7 @@ public void commitMessageProvider_twoProvidersWithCaretPositioningSecondWithUnde .build(); assertEquals(caretPositionInSingleLineMessage, - commitMessageWithPosition.getDesiredCaretPosition()); + commitMessageWithPosition.caretPosition()); } @Test @@ -414,7 +414,7 @@ public void commitMessageProvider_multipleProvidersWithCrashingAndNullAndOneCare .build(); assertEquals(multiLineMessage + "\n\n" + singleLineMessage, - commitMessageWithPosition.getMessage()); + commitMessageWithPosition.message()); } private CommitMessageBuilder newCommitMessageBuilder( @@ -482,7 +482,7 @@ private static class CrashingCommitMessageProviderWithCaretPositioning @Override public String getMessage(IResource[] resources) { - return "getMessage() is not supposed to be called."; + return "message() is not supposed to be called."; } @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java index 6549256d42..7330e22062 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/api/CommitMessageWithCaretPosition.java @@ -10,72 +10,20 @@ *******************************************************************************/ package org.eclipse.egit.ui.api; -import java.util.Objects; - /** * This class represents a commit message with a caret position. * + * @param message + * the commit message + * @param caretPosition + * the caret position within the commit message * @since 7.5 */ -public class CommitMessageWithCaretPosition { +public record CommitMessageWithCaretPosition(String message, + int caretPosition) { /** * This constant defines the value for an undefined caret position. */ public static final int NO_POSITION = -1; - - private final String message; - - private final int caretPosition; - - /** - * Constructor for creating an immutable value object, that represents a - * commit message and a caret position within that message. - * - * @param message - * the commit message - * @param caretPosition - * the caret position within the commit message - */ - public CommitMessageWithCaretPosition(String message, - int caretPosition) { - this.message = message; - this.caretPosition = caretPosition; - } - - /** - * @return the commit message - */ - public String getMessage() { - return message; - } - - /** - * @return the desired caret position within the commit message - */ - public int getDesiredCaretPosition() { - return caretPosition; - } - - @Override - public int hashCode() { - return Objects.hash(message, Integer.valueOf(caretPosition)); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - CommitMessageWithCaretPosition other = (CommitMessageWithCaretPosition) obj; - return caretPosition == other.caretPosition - && Objects.equals(message, other.message); - } - } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java index 85338f54ff..878e6299d6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageBuilder.java @@ -104,7 +104,7 @@ private String getCommitMessage( if (messageWithPosition == null) { return ""; //$NON-NLS-1$ } else { - return append(messageWithPosition.getMessage()); + return append(messageWithPosition.message()); } } @@ -126,12 +126,12 @@ private int updateCaretPosition(StringBuilder currentMessage, ICommitMessageProvider2 provider) { int pos = currentCaretPosition; if (currentCaretPosition == CommitMessageWithCaretPosition.NO_POSITION) { - String providedMessage = messageWithPosition.getMessage(); + String providedMessage = messageWithPosition.message(); if (providedMessage == null || providedMessage.trim().isEmpty()) { return pos; } int providedCaretPosition = messageWithPosition - .getDesiredCaretPosition(); + .caretPosition(); if (providedCaretPosition == CommitMessageWithCaretPosition.NO_POSITION) { return pos; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java index 969b090277..ac1bcfbefc 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java @@ -912,7 +912,7 @@ String calculateCommitMessage( if (amending) return previousCommitMessage; - return messageWithCaretPosition.getMessage(); + return messageWithCaretPosition.message(); } private int calculateCaretPosition( @@ -925,7 +925,7 @@ private int calculateCaretPosition( if (amending) return previousCaretPosition; - return messageWithCaretPosition.getDesiredCaretPosition(); + return messageWithCaretPosition.caretPosition(); } private void saveOriginalChangeId() { From 8dabe81bacd7dd99f08e071b1af7e6bcb5e7c0fe Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Nov 2025 16:28:41 +0100 Subject: [PATCH 087/160] EGit v7.5.0.202511251519-rc1 Change-Id: Ic6cfbea67e15ac34663d271a0f02daadf9270e65 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index df3a1e89cf..51f1b6aafa 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 e3c5ba40fb..a42840b41b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a5f8562e68..9575e59ffd 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 0be6ab24bc..ba2b074181 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 12050e94e8..b60ba8d72c 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 cb5277cd64..80a9d0ea1a 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 78e9d9d2f1..91170ffa6c 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 b41cf471d3..6b862c31c4 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 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 fa269eb924..6c16effe80 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95a6503db8..22d046883d 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 5094b37668..f911aa0475 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index de9fbc710f..da91200bf8 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index e2edae3496..7e0d450f48 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bd2096945a..b60fce4329 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 85d83bc490..4d8fdcb1fb 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 9864495347..a285c70c4f 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8a6f5d2f66..7b0d86b4e2 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e998f0fc13..de6054d2d1 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 3ae34d5d37..36763b7386 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 4093584802..e863a58f7c 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 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 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 index 48fbd0283e..0bee2a00a1 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7bf135ef40..a8719e76da 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94ec95fee1..12755c2052 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202511251519-rc1 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 af95e6376e..9dd31b3408 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 589ef315a0..59401043bf 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0-SNAPSHOT + 7.5.0.202511251519-rc1 4.0.13 21 3.40.0 From 79e814e4b3fa5dac2c8d8116b7cb2783e3404acc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Nov 2025 22:55:39 +0100 Subject: [PATCH 088/160] Prepare 7.5.0-SNAPSHOT builds Change-Id: I0ce5deb668c6b1e5a95b5cc749fcfe994b05e834 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 51f1b6aafa..df3a1e89cf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-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 a42840b41b..e3c5ba40fb 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 9575e59ffd..a5f8562e68 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 - 7.5.0.202511251519-rc1 + 7.5.0-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 ba2b074181..0be6ab24bc 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index b60ba8d72c..12050e94e8 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 - 7.5.0.202511251519-rc1 + 7.5.0-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 80a9d0ea1a..cb5277cd64 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 91170ffa6c..78e9d9d2f1 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-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 6b862c31c4..b41cf471d3 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 6c16effe80..fa269eb924 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 22d046883d..95a6503db8 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 - 7.5.0.202511251519-rc1 + 7.5.0-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 f911aa0475..5094b37668 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index da91200bf8..de9fbc710f 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 - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 7e0d450f48..e2edae3496 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index b60fce4329..bd2096945a 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 - 7.5.0.202511251519-rc1 + 7.5.0-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 4d8fdcb1fb..85d83bc490 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index a285c70c4f..9864495347 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 7b0d86b4e2..8a6f5d2f66 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index de6054d2d1..e998f0fc13 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 - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 36763b7386..3ae34d5d37 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index e863a58f7c..4093584802 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 - 7.5.0.202511251519-rc1 + 7.5.0-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 index 0bee2a00a1..48fbd0283e 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index a8719e76da..7bf135ef40 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 12755c2052..94ec95fee1 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: 7.5.0.202511251519-rc1 +Bundle-Version: 7.5.0.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 9dd31b3408..af95e6376e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 59401043bf..589ef315a0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202511251519-rc1 + 7.5.0-SNAPSHOT 4.0.13 21 3.40.0 From e2fd9794d9b137d5e83b406fe678845d1ce2e536 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Dec 2025 16:53:10 +0100 Subject: [PATCH 089/160] EGit v7.5.0.202512021534-r Change-Id: I8f222126b8bba011e37939d502cb106b513d3f8a Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index df3a1e89cf..c85ae5f1e2 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 e3c5ba40fb..b8b428820b 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index a5f8562e68..c84d3251d3 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 0be6ab24bc..b76441ad4a 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 12050e94e8..69dcad4832 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 cb5277cd64..1dab481e0a 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 78e9d9d2f1..fe8994e6f5 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 b41cf471d3..9e8a057f79 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r 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 fa269eb924..9146f56e1d 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 95a6503db8..8e09da854b 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 5094b37668..7adac8a41a 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index de9fbc710f..e071ad0fbc 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index e2edae3496..ee0f3823ee 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index bd2096945a..8587076736 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 85d83bc490..17e78e3880 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 9864495347..373e33114f 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8a6f5d2f66..93fba88759 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index e998f0fc13..6d06825d75 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 3ae34d5d37..a67de38083 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 4093584802..5a23b77165 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 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 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 index 48fbd0283e..8959bf80a5 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7bf135ef40..aab4a4d3e2 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 94ec95fee1..cc8d178824 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: 7.5.0.qualifier +Bundle-Version: 7.5.0.202512021534-r 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 af95e6376e..899116fb12 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r org.eclipse.egit diff --git a/pom.xml b/pom.xml index 589ef315a0..bac59d4277 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0-SNAPSHOT + 7.5.0.202512021534-r 4.0.13 21 3.40.0 From 8386ad178834bd9f7e337d1f98a7638879e9202f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Dec 2025 00:23:03 +0100 Subject: [PATCH 090/160] Prepare 7.5.1-SNAPSHOT builds Change-Id: I8090a8f1493a10fac2ea311b778df862c349122c --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 218 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 290 insertions(+), 290 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index c85ae5f1e2..167c0b7bd2 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.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 b8b428820b..a1ebf718d9 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)" +Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.5.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="7.5.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 c84d3251d3..6176b7be8f 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 - 7.5.0.202512021534-r + 7.5.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 b76441ad4a..497e5cae17 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,26 +5,26 @@ 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.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="[7.5.0,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)", + org.eclipse.egit.core;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.mockito;version="[5.4.0,6.0.0)", org.mockito.junit;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 69dcad4832..640816b118 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 - 7.5.0.202512021534-r + 7.5.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 1dab481e0a..e03e2a122a 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.5.0"; +Export-Package: org.eclipse.egit.core;version="7.5.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="7.5.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.5.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.5.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.5.0"; + org.eclipse.egit.core.attributes;version="7.5.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.5.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.5.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.5.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="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.5.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.5.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.5.0"; + org.eclipse.egit.core.internal.credentials;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.5.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.5.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.5.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.5.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.5.0", - org.eclipse.egit.core.settings;version="7.5.0", - org.eclipse.egit.core.storage;version="7.5.0"; + org.eclipse.egit.core.project;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.5.1", + org.eclipse.egit.core.settings;version="7.5.1", + org.eclipse.egit.core.storage;version="7.5.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.5.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.5.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.5.0" + org.eclipse.egit.core.synchronize;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.5.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.5.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", - org.eclipse.jgit.diff;version="[7.5.0,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.events;version="[7.5.0,7.6.0)", - org.eclipse.jgit.internal.storage.file;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lfs;version="[7.5.0,7.6.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.merge;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.signing.ssh;version="[7.5.0,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", - org.eclipse.jgit.submodule;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.http;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.http.apache;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.sshd;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util.io;version="[7.5.0,7.6.0)" + org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", + org.eclipse.jgit.diff;version="[7.5.1,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.events;version="[7.5.1,7.6.0)", + org.eclipse.jgit.internal.storage.file;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lfs;version="[7.5.1,7.6.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.merge;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.signing.ssh;version="[7.5.1,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", + org.eclipse.jgit.submodule;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.http;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.http.apache;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.sshd;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util.io;version="[7.5.1,7.6.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 fe8994e6f5..3b6126c246 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.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 9e8a057f79..ed4251c405 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.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 9146f56e1d..6ca4bee9f0 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.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 8e09da854b..1752bb86d8 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 - 7.5.0.202512021534-r + 7.5.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 7adac8a41a..cbc943faff 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", +Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", org.hamcrest;version="[3.0.0,4.0.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index e071ad0fbc..ead196c951 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 - 7.5.0.202512021534-r + 7.5.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 index ee0f3823ee..498844679e 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.settings;version="[7.5.0,7.6.0)", - org.eclipse.egit.gitflow;version="[7.5.0,7.6.0)", - org.eclipse.egit.gitflow.op;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.actions;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.branch;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.commit;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.components;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.push;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.5.0,7.6.0)", - org.eclipse.egit.ui.internal.selection;version="[7.5.0,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revplot;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)" +Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.settings;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow.op;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.actions;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.branch;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.commit;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.components;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.push;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.5.1,7.6.0)", + org.eclipse.egit.ui.internal.selection;version="[7.5.1,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revplot;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.5.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.5.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.5.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.5.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.5.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.5.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.5.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.5.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.5.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.5.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.5.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.5.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.5.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 8587076736..cece4a8bc6 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 - 7.5.0.202512021534-r + 7.5.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 17e78e3880..ecd3e1ae22 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.5.0"; +Export-Package: org.eclipse.egit.gitflow;version="7.5.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="7.5.0"; + org.eclipse.egit.gitflow.op;version="7.5.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="7.5.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.0,7.6.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.1,7.6.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 373e33114f..fe183f2bff 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 93fba88759..8d647130c9 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.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 6d06825d75..af9c9c8302 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 - 7.5.0.202512021534-r + 7.5.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index a67de38083..c133283c45 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,24 +13,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.0,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.5.0,7.6.0)", - org.eclipse.egit.gitflow.op;version="[7.5.0,7.6.0)", - org.eclipse.egit.gitflow.ui;version="[7.5.0,7.6.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.0,7.6.0)", - org.eclipse.jgit.junit.http;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.resolver;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)", + org.eclipse.egit.gitflow;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow.op;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow.ui;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", + org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", + org.eclipse.jgit.junit.http;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.resolver;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.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 5a23b77165..99cc3e327f 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 - 7.5.0.202512021534-r + 7.5.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 index 8959bf80a5..6254cb3a3a 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,115 +35,115 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.attributes;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.credentials;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.info;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.credentials;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.efs;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.hosts;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.info;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.job;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.rebase;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.signing;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.storage;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.internal.util;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.settings;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.synchronize;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.5.0,7.6.0)", - org.eclipse.egit.core.util;version="[7.5.0,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api;version="[7.5.0,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.0,7.6.0)", - org.eclipse.jgit.blame;version="[7.5.0,7.6.0)", - org.eclipse.jgit.diff;version="[7.5.0,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.0,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.0,7.6.0)", - org.eclipse.jgit.events;version="[7.5.0,7.6.0)", - org.eclipse.jgit.ignore;version="[7.5.0,7.6.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.0,7.6.0)", - org.eclipse.jgit.lib.internal;version="[7.5.0,7.6.0)", - org.eclipse.jgit.merge;version="[7.5.0,7.6.0)", - org.eclipse.jgit.notes;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revplot;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.0,7.6.0)", - org.eclipse.jgit.submodule;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.0,7.6.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.0,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util;version="[7.5.0,7.6.0)", - org.eclipse.jgit.util.io;version="[7.5.0,7.6.0)", +Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.attributes;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.credentials;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.info;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.credentials;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.efs;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.hosts;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.info;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.rebase;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.signing;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.storage;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.internal.util;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.settings;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.synchronize;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.5.1,7.6.0)", + org.eclipse.egit.core.util;version="[7.5.1,7.6.0)", + org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api;version="[7.5.1,7.6.0)", + org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", + org.eclipse.jgit.blame;version="[7.5.1,7.6.0)", + org.eclipse.jgit.diff;version="[7.5.1,7.6.0)", + org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", + org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", + org.eclipse.jgit.events;version="[7.5.1,7.6.0)", + org.eclipse.jgit.ignore;version="[7.5.1,7.6.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", + org.eclipse.jgit.lib.internal;version="[7.5.1,7.6.0)", + org.eclipse.jgit.merge;version="[7.5.1,7.6.0)", + org.eclipse.jgit.notes;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revplot;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", + org.eclipse.jgit.submodule;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", + org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util;version="[7.5.1,7.6.0)", + org.eclipse.jgit.util.io;version="[7.5.1,7.6.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.api;version="7.5.0", - org.eclipse.egit.ui.commit;version="7.5.0", - org.eclipse.egit.ui.history;version="7.5.0", - org.eclipse.egit.ui.internal;version="7.5.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.5.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.5.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.5.0";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.api;version="7.5.1", + org.eclipse.egit.ui.commit;version="7.5.1", + org.eclipse.egit.ui.history;version="7.5.1", + org.eclipse.egit.ui.internal;version="7.5.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.5.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.5.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 aab4a4d3e2..444fe4807d 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.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 cc8d178824..f37301a308 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: 7.5.0.202512021534-r +Bundle-Version: 7.5.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 899116fb12..db5340a89f 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index bac59d4277..f047bd1248 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.0.202512021534-r + 7.5.1-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.0.202512021534-r + 7.5.1-SNAPSHOT 4.0.13 21 3.40.0 From 96afa445443ce74344707814415b0b644c595f4e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Dec 2025 00:25:21 +0100 Subject: [PATCH 091/160] Prepare 7.6.0-SNAPSHOT builds Change-Id: I9cbc691ab3dd94417a6f43268a350e6b357847e5 --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 218 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 290 insertions(+), 290 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 167c0b7bd2..914ab7a772 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-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 a1ebf718d9..dea817abd1 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)" +Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.5.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="7.6.0";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 6176b7be8f..0da673ff6f 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 - 7.5.1-SNAPSHOT + 7.6.0-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 497e5cae17..634cde030f 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,26 +5,26 @@ 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", net.bytebuddy.agent;version="[1.7.9,2.0.0)", - org.eclipse.egit.core;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)", + org.eclipse.egit.core;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.mockito;version="[5.4.0,6.0.0)", org.mockito.junit;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 640816b118..5d53677555 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 - 7.5.1-SNAPSHOT + 7.6.0-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 e03e2a122a..9c74e3d6ad 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.5.1"; +Export-Package: org.eclipse.egit.core;version="7.6.0"; 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="7.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.5.1"; + org.eclipse.egit.core.attributes;version="7.6.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.6.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.6.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.6.0"; 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="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.5.1";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.5.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.5.1"; + org.eclipse.egit.core.internal.credentials;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.6.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.6.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.6.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.5.1"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.5.1", - org.eclipse.egit.core.settings;version="7.5.1", - org.eclipse.egit.core.storage;version="7.5.1"; + org.eclipse.egit.core.project;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.6.0", + org.eclipse.egit.core.settings;version="7.6.0", + org.eclipse.egit.core.storage;version="7.6.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.5.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.5.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.5.1" + org.eclipse.egit.core.synchronize;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", - org.eclipse.jgit.diff;version="[7.5.1,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.events;version="[7.5.1,7.6.0)", - org.eclipse.jgit.internal.storage.file;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lfs;version="[7.5.1,7.6.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.merge;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.signing.ssh;version="[7.5.1,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", - org.eclipse.jgit.submodule;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.http;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.http.apache;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.sshd;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util.io;version="[7.5.1,7.6.0)" + org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.events;version="[7.6.0,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.signing.ssh;version="[7.6.0,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", + org.eclipse.jgit.submodule;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.http.apache;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.sshd;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.0,7.7.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 3b6126c246..d0b69205e8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-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 ed4251c405..f825b80a31 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 6ca4bee9f0..3aa255874e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 1752bb86d8..f0c5a11556 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 - 7.5.1-SNAPSHOT + 7.6.0-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 cbc943faff..29d1974b2e 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", +Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", org.hamcrest;version="[3.0.0,4.0.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index ead196c951..5cc904d81e 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 - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 498844679e..0d71b4150a 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.settings;version="[7.5.1,7.6.0)", - org.eclipse.egit.gitflow;version="[7.5.1,7.6.0)", - org.eclipse.egit.gitflow.op;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.actions;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.branch;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.commit;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.components;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.push;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.5.1,7.6.0)", - org.eclipse.egit.ui.internal.selection;version="[7.5.1,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revplot;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)" +Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.settings;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow.op;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.actions;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.branch;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.commit;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.components;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.push;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.6.0,7.7.0)", + org.eclipse.egit.ui.internal.selection;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.5.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.5.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.5.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.5.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.5.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.5.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.5.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.6.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.6.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.6.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.6.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.6.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.6.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index cece4a8bc6..1742603484 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 - 7.5.1-SNAPSHOT + 7.6.0-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 ecd3e1ae22..35b7f6d40f 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.5.1"; +Export-Package: org.eclipse.egit.gitflow;version="7.6.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="7.5.1"; + org.eclipse.egit.gitflow.op;version="7.6.0"; 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="7.5.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.1,7.6.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.0,7.7.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index fe183f2bff..009a07b9ac 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 8d647130c9..9c5ca560e4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index af9c9c8302..453f3b8653 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 - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index c133283c45..80081187e4 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,24 +13,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.5.1,7.6.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.5.1,7.6.0)", - org.eclipse.egit.gitflow.op;version="[7.5.1,7.6.0)", - org.eclipse.egit.gitflow.ui;version="[7.5.1,7.6.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", - org.eclipse.jgit.junit;version="[7.5.1,7.6.0)", - org.eclipse.jgit.junit.http;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.resolver;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)", + org.eclipse.egit.gitflow;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow.op;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow.ui;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", + org.eclipse.jgit.junit.http;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.waits, diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 99cc3e327f..73e27d49a4 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 - 7.5.1-SNAPSHOT + 7.6.0-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 index 6254cb3a3a..45aa6df347 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -35,115 +35,115 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.attributes;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.credentials;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.info;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.credentials;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.efs;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.hosts;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.info;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.job;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.rebase;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.signing;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.storage;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.internal.util;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.op;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.project;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.settings;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.synchronize;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.5.1,7.6.0)", - org.eclipse.egit.core.util;version="[7.5.1,7.6.0)", - org.eclipse.jgit.annotations;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api;version="[7.5.1,7.6.0)", - org.eclipse.jgit.api.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.attributes;version="[7.5.1,7.6.0)", - org.eclipse.jgit.blame;version="[7.5.1,7.6.0)", - org.eclipse.jgit.diff;version="[7.5.1,7.6.0)", - org.eclipse.jgit.dircache;version="[7.5.1,7.6.0)", - org.eclipse.jgit.errors;version="[7.5.1,7.6.0)", - org.eclipse.jgit.events;version="[7.5.1,7.6.0)", - org.eclipse.jgit.ignore;version="[7.5.1,7.6.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib;version="[7.5.1,7.6.0)", - org.eclipse.jgit.lib.internal;version="[7.5.1,7.6.0)", - org.eclipse.jgit.merge;version="[7.5.1,7.6.0)", - org.eclipse.jgit.notes;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revplot;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.revwalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.storage.file;version="[7.5.1,7.6.0)", - org.eclipse.jgit.submodule;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport;version="[7.5.1,7.6.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk;version="[7.5.1,7.6.0)", - org.eclipse.jgit.treewalk.filter;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util;version="[7.5.1,7.6.0)", - org.eclipse.jgit.util.io;version="[7.5.1,7.6.0)", +Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.attributes;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.credentials;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.info;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.credentials;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.efs;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.hosts;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.info;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.rebase;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.signing;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.storage;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.internal.util;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.settings;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.synchronize;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.6.0,7.7.0)", + org.eclipse.egit.core.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", + org.eclipse.jgit.blame;version="[7.6.0,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", + org.eclipse.jgit.events;version="[7.6.0,7.7.0)", + org.eclipse.jgit.ignore;version="[7.6.0,7.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", + org.eclipse.jgit.lib.internal;version="[7.6.0,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", + org.eclipse.jgit.notes;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", + org.eclipse.jgit.submodule;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.api;version="7.5.1", - org.eclipse.egit.ui.commit;version="7.5.1", - org.eclipse.egit.ui.history;version="7.5.1", - org.eclipse.egit.ui.internal;version="7.5.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.5.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.5.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.5.1";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.api;version="7.6.0", + org.eclipse.egit.ui.commit;version="7.6.0", + org.eclipse.egit.ui.history;version="7.6.0", + org.eclipse.egit.ui.internal;version="7.6.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.6.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.6.0";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 444fe4807d..112eb4e32c 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f37301a308..8290508cf5 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: 7.5.1.qualifier +Bundle-Version: 7.6.0.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 db5340a89f..36260d652a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index f047bd1248..b013fa0bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.5.1-SNAPSHOT + 7.6.0-SNAPSHOT 4.0.13 21 3.40.0 From 9f1ea28288453bc5a754fa3c3f90fab403007042 Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Wed, 3 Dec 2025 09:22:09 +0100 Subject: [PATCH 092/160] GitHistoryPage: Clear commits in history view when the path changes When working with big repositories, calculating the commits of the new selection might take a few second. This change clears the history view, avoiding that commits that belong to the previously selected path (folder/file/project) stay visible while the commits for the newly path are being calculated. Bug: egit-121 Change-Id: I587c9b6da9bd74116bad5bc41a9cda185f4b0b62 --- .../org/eclipse/egit/ui/internal/history/GitHistoryPage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java index 1b00d9c8ad..372b567893 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java @@ -2548,12 +2548,13 @@ private void initAndStartRevWalk(boolean forceNewWalk, || settingsChanged) { releaseGenerateHistoryJob(); - if (repoChanged) { + if (repoChanged || pathsChanged) { // Clear all viewers. Otherwise it may be possible that // the user invokes a context menu command and due to to // the highly asynchronous loading we end up with // inconsistent diff computations trying to find the - // diff for a commit in the wrong repository. + // diff for a commit in the wrong repository or path + // (file/folder/project). clearViewers(); } From df19528e26e86555d527781befa476bbb0b10afe Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Dec 2025 15:48:46 +0100 Subject: [PATCH 093/160] Update lucene to 10.3.2.v20251117-1800 Change-Id: I45726aee0d37090621fd7284b835d6541dddde86 --- org.eclipse.egit.target/egit-4.38.target | 8 ++++---- org.eclipse.egit.target/orbit/orbit-4.38.tpd | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 86fb55f977..ff8aeeb6c7 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -58,9 +58,9 @@ - - - + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.38.tpd b/org.eclipse.egit.target/orbit/orbit-4.38.tpd index 231cc13c52..dcbbd8d903 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.38.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.38.tpd @@ -46,9 +46,9 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] org.apiguardian.api [1.1.2,1.1.2] org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] - org.apache.lucene.analysis-common [10.3.1.v20251013-1000,10.3.1.v20251013-1000] - org.apache.lucene.analysis-smartcn [10.3.1.v20251013-1000,10.3.1.v20251013-1000] - org.apache.lucene.core [10.3.1.v20251013-1000,10.3.1.v20251013-1000] + org.apache.lucene.analysis-common [10.3.2.v20251117-1800,10.3.2.v20251117-1800] + org.apache.lucene.analysis-smartcn [10.3.2.v20251117-1800,10.3.2.v20251117-1800] + org.apache.lucene.core [10.3.2.v20251117-1800,10.3.2.v20251117-1800] org.commonmark [0.27.0,0.27.0] org.commonmark.ext-gfm-tables [0.27.0,0.27.0] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] From 1b567e796a71afb65b25e759c4f1c48ef6d12810 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 3 Dec 2025 16:25:36 +0100 Subject: [PATCH 094/160] [oomph] Update and cycle API baselines Add 7.5.0, remove 7.2.0. Also add a choice for the 4.38 target platform. Change-Id: I573bb44d8a0888dae1c53c286b35d5185f091ccb --- tools/oomph/EGit.setup | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index 78cf7606e2..c8dbc10ec3 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -123,17 +123,11 @@ + Default target platform for EGit development. - - EGit 7.2.0 API baseline; to be used with branch stable-7.3 - - EGit 7.4.0 API baseline; to be used with branch master + EGit 7.4.0 API baseline; to be used with branch stable-7.5 + + + EGit 7.5.0 API baseline; to be used with branch master Date: Wed, 3 Dec 2025 16:43:40 +0100 Subject: [PATCH 095/160] Update JGit dependencies - bytebuddy to 1.18.2 - bouncycastle to 1.83 Change-Id: Ic280738be1d99919b89017a59952a0c96d7c68b0 --- org.eclipse.egit.target/egit-4.36.target | 14 +++++++------- org.eclipse.egit.target/egit-4.37.target | 14 +++++++------- org.eclipse.egit.target/egit-4.38.target | 14 +++++++------- org.eclipse.egit.target/maven/dependencies.tpd | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index ad8f30559e..e1ad44d2f9 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.1 + 1.18.2 jar net.bytebuddy byte-buddy-agent - 1.18.1 + 1.18.2 jar @@ -322,25 +322,25 @@ org.bouncycastle bcpg-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcprov-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcpkix-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcutil-jdk18on - 1.82 + 1.83 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index ebc967de87..0c9bb8f1fc 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.1 + 1.18.2 jar net.bytebuddy byte-buddy-agent - 1.18.1 + 1.18.2 jar @@ -322,25 +322,25 @@ org.bouncycastle bcpg-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcprov-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcpkix-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcutil-jdk18on - 1.82 + 1.83 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index ff8aeeb6c7..649fa97ddb 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.1 + 1.18.2 jar net.bytebuddy byte-buddy-agent - 1.18.1 + 1.18.2 jar @@ -322,25 +322,25 @@ org.bouncycastle bcpg-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcprov-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcpkix-jdk18on - 1.82 + 1.83 jar org.bouncycastle bcutil-jdk18on - 1.82 + 1.83 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index db547e2856..a5e826dd05 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -68,22 +68,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.82" + version = "1.83" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.82" + version = "1.83" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.82" + version = "1.83" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.82" + version = "1.83" } } @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.1" + version = "1.18.2" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.1" + version = "1.18.2" } } From 065c3ccead4899ca06f9d71d5ac6aab4b71d4b45 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 16 Dec 2025 16:31:29 +0100 Subject: [PATCH 096/160] Update JGit dependencies - jetty to 12.1.5 - mockito to 5.21.0 Change-Id: I43b9ab93cb22688d480d538e8223b7fa1b4ed22c --- org.eclipse.egit.target/egit-4.36.target | 20 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 20 +++++++++---------- org.eclipse.egit.target/egit-4.38.target | 20 +++++++++---------- .../maven/dependencies.tpd | 18 ++++++++--------- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index e1ad44d2f9..d26e33a88d 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -202,7 +202,7 @@ org.mockito mockito-core - 5.20.0 + 5.21.0 jar @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-http - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-io - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-security - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-server - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-session - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util-ajax - 12.1.4 + 12.1.5 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 0c9bb8f1fc..856994a7c8 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -202,7 +202,7 @@ org.mockito mockito-core - 5.20.0 + 5.21.0 jar @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-http - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-io - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-security - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-server - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-session - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util-ajax - 12.1.4 + 12.1.5 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 649fa97ddb..af578c88fb 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -202,7 +202,7 @@ org.mockito mockito-core - 5.20.0 + 5.21.0 jar @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-http - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-io - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-security - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-server - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-session - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util - 12.1.4 + 12.1.5 jar org.eclipse.jetty jetty-util-ajax - 12.1.4 + 12.1.5 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index a5e826dd05..22d4bc6242 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.4" + version = "12.1.5" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.20.0" + version = "5.21.0" } } From 87bae96201d601c6524c837c4346ddb86a7de658 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 19 Dec 2025 09:58:33 +0100 Subject: [PATCH 097/160] Switch to 4.38 release URL of release train p2 repo Change-Id: Ic9194986928e4a15c3ef517752eb30faf002e97c --- org.eclipse.egit.target/egit-4.38.target | 4 ++-- org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index af578c88fb..f5eb9ce3bc 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd b/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd index d3cca98507..4d9b95f40d 100644 --- a/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd +++ b/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd @@ -1,6 +1,6 @@ target "4.38-2025-12" with source configurePhase -location "https://download.eclipse.org/staging/2025-12" { +location "https://download.eclipse.org/releases/2025-12" { // Eclipse platform biz.aQute.bnd.util lazy biz.aQute.bndlib lazy From 798dacbf79b8d3440a67a01bd64919e94c4c1cf9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 19 Dec 2025 10:06:55 +0100 Subject: [PATCH 098/160] Add target platform egit-4.39 for 2025-03 Change-Id: Id4b9c90920fd687fe7da2fad76241d50023b2959 --- org.eclipse.egit.target/egit-4.39.target | 403 ++++++++++++++++++ org.eclipse.egit.target/egit-4.39.tpd | 7 + org.eclipse.egit.target/orbit/orbit-4.39.tpd | 73 ++++ .../releasetrain/4.39-2026-03.tpd | 47 ++ 4 files changed, 530 insertions(+) create mode 100644 org.eclipse.egit.target/egit-4.39.target create mode 100644 org.eclipse.egit.target/egit-4.39.tpd create mode 100644 org.eclipse.egit.target/orbit/orbit-4.39.tpd create mode 100644 org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target new file mode 100644 index 0000000000..8595acdc5f --- /dev/null +++ b/org.eclipse.egit.target/egit-4.39.target @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + jar + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + jar + + + org.osgi + org.osgi.service.component.annotations + 1.5.1 + jar + + + org.osgi + org.osgi.service.metatype.annotations + 1.4.1 + jar + + + + + + + org.tukaani + xz + 1.11 + jar + + + + + + + org.slf4j + slf4j-api + 2.0.17 + jar + + + org.slf4j + slf4j-simple + 2.0.17 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.16.0 + jar + + + org.apache.sshd + sshd-sftp + 2.16.0 + jar + + + + + + + org.mockito + mockito-core + 5.21.0 + jar + + + + + + + net.java.dev.jna + jna + 5.18.1 + jar + + + net.java.dev.jna + jna-platform + 5.18.1 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.1.5 + jar + + + org.eclipse.jetty + jetty-http + 12.1.5 + jar + + + org.eclipse.jetty + jetty-io + 12.1.5 + jar + + + org.eclipse.jetty + jetty-security + 12.1.5 + jar + + + org.eclipse.jetty + jetty-server + 12.1.5 + jar + + + org.eclipse.jetty + jetty-session + 12.1.5 + jar + + + org.eclipse.jetty + jetty-util + 12.1.5 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.1.5 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + com.google.code.gson + gson + 2.13.2 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.18.2 + jar + + + net.bytebuddy + byte-buddy-agent + 1.18.2 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.83 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.83 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.83 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.83 + jar + + + + + + + org.assertj + assertj-core + 3.27.6 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.20.0 + jar + + + org.apache.commons + commons-compress + 1.28.0 + jar + + + org.apache.commons + commons-lang3 + 3.20.0 + jar + + + commons-io + commons-io + 2.21.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.egit.target/egit-4.39.tpd b/org.eclipse.egit.target/egit-4.39.tpd new file mode 100644 index 0000000000..e7c6a587b0 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.39.tpd @@ -0,0 +1,7 @@ +target "egit-4.39" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.39.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.39-2026-03.tpd" diff --git a/org.eclipse.egit.target/orbit/orbit-4.39.tpd b/org.eclipse.egit.target/orbit/orbit-4.39.tpd new file mode 100644 index 0000000000..a1d7fe1964 --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.39.tpd @@ -0,0 +1,73 @@ +target "orbit-4.39" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-03" { + aQute.libg [7.1.0.202411251545,7.1.0.202411251545] + bndtools.api [7.1.0.202411251545,7.1.0.202411251545] + com.ibm.icu [78.1.0,78.1.0] + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [2.0.0,2.0.0] + jakarta.activation-api [2.1.4,2.1.4] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.4,4.0.4] + javax.servlet-api [3.1.0,3.1.0] + junit-jupiter-api [5.14.1,5.14.1] + junit-jupiter-engine [5.14.1,5.14.1] + junit-jupiter-migrationsupport [5.14.1,5.14.1] + junit-jupiter-params [5.14.1,5.14.1] + junit-platform-commons [1.14.1,1.14.1] + junit-platform-engine [1.14.1,1.14.1] + junit-platform-launcher [1.14.1,1.14.1] + junit-platform-runner [1.14.1,1.14.1] + junit-platform-suite-api [1.14.1,1.14.1] + junit-platform-suite-commons [1.14.1,1.14.1] + junit-platform-suite-engine [1.14.1,1.14.1] + junit-vintage-engine [5.14.1,5.14.1] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] + org.apache.lucene.analysis-common [10.3.2.v20251117-1800,10.3.2.v20251117-1800] + org.apache.lucene.analysis-smartcn [10.3.2.v20251117-1800,10.3.2.v20251117-1800] + org.apache.lucene.core [10.3.2.v20251117-1800,10.3.2.v20251117-1800] + org.commonmark [0.27.0,0.27.0] + org.commonmark.ext-gfm-tables [0.27.0,0.27.0] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] + org.hamcrest [3.0.0,3.0.0] + org.hamcrest.source [3.0.0,3.0.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.objectweb.asm [9.9.0, 9.9.0] + org.objectweb.asm.source [9.9.0, 9.9.0] + org.objectweb.asm.commons [9.9.0,9.9.0] + org.objectweb.asm.tree [9.9.0, 9.9.0] + org.objectweb.asm.tree.analysis [9.9.0, 9.9.0] + org.objectweb.asm.util [9.9.0, 9.9.0] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd new file mode 100644 index 0000000000..64ced01757 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd @@ -0,0 +1,47 @@ +target "4.39-2026-03" with source configurePhase + +location "https://download.eclipse.org/staging/2026-03" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + biz.aQute.repository + biz.aQute.resolve lazy + bndtools.jareditor lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.bndtools.headless.build.manager lazy + org.bndtools.headless.build.plugin.gradle lazy + org.bndtools.templates.template lazy + org.bndtools.templating lazy + org.bndtools.versioncontrol.ignores.manager lazy + org.bndtools.versioncontrol.ignores.plugin.git lazy + org.commonmark lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jdt.core.manipulation lazy + org.eclipse.jdt.ui lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.pde.bnd.ui lazy + org.eclipse.pde.core lazy + org.eclipse.sdk.ide lazy + org.eclipse.search.core lazy + org.eclipse.swt.tools.base lazy + org.osgi.service.http.whiteboard lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} From c7c9d157a4b00f7bfbb4180b1e6afc9f5b5ff89f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 7 Jan 2026 15:51:40 +0100 Subject: [PATCH 099/160] EGit v7.6.0.202601071437-m1 Change-Id: Id1b931168e6b62119a377571ab0d08405ca46909 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 914ab7a772..1124007d4e 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 dea817abd1..60b796016d 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 0da673ff6f..4bc58e53a0 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 634cde030f..3b44bd9346 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d53677555..41ae4c3f3a 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 9c74e3d6ad..fbec68c40c 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d0b69205e8..a43fcd518b 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 f825b80a31..9b6374b862 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 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 3aa255874e..17ad206830 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f0c5a11556..469dc048d6 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 29d1974b2e..6656134309 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 5cc904d81e..e6f4d6d339 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0d71b4150a..133290940d 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 1742603484..73b5cfd6ae 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 35b7f6d40f..572098936f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 009a07b9ac..3876920961 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9c5ca560e4..f82ee51de0 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 453f3b8653..4d4cd4b616 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 80081187e4..bbfc4e86ed 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 73e27d49a4..e2f5bc9699 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 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 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 index 45aa6df347..2c1c68eb2a 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 112eb4e32c..8eb20da86b 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8290508cf5..edc6ef8bda 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601071437-m1 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 36260d652a..ba94e8deed 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index b013fa0bf7..2c154bfb96 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0-SNAPSHOT + 7.6.0.202601071437-m1 4.0.13 21 3.40.0 From 17413c76f4f9ec5bbd36addef2f67d59b35627d6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 8 Jan 2026 00:03:03 +0100 Subject: [PATCH 100/160] Prepare 7.6.0-SNAPSHOT builds Change-Id: I2e4230d70ad660f87849c0a160f3a0cf5e7c91d2 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 1124007d4e..914ab7a772 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-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 60b796016d..dea817abd1 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 4bc58e53a0..0da673ff6f 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 - 7.6.0.202601071437-m1 + 7.6.0-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 3b44bd9346..634cde030f 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 41ae4c3f3a..5d53677555 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 - 7.6.0.202601071437-m1 + 7.6.0-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 fbec68c40c..9c74e3d6ad 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index a43fcd518b..d0b69205e8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-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 9b6374b862..f825b80a31 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 17ad206830..3aa255874e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 469dc048d6..f0c5a11556 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 - 7.6.0.202601071437-m1 + 7.6.0-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 6656134309..29d1974b2e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index e6f4d6d339..5cc904d81e 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 - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 133290940d..0d71b4150a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 73b5cfd6ae..1742603484 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 - 7.6.0.202601071437-m1 + 7.6.0-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 572098936f..35b7f6d40f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 3876920961..009a07b9ac 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index f82ee51de0..9c5ca560e4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 4d4cd4b616..453f3b8653 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 - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index bbfc4e86ed..80081187e4 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index e2f5bc9699..73e27d49a4 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 - 7.6.0.202601071437-m1 + 7.6.0-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 index 2c1c68eb2a..45aa6df347 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 8eb20da86b..112eb4e32c 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index edc6ef8bda..8290508cf5 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: 7.6.0.202601071437-m1 +Bundle-Version: 7.6.0.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 ba94e8deed..36260d652a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 2c154bfb96..b013fa0bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202601071437-m1 + 7.6.0-SNAPSHOT 4.0.13 21 3.40.0 From 0d908fb959cc18f6f699310b0eadb73e5b736c39 Mon Sep 17 00:00:00 2001 From: Elsa Zacharia Date: Fri, 9 Jan 2026 17:55:14 +0530 Subject: [PATCH 101/160] Remove unnecessary single quotes from property strings and fix appearence of link in the UI The single quotes around {0} in the property strings were being displayed in the Eclipse UI, causing the link labels to show extra single quote characters. This change removes the quotes so that the labels display correctly and consistently. This follows the normal standard used elsewhere in the Eclipse preference pages. Change-Id: Id3ed8a855eb653a939e20f843aeae1d321490b17 --- .../src/org/eclipse/egit/ui/internal/uitext.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 2e69b50038..1ac7990cf2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1373,8 +1373,8 @@ DecoratorPreferencesPage_fileFormatLabel=&Files: DecoratorPreferencesPage_folderFormatLabel=F&olders: DecoratorPreferencesPage_projectFormatLabel=&Projects: DecoratorPreferencesPage_submoduleFormatLabel=&Submodules: -DecoratorPreferencesPage_labelDecorationsLink=See ''{0}'' to enable or disable Git decorations. -DecoratorPreferencesPage_colorsAndFontsLink=See ''{0}'' to configure the font and color decorations. +DecoratorPreferencesPage_labelDecorationsLink=See {0} to enable or disable Git decorations. +DecoratorPreferencesPage_colorsAndFontsLink=See {0} to configure the font and color decorations. DecoratorPreferencesPage_generalTabFolder=&General DecoratorPreferencesPage_bindingResourceName=Name of the resource being decorated DecoratorPreferencesPage_bindingBranchName=Current branch of the repository From 889aa1040f163dacc3ad7e9c5c448e818d43e780 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 27 Dec 2025 16:38:23 +0100 Subject: [PATCH 102/160] Reword dialog: fix layout bug hiding short commit messages Sometimes the layout assigns a negative y-coordinate to the message area when the dialog is opened on MacOS. It is unknown why exactly this happens, but in any case layouting again corrects this. As a work-around force a re-layout the first time the message area is to be drawn. Also remove an unneeded Composite, GridData settings that had no effect since the parent's layout is not a GridLayout, and FormToolkit settings that also had no effect since the form toolkit isn't used in that dialog. Bug: egit-54 Change-Id: I84269dd8d2c7af7b205d10240a36be05b218072d --- .../rebase/CommitMessageEditorDialog.java | 47 ++++++++----------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java index 4c77909305..a2037623f8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013, 2022 SAP AG and others. + * Copyright (c) 2013, 2026 SAP AG and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -43,17 +43,15 @@ import org.eclipse.jgit.lib.UserConfig; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; -import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.ui.forms.widgets.FormToolkit; /** * Dialog for editing a commit message @@ -80,6 +78,9 @@ public class CommitMessageEditorDialog extends TitleAreaDialog { private StackLayout previewLayout; + // XXX: Work-around for https://github.com/eclipse-egit/egit/issues/54 + private PaintListener layoutBugWorkaround; + private IAction addChangeIdAction; private String title; @@ -201,17 +202,6 @@ protected Control createDialogArea(Composite parent) { GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.CENTER) .applyTo(areaTitle); - Composite commitMessageToolbarComposite = new Composite(titleBar, - SWT.NONE); - GridDataFactory.fillDefaults().grab(true, false) - .align(SWT.END, SWT.CENTER) - .applyTo(commitMessageToolbarComposite); - RowLayout layout = new RowLayout(); - layout.marginTop = 0; - layout.marginBottom = 0; - layout.marginLeft = 0; - layout.marginRight = 0; - commitMessageToolbarComposite.setLayout(layout); ToolBarManager commitMessageToolBarManager = new ToolBarManager( SWT.FLAT | SWT.HORIZONTAL); @@ -268,9 +258,10 @@ public void run() { hasChangeId || GerritUtil.getCreateChangeId(config)); commitMessageToolBarManager.add(addChangeIdAction); - ToolBar tb = commitMessageToolBarManager - .createControl(commitMessageToolbarComposite); + ToolBar tb = commitMessageToolBarManager.createControl(titleBar); tb.setBackground(null); + GridDataFactory.fillDefaults().grab(true, false) + .align(SWT.END, SWT.CENTER).applyTo(tb); Composite commitMessageTextComposite = new Composite( commitMessageSection, SWT.BORDER); @@ -282,8 +273,6 @@ public void run() { messageArea = new SpellcheckableMessageArea(commitMessageTextComposite, "", SWT.NONE); //$NON-NLS-1$ - messageArea.setData(FormToolkit.KEY_DRAW_BORDER, - FormToolkit.TEXT_BORDER); CleanupMode cleanup = mode; if (cleanup == null || CleanupMode.DEFAULT.equals(cleanup)) { cleanup = CleanupMode.STRIP; @@ -294,23 +283,27 @@ public void run() { String msg = Utils.normalizeLineEndings(commitMessage).replaceAll("\n", //$NON-NLS-1$ Text.DELIMITER); messageArea.setText(msg); - Point size = messageArea.getTextWidget().getSize(); - int minHeight = messageArea.getTextWidget().getLineHeight() * 3; - GridDataFactory.fillDefaults().grab(true, true) - .hint(size).minSize(size.x, minHeight) - .align(SWT.FILL, SWT.FILL).applyTo(messageArea); previewArea = new Composite(commitMessageTextComposite, SWT.NONE); - GridDataFactory.fillDefaults().grab(true, true).applyTo(previewArea); previewArea.setLayout(new FillLayout()); - previewArea.setData(FormToolkit.KEY_DRAW_BORDER, - FormToolkit.TEXT_BORDER); previewer = new CommitMessagePreviewer(); previewer.createControl(previewArea); previewLayout.topControl = messageArea; messageArea.setFocus(); + // Somehow the SpellCheckableMessageArea gets a negative y-coordinate on + // MacOS on the very first layout if the commit message has only a + // single line. When this happens the commit message is not visible at + // all. Fix this by forcing a re-layout when the message area is to be + // painted for the first time. + layoutBugWorkaround = event -> { + messageArea.removePaintListener(layoutBugWorkaround); + layoutBugWorkaround = null; + commitMessageTextComposite.requestLayout(); + }; + messageArea.addPaintListener(layoutBugWorkaround); + // Create two hidden text fields for author and committer, set to the // current user, so that we can use the CommitMessageComponent. The // committer is needed for the sign-off button; the author won't be From 0366da6e3055b19cf9add33cd279e894af3ea228 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 10 Jan 2026 14:04:23 +0100 Subject: [PATCH 103/160] SpellCheckableMessageArea: remove obsolete bug work-arounds Remove brokenBidiPlatformTextWidth. This was a work-around for [1], which was fixed 13 years ago! That whole logic to test whether the BidiSegmentListener is called and the custom Layout to restrict the StyledText width if not is just not needed anymore. (And restricting the width of the SourceViewer's StyledText to less than the width of its parent container would break visual appearance in dark mode on modern Eclipse Platform anyway.) Also remove `textWidget.setText(textWidget.getText())`. That was a work-around for [2], which was fixed in 2012 even. [1] https://bugs.eclipse.org/400727 [2] https://bugs.eclipse.org/384886 Change-Id: Ic247eb061581aa40b582e35532ef3af95ed30e1c --- .../dialogs/SpellcheckableMessageArea.java | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java index 09a7ca9954..82389aced2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java @@ -88,13 +88,9 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Layout; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.editors.text.TextSourceViewerConfiguration; @@ -126,9 +122,6 @@ public class SpellcheckableMessageArea extends Composite { private BidiSegmentListener hardWrapSegmentListener; - // XXX: workaround for https://bugs.eclipse.org/400727 - private int brokenBidiPlatformTextWidth; - private IAction contentAssistAction; private Token commentColoring; @@ -195,15 +188,6 @@ protected void handleJFacePreferencesChange( getTextWidget().setAlwaysShowScrollBars(false); getTextWidget().setFont(UIUtils .getFont(UIPreferences.THEME_CommitMessageEditorFont)); - sourceViewer.setDocument(new Document()); - int endSpacing = 2; - int textWidth = (int) (getCharWidth() * MAX_LINE_WIDTH + endSpacing); - int textHeight = getLineHeight() * 7; - Point size = getTextWidget().computeSize(textWidth, textHeight); - getTextWidget().setSize(size); - - computeBrokenBidiPlatformTextWidth(size.x); - getTextWidget().setEditable(!readOnly); createMarginPainter(); @@ -216,9 +200,6 @@ protected void handleJFacePreferencesChange( getDisplay().asyncExec(() -> { if (!isDisposed()) { configureHardWrap(); - if (brokenBidiPlatformTextWidth != -1) { - layout(); - } } }); } @@ -369,25 +350,6 @@ protected int getViewerStyles() { return SWT.V_SCROLL | SWT.WRAP; } - private void computeBrokenBidiPlatformTextWidth(int textWidth) { - class BidiSegmentListenerTester implements BidiSegmentListener { - boolean called; - - @Override - public void lineGetSegments(BidiSegmentEvent event) { - called = true; - } - } - BidiSegmentListenerTester tester = new BidiSegmentListenerTester(); - StyledText textWidget = getTextWidget(); - textWidget.addBidiSegmentListener(tester); - textWidget.setText(" "); //$NON-NLS-1$ - textWidget.computeSize(SWT.DEFAULT, SWT.DEFAULT); - textWidget.removeBidiSegmentListener(tester); - - brokenBidiPlatformTextWidth = tester.called ? -1 : textWidth; - } - private boolean isEditable(ISourceViewer viewer) { return viewer != null && viewer.isEditable(); } @@ -421,44 +383,11 @@ public void lineGetSegments(BidiSegmentEvent e) { } }; textWidget.addBidiSegmentListener(hardWrapSegmentListener); - textWidget.setText(textWidget.getText()); // XXX: workaround for https://bugs.eclipse.org/384886 - - if (brokenBidiPlatformTextWidth != -1) { - Layout restrictedWidthLayout = new Layout() { - @Override - protected Point computeSize(Composite composite, - int wHint, int hHint, boolean flushCache) { - Point size = SpellcheckableMessageArea.this - .getSize(); - Rectangle trim = SpellcheckableMessageArea.this - .computeTrim(0, 0, 0, 0); - size.x -= trim.width; - size.y -= trim.height; - if (size.x > brokenBidiPlatformTextWidth) - size.x = brokenBidiPlatformTextWidth; - return size; - } - - @Override - protected void layout(Composite composite, - boolean flushCache) { - Point size = computeSize(composite, SWT.DEFAULT, - SWT.DEFAULT, flushCache); - textWidget.setBounds(0, 0, size.x, size.y); - } - }; - setLayout(restrictedWidthLayout); - } } - } else if (hardWrapSegmentListener != null) { StyledText textWidget = getTextWidget(); textWidget.removeBidiSegmentListener(hardWrapSegmentListener); - textWidget.setText(textWidget.getText()); // XXX: workaround for https://bugs.eclipse.org/384886 hardWrapSegmentListener = null; - - if (brokenBidiPlatformTextWidth != -1) - setLayout(new FillLayout()); } } @@ -616,17 +545,6 @@ protected void createMarginPainter() { sourceViewer.addPainter(marginPainter); } - private double getCharWidth() { - GC gc = new GC(getTextWidget()); - double charWidth = gc.getFontMetrics().getAverageCharacterWidth(); - gc.dispose(); - return charWidth; - } - - private int getLineHeight() { - return getTextWidget().getLineHeight(); - } - /** * @return if the commit message should be hard-wrapped (preference) */ From 49bf0aeb02fea285b982eb0e60d1d2fdcace48a3 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 13 Jan 2026 21:34:34 +0100 Subject: [PATCH 104/160] OSGi: don't rely on declarative service injection for IProxyService The IProxyService is provided by bundle org.eclipse.net; but it is installed as an OSGi service by that bundle only if that bundle is activated. In the Eclipse IDE, this happens in IDEWorkbenchAdvisor. In other applications that don't use the IDEWorkbenchAdvisor, there may be nothing that would activate org.eclipse.net. If that happens, the dependency declaration in EGit's TransportConfigurator OSGi service is never fulfilled and thus the TransportConfigurator is never instantiated and activated, which breaks git operations over SSH since the SSH support is then not properly initialized. So for the IProxyService revert back to the approach used before commit 86708b62 and use a ServiceTracker in the bundle activator. With that, class IProxySelector is loaded (causing activation of org.eclipse.net) when EGit Core is activated. Moreover, org.eclipse.net allows suppressing the publication of the OSGi service via a system property. Also, OSGi bundles can be un- or re-installed. A service being present at all times is not guaranteed. Instead of getting the IProxyService once and then considering it static get the service whenever it is needed and gracefully handle the service not being available. Bug: egit-118 Change-Id: I219232f91bfeadda8d1578ad90f3dea1c6f192f0 --- ...clipse.egit.core.TransportConfigurator.xml | 1 - .../src/org/eclipse/egit/core/Activator.java | 19 ++++++++++++- .../egit/core/EclipseAuthenticator.java | 27 ++++++++++++------- .../egit/core/EclipseProxySelector.java | 13 +++++---- .../egit/core/TransportConfigurator.java | 17 +++++------- .../core/internal/EGitSshdSessionFactory.java | 20 ++++++++------ 6 files changed, 61 insertions(+), 36 deletions(-) diff --git a/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml b/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml index 63244b675f..70d016eb9b 100644 --- a/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml +++ b/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index 5c6e5a9dc2..9926e53663 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2008, 2021 Shawn O. Pearce and others. + * Copyright (C) 2008, 2026 Shawn O. Pearce and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -9,6 +9,7 @@ *******************************************************************************/ package org.eclipse.egit.core; +import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; @@ -39,6 +40,8 @@ public class Activator extends Plugin { private ServiceTracker credentialsStore; + private ServiceTracker proxyService; + /** * @return the singleton {@link Activator} */ @@ -141,6 +144,10 @@ public void start(final BundleContext context) throws Exception { credentialsStore.open(); CredentialsProvider.setDefault(new EGitCredentialsProvider()); + proxyService = new ServiceTracker<>(context, IProxyService.class, + null); + proxyService.open(); + // Set an initial window cache config to suppress loading the JMX bean try { WindowCacheConfig c = new WindowCacheConfig(); @@ -160,9 +167,19 @@ public CredentialsStore getCredentialsStore() { return credentialsStore.getService(); } + /** + * Obtains the {@link IProxyService}. + * + * @return the {@link IProxyService} or {@code null} if none is available. + */ + public IProxyService getProxyService() { + return proxyService.getService(); + } + @Override public void stop(final BundleContext context) throws Exception { credentialsStore.close(); + proxyService.close(); Config.setTypedConfigGetter(null); SystemReader.setInstance(null); super.stop(context); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseAuthenticator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseAuthenticator.java index 35019e750b..63f168b91d 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseAuthenticator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseAuthenticator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2008, Shawn O. Pearce + * Copyright (C) 2008, 2026 Shawn O. Pearce and others * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -14,27 +14,34 @@ import java.net.InetAddress; import java.net.PasswordAuthentication; import java.net.UnknownHostException; +import java.util.function.Supplier; import org.eclipse.core.net.proxy.IProxyData; import org.eclipse.core.net.proxy.IProxyService; class EclipseAuthenticator extends Authenticator { - private final IProxyService service; + private final Supplier service; - EclipseAuthenticator(final IProxyService s) { + EclipseAuthenticator(Supplier s) { service = s; } @Override protected PasswordAuthentication getPasswordAuthentication() { - final IProxyData[] data = service.getProxyData(); - if (data == null) + IProxyService srv = service.get(); + if (srv == null) { return null; - for (final IProxyData d : data) { - if (d.getUserId() == null || d.getHost() == null) - continue; - if (d.getPort() == getRequestingPort() && hostMatches(d)) - return auth(d); + } + IProxyData[] data = srv.getProxyData(); + if (data != null) { + for (IProxyData d : data) { + if (d.getUserId() == null || d.getHost() == null) { + continue; + } + if (d.getPort() == getRequestingPort() && hostMatches(d)) { + return auth(d); + } + } } return null; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java index 8ec130a1ed..fea93d20a9 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2008, Shawn O. Pearce + * Copyright (C) 2008, 2026 Shawn O. Pearce and others * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -21,14 +21,16 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; +import java.util.function.Supplier; import org.eclipse.core.net.proxy.IProxyData; import org.eclipse.core.net.proxy.IProxyService; class EclipseProxySelector extends ProxySelector { - private final IProxyService service; - EclipseProxySelector(final IProxyService s) { + private final Supplier service; + + EclipseProxySelector(Supplier s) { service = s; } @@ -37,7 +39,8 @@ public List select(final URI uri) { final ArrayList r = new ArrayList<>(); final String host = uri.getHost(); - if (host != null) { + IProxyService srv = service.get(); + if (srv != null && host != null) { String type = IProxyData.SOCKS_PROXY_TYPE; if ("http".equals(uri.getScheme())) //$NON-NLS-1$ type = IProxyData.HTTP_PROXY_TYPE; @@ -47,7 +50,7 @@ else if ("https".equals(uri.getScheme())) //$NON-NLS-1$ type = IProxyData.HTTPS_PROXY_TYPE; try { URI queryUri = new URI(type, "//" + host, null); //$NON-NLS-1$ - final IProxyData[] dataArray = service.select(queryUri); + final IProxyData[] dataArray = srv.select(queryUri); for (IProxyData data : dataArray) { if (IProxyData.HTTP_PROXY_TYPE.equals(data.getType())) addProxy(r, Proxy.Type.HTTP, data); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java index 9ae388500e..5a17ea36a8 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java @@ -17,7 +17,6 @@ import java.net.ProxySelector; import java.text.MessageFormat; -import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IPreferencesService; @@ -46,8 +45,6 @@ private enum HttpClientType { private IPreferencesService preferencesService; - private IProxyService proxyService; - private IPreferenceChangeListener preferenceChangeListener; @Reference @@ -55,11 +52,6 @@ void setPreferencesService(IPreferencesService service) { this.preferencesService = service; } - @Reference - void setProxyService(IProxyService service) { - this.proxyService = service; - } - @Reference void setWorkspace(@SuppressWarnings("unused") IWorkspace workspace) { // Needed indirectly by the preferences service @@ -75,10 +67,13 @@ void start() { }; InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID) .addPreferenceChangeListener(preferenceChangeListener); - SshSessionFactory.setInstance(new EGitSshdSessionFactory(proxyService)); + SshSessionFactory.setInstance(new EGitSshdSessionFactory( + Activator.getDefault()::getProxyService)); - ProxySelector.setDefault(new EclipseProxySelector(proxyService)); - Authenticator.setDefault(new EclipseAuthenticator(proxyService)); + ProxySelector.setDefault(new EclipseProxySelector( + Activator.getDefault()::getProxyService)); + Authenticator.setDefault(new EclipseAuthenticator( + Activator.getDefault()::getProxyService)); } @Deactivate diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/EGitSshdSessionFactory.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/EGitSshdSessionFactory.java index be64425f1e..f7fccc55c1 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/EGitSshdSessionFactory.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/EGitSshdSessionFactory.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Supplier; import org.eclipse.core.net.proxy.IProxyData; import org.eclipse.core.net.proxy.IProxyService; @@ -49,9 +50,9 @@ public class EGitSshdSessionFactory extends SshdSessionFactory { * and a proxy database based on the {@link IProxyService}. * * @param service - * the {@link IProxyService} to use + * a {@link Supplier} supplying the {@link IProxyService} to use */ - public EGitSshdSessionFactory(IProxyService service) { + public EGitSshdSessionFactory(Supplier service) { super(null, new EGitProxyDataFactory(service)); SshPreferencesMirror.INSTANCE.start(); } @@ -110,21 +111,24 @@ protected KeyPasswordProvider createKeyPasswordProvider( private static class EGitProxyDataFactory implements ProxyDataFactory { - private final IProxyService proxyService; + private final Supplier proxyService; - public EGitProxyDataFactory(IProxyService service) { + EGitProxyDataFactory(Supplier service) { proxyService = service; } @Override public ProxyData get(InetSocketAddress remoteAddress) { + IProxyService srv = proxyService.get(); + if (srv == null) { + return null; + } try { - IProxyData[] data = proxyService + IProxyData[] data = srv .select(new URI(IProxyData.SOCKS_PROXY_TYPE, - "//" + remoteAddress.getHostString(), null)); //$NON-NLS-1$ + "//" + remoteAddress.getHostString(), null)); //$NON-NLS-1$ if (data == null || data.length == 0) { - data = proxyService.select(new URI( - IProxyData.HTTP_PROXY_TYPE, + data = srv.select(new URI(IProxyData.HTTP_PROXY_TYPE, "//" + remoteAddress.getHostString(), null)); //$NON-NLS-1$ if (data == null || data.length == 0) { return null; From 4fb4b003621d1522a9c8a657ca6f4e14bead0fe1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 25 Jan 2026 22:49:04 +0100 Subject: [PATCH 105/160] Update orbit - aQute.libg to 7.2.1.202601121903 - bndtools.api to 7.2.1.202601121903 - com.ibm.icu to 78.2.0 - junit-jupiter to 5.14.2 - junit-platform to 1.14.2 - org.commonmark to 0.27.1 - org.objectweb.asm to 9.9.1 Change-Id: Ieee2b274671c9c954c0796b0aabccf07f1529f8e --- org.eclipse.egit.target/egit-4.39.target | 48 ++++++++++---------- org.eclipse.egit.target/orbit/orbit-4.39.tpd | 48 ++++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 8595acdc5f..5069fc7c72 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -15,9 +15,9 @@ - - - + + + @@ -31,18 +31,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -61,19 +61,19 @@ - - + + - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.39.tpd b/org.eclipse.egit.target/orbit/orbit-4.39.tpd index a1d7fe1964..f770b06b63 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.39.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.39.tpd @@ -3,9 +3,9 @@ target "orbit-4.39" with source configurePhase // when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-03" { - aQute.libg [7.1.0.202411251545,7.1.0.202411251545] - bndtools.api [7.1.0.202411251545,7.1.0.202411251545] - com.ibm.icu [78.1.0,78.1.0] + aQute.libg [7.2.1.202601121903,7.2.1.202601121903] + bndtools.api [7.2.1.202601121903,7.2.1.202601121903] + com.ibm.icu [78.2.0,78.2.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] @@ -18,19 +18,19 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] jakarta.xml.bind-api [4.0.4,4.0.4] - javax.servlet-api [3.1.0,3.1.0] - junit-jupiter-api [5.14.1,5.14.1] - junit-jupiter-engine [5.14.1,5.14.1] - junit-jupiter-migrationsupport [5.14.1,5.14.1] - junit-jupiter-params [5.14.1,5.14.1] - junit-platform-commons [1.14.1,1.14.1] - junit-platform-engine [1.14.1,1.14.1] - junit-platform-launcher [1.14.1,1.14.1] - junit-platform-runner [1.14.1,1.14.1] - junit-platform-suite-api [1.14.1,1.14.1] - junit-platform-suite-commons [1.14.1,1.14.1] - junit-platform-suite-engine [1.14.1,1.14.1] - junit-vintage-engine [5.14.1,5.14.1] + javax.servlet-api [3.1.0,3.1.0] + junit-jupiter-api [5.14.2,5.14.2] + junit-jupiter-engine [5.14.2,5.14.2] + junit-jupiter-migrationsupport [5.14.2,5.14.2] + junit-jupiter-params [5.14.2,5.14.2] + junit-platform-commons [1.14.2,1.14.2] + junit-platform-engine [1.14.2,1.14.2] + junit-platform-launcher [1.14.2,1.14.2] + junit-platform-runner [1.14.2,1.14.2] + junit-platform-suite-api [1.14.2,1.14.2] + junit-platform-suite-commons [1.14.2,1.14.2] + junit-platform-suite-engine [1.14.2,1.14.2] + junit-vintage-engine [5.14.2,5.14.2] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] @@ -49,19 +49,19 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.apache.lucene.analysis-common [10.3.2.v20251117-1800,10.3.2.v20251117-1800] org.apache.lucene.analysis-smartcn [10.3.2.v20251117-1800,10.3.2.v20251117-1800] org.apache.lucene.core [10.3.2.v20251117-1800,10.3.2.v20251117-1800] - org.commonmark [0.27.0,0.27.0] - org.commonmark.ext-gfm-tables [0.27.0,0.27.0] + org.commonmark [0.27.1,0.27.1] + org.commonmark.ext-gfm-tables [0.27.1,0.27.1] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [3.0.0,3.0.0] org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.objectweb.asm [9.9.0, 9.9.0] - org.objectweb.asm.source [9.9.0, 9.9.0] - org.objectweb.asm.commons [9.9.0,9.9.0] - org.objectweb.asm.tree [9.9.0, 9.9.0] - org.objectweb.asm.tree.analysis [9.9.0, 9.9.0] - org.objectweb.asm.util [9.9.0, 9.9.0] + org.objectweb.asm [9.9.1, 9.9.1] + org.objectweb.asm.source [9.9.1, 9.9.1] + org.objectweb.asm.commons [9.9.1,9.9.1] + org.objectweb.asm.tree [9.9.1, 9.9.1] + org.objectweb.asm.tree.analysis [9.9.1, 9.9.1] + org.objectweb.asm.util [9.9.1, 9.9.1] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] org.opentest4j [1.3.0,1.3.0] From 0490fe3cc9f0f75b577b2c96c5a3615a8aa264fd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 25 Jan 2026 22:50:27 +0100 Subject: [PATCH 106/160] Update jgit dependencies - bytebuddy to 1.18.4 - org.assertj:assertj-core to 3.27.7 Change-Id: I7278083e2ad12e3d9c5442bda22121853438dbb2 --- org.eclipse.egit.target/egit-4.36.target | 8 ++++---- org.eclipse.egit.target/egit-4.37.target | 8 ++++---- org.eclipse.egit.target/egit-4.38.target | 8 ++++---- org.eclipse.egit.target/egit-4.39.target | 8 ++++---- org.eclipse.egit.target/maven/dependencies.tpd | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index d26e33a88d..c48cd6d202 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.2 + 1.18.4 jar net.bytebuddy byte-buddy-agent - 1.18.2 + 1.18.4 jar @@ -350,7 +350,7 @@ org.assertj assertj-core - 3.27.6 + 3.27.7 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 856994a7c8..9e5043da99 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.2 + 1.18.4 jar net.bytebuddy byte-buddy-agent - 1.18.2 + 1.18.4 jar @@ -350,7 +350,7 @@ org.assertj assertj-core - 3.27.6 + 3.27.7 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index f5eb9ce3bc..e1f3e92247 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.2 + 1.18.4 jar net.bytebuddy byte-buddy-agent - 1.18.2 + 1.18.4 jar @@ -350,7 +350,7 @@ org.assertj assertj-core - 3.27.6 + 3.27.7 jar diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 5069fc7c72..2d7d2ad4e4 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.2 + 1.18.4 jar net.bytebuddy byte-buddy-agent - 1.18.2 + 1.18.4 jar @@ -350,7 +350,7 @@ org.assertj assertj-core - 3.27.6 + 3.27.7 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 22d4bc6242..0c77cd87e5 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -55,7 +55,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.6" + version = "3.27.7" } } @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.2" + version = "1.18.4" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.2" + version = "1.18.4" } } From 46559c5e55e528d3a5130902c33edf83c7c99b5a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 26 Jan 2026 22:43:46 +0100 Subject: [PATCH 107/160] EGit v7.6.0.202601262032-m2 Change-Id: I079233c49418c45a8978d7ac59a0c835b1451abc Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 914ab7a772..0fe1b874bf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 dea817abd1..b3ffc40b26 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 0da673ff6f..ec8156d900 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 634cde030f..bbb61a318d 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d53677555..bcc49d5e26 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 9c74e3d6ad..d10d565b71 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d0b69205e8..381bf1dca0 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 f825b80a31..d1b164cc82 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 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 3aa255874e..08fcc7b25f 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f0c5a11556..a3985f7a76 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 29d1974b2e..98bdd6a343 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 5cc904d81e..d30aee1aa6 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0d71b4150a..b857c32077 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 1742603484..e1db560d1b 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 35b7f6d40f..d0e3af925d 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 009a07b9ac..a557acb84f 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9c5ca560e4..77c3e3a5dc 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 453f3b8653..b8e514db4b 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 80081187e4..9dbb481d75 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 73e27d49a4..6b2ca1a2bb 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 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 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 index 45aa6df347..432bc0e42e 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 112eb4e32c..ce31b565d8 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8290508cf5..cb482c17f1 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202601262032-m2 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 36260d652a..13e876f784 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 org.eclipse.egit diff --git a/pom.xml b/pom.xml index b013fa0bf7..1c66dd06e8 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0-SNAPSHOT + 7.6.0.202601262032-m2 4.0.13 21 3.40.0 From 6ec334f2679877a3b7f9be3b0b79821e2ed07f14 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 1 Feb 2026 16:02:52 +0100 Subject: [PATCH 108/160] Update Apache MINA SSHD to 2.17.1 in target platform Change-Id: Idc2fa0ab3d1a60f6a6407e4d238981b1dd5e5263 --- org.eclipse.egit.target/egit-4.36.target | 6 +++--- org.eclipse.egit.target/egit-4.37.target | 6 +++--- org.eclipse.egit.target/egit-4.38.target | 6 +++--- org.eclipse.egit.target/egit-4.39.target | 8 ++++---- org.eclipse.egit.target/maven/dependencies.tpd | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index c48cd6d202..3890c8983f 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -186,13 +186,13 @@ org.apache.sshd sshd-osgi - 2.16.0 + 2.17.1 jar org.apache.sshd sshd-sftp - 2.16.0 + 2.17.1 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 9e5043da99..1238352d59 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -186,13 +186,13 @@ org.apache.sshd sshd-osgi - 2.16.0 + 2.17.1 jar org.apache.sshd sshd-sftp - 2.16.0 + 2.17.1 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index e1f3e92247..ea1e3c6540 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -186,13 +186,13 @@ org.apache.sshd sshd-osgi - 2.16.0 + 2.17.1 jar org.apache.sshd sshd-sftp - 2.16.0 + 2.17.1 jar diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 2d7d2ad4e4..c8ca4b1a28 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -186,13 +186,13 @@ org.apache.sshd sshd-osgi - 2.16.0 + 2.17.1 jar org.apache.sshd sshd-sftp - 2.16.0 + 2.17.1 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 0c77cd87e5..f6ed47a5c9 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -224,12 +224,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.16.0" + version = "2.17.1" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.16.0" + version = "2.17.1" } } From 47e58c9d2053c255f172c4163950beed4326507d Mon Sep 17 00:00:00 2001 From: Philipp Kurrle Date: Thu, 12 Feb 2026 18:12:57 +0100 Subject: [PATCH 109/160] Add 'Reuse Compare Editor' toggle to Staging View menu The GitHistoryPage and CompareTreeView already expose the 'Reuse Compare Editor' preference via a menu toggle. This change adds the same toggle to the Staging View's dropdown menu for consistency. This allows users to control whether double-clicking files in the Staging View opens a new compare editor or reuses an existing one. Bug: egit-133 Change-Id: I6b9cf6434de1f8cd12f056e923eee3610cbc74aa --- .../org/eclipse/egit/ui/internal/staging/StagingView.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index e3baf50a69..ee15a0fd92 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -375,6 +375,8 @@ public class StagingView extends ViewPart private IAction compareModeAction; + private IWorkbenchAction reuseCompareEditorAction; + private IWorkbenchAction switchRepositoriesAction; /** The currently set repository, even if it is bare. */ @@ -2312,6 +2314,8 @@ public void run() { dropdownMenu.add(columnLayoutAction); dropdownMenu.add(fileNameModeAction); dropdownMenu.add(compareModeAction); + reuseCompareEditorAction = new CompareUtils.ReuseCompareEditorAction(); + dropdownMenu.add(reuseCompareEditorAction); actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), new GlobalDeleteActionHandler()); @@ -4975,6 +4979,10 @@ public void dispose() { presentationAction.dispose(); presentationAction = null; } + if (reuseCompareEditorAction != null) { + reuseCompareEditorAction.dispose(); + reuseCompareEditorAction = null; + } getPreferenceStore().removePropertyChangeListener(uiPrefsListener); From 26d9b49a168b22ea8485311349c8945a02eded0d Mon Sep 17 00:00:00 2001 From: Elsa Zacharia Date: Wed, 11 Feb 2026 19:29:30 +0530 Subject: [PATCH 110/160] Add missing descriptions to theme entries in Preferences Some Colors and Fonts entries already provide descriptions via ThemeElementCategory, while others do not. This change uses the existing descriptions to display in the description box and adds description for ones that doesn't have any entries to ensure that the description area is not left empty and that available descriptions are consistently utilised. The main change pertaining to this has been merged in eclipse.platform.ui and eclipse.platform via eclipse-platform/eclipse.platform.ui#3666, eclipse-platform/eclipse.platform#2453, and https://github.com/eclipse-jdt/eclipse.jdt.ui/pull/2799 respectively. some of the remaining part pertaining to the above PR's is addressed via this change. Change-Id: Ib3b195cfc9978557d7c18545f6e3c83d1154392a --- org.eclipse.egit.ui/plugin.properties | 1 + org.eclipse.egit.ui/plugin.xml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties index 8bad0f4e9f..c55e3d1d37 100644 --- a/org.eclipse.egit.ui/plugin.properties +++ b/org.eclipse.egit.ui/plugin.properties @@ -137,6 +137,7 @@ Theme_IgnoredResourceBackgroundColor_label=Ignored Resource (Background) Theme_IgnoredResourceBackgroundColor_description=This color is used for the background color for resources that are ignored. Theme_IgnoredResourceFont_label=Ignored Resource (Font) Theme_IgnoredResourceFont_description=The font used to display resources that are ignored. +Theme_Eclipse_Git_UI_description = Colors and fonts used in Git commits, history, and more. GitPreferences_name=Git GitPreferences_DiffTools_name=Diff/Merge diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 9dfc9175e7..b557c21d19 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -800,7 +800,11 @@ + label="%Theme_label"> + + %Theme_Eclipse_Git_UI_description + + Date: Tue, 17 Feb 2026 22:20:30 +0100 Subject: [PATCH 111/160] Prepare 7.6.0-SNAPSHOT builds Change-Id: I47a4b3016c0e6b42c0879476b7d42f076af3ab86 --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 0fe1b874bf..914ab7a772 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-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 b3ffc40b26..dea817abd1 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index ec8156d900..0da673ff6f 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 - 7.6.0.202601262032-m2 + 7.6.0-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 bbb61a318d..634cde030f 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index bcc49d5e26..5d53677555 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 - 7.6.0.202601262032-m2 + 7.6.0-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 d10d565b71..9c74e3d6ad 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 381bf1dca0..d0b69205e8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-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 d1b164cc82..f825b80a31 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 08fcc7b25f..3aa255874e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index a3985f7a76..f0c5a11556 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 - 7.6.0.202601262032-m2 + 7.6.0-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 98bdd6a343..29d1974b2e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index d30aee1aa6..5cc904d81e 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 - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index b857c32077..0d71b4150a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index e1db560d1b..1742603484 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 - 7.6.0.202601262032-m2 + 7.6.0-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 d0e3af925d..35b7f6d40f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index a557acb84f..009a07b9ac 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 77c3e3a5dc..9c5ca560e4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index b8e514db4b..453f3b8653 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 - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 9dbb481d75..80081187e4 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 6b2ca1a2bb..73e27d49a4 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 - 7.6.0.202601262032-m2 + 7.6.0-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 index 432bc0e42e..45aa6df347 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index ce31b565d8..112eb4e32c 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index cb482c17f1..8290508cf5 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: 7.6.0.202601262032-m2 +Bundle-Version: 7.6.0.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 13e876f784..36260d652a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 1c66dd06e8..b013fa0bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202601262032-m2 + 7.6.0-SNAPSHOT 4.0.13 21 3.40.0 From 6e93b6f9151a795461c5ae73af7b0807bf5b626b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 17 Feb 2026 22:21:16 +0100 Subject: [PATCH 112/160] EGit v7.6.0.202602172005-m3 Change-Id: I27c4b9191f28f2f6664dea569eaa5d3ad899f53f Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 914ab7a772..6f39751f1e 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 dea817abd1..ea981d406a 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 0da673ff6f..e48c1fc8cd 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 634cde030f..1a47415d0a 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d53677555..f5151e5be4 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 9c74e3d6ad..48746b1834 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d0b69205e8..3aa56f719a 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 f825b80a31..16eb29608f 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 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 3aa255874e..8a62335011 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f0c5a11556..4ec086b413 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 29d1974b2e..eb7665ee80 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 5cc904d81e..c5eb458813 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0d71b4150a..191aaf1ba6 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 1742603484..5466af89f0 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 35b7f6d40f..330901df7d 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 009a07b9ac..3d8dd98725 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9c5ca560e4..1850b46393 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 453f3b8653..1f87f0892f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 80081187e4..f7917155bb 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 73e27d49a4..7c98b5e54f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 index 45aa6df347..64328a9a91 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 112eb4e32c..ed68c0e5e8 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8290508cf5..360bc4d962 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 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 36260d652a..b18f59204c 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.egit diff --git a/pom.xml b/pom.xml index b013fa0bf7..fb5b8d8c20 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 4.0.13 21 3.40.0 From e0add7043aa7e9eb148b339ec3e9eaf2b13f6953 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 18:09:42 +0100 Subject: [PATCH 113/160] EGit v7.6.0.202602181523-m3 Change-Id: Ida5995b7d8cf6ba38456025dc5c0df8f6224c284 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 6f39751f1e..a82bf5f817 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 ea981d406a..45d0b94120 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index e48c1fc8cd..d4aa8980d6 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 1a47415d0a..48b046d7a2 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index f5151e5be4..d83e6ea7e5 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 48746b1834..b40aac4888 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 3aa56f719a..a36bb9b744 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 16eb29608f..3c55da96bc 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 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 8a62335011..02dcf2bc9f 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 4ec086b413..d7274a25cd 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 eb7665ee80..becb415956 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index c5eb458813..f2aba61028 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 191aaf1ba6..40dcf16102 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 5466af89f0..3e2ca154e7 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 330901df7d..db8157a2b0 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 3d8dd98725..ac3a85995b 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 1850b46393..5189f9733b 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 1f87f0892f..9e2d060c2d 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index f7917155bb..4eb8875d0f 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 7c98b5e54f..923316ac87 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 index 64328a9a91..9b57ec113a 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index ed68c0e5e8..b6b199e059 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 360bc4d962..7585d18a0b 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 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 b18f59204c..608a555cab 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.egit diff --git a/pom.xml b/pom.xml index fb5b8d8c20..ebb8895efd 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 4.0.13 21 3.40.0 From 3ffb8e61d33c3d7c5b4ad26ba423b04add6cbaa2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 22:11:04 +0100 Subject: [PATCH 114/160] Prepare 7.6.0-SNAPSHOT builds Change-Id: Ia1ec922fd7440ccc43d7fc3ea509113140a52a7f --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a82bf5f817..914ab7a772 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-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 45d0b94120..dea817abd1 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index d4aa8980d6..0da673ff6f 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 - 7.6.0.202602181523-m3 + 7.6.0-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 48b046d7a2..634cde030f 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index d83e6ea7e5..5d53677555 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 - 7.6.0.202602181523-m3 + 7.6.0-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 b40aac4888..9c74e3d6ad 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index a36bb9b744..d0b69205e8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-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 3c55da96bc..f825b80a31 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 02dcf2bc9f..3aa255874e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index d7274a25cd..f0c5a11556 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 - 7.6.0.202602181523-m3 + 7.6.0-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 becb415956..29d1974b2e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index f2aba61028..5cc904d81e 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 40dcf16102..0d71b4150a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 3e2ca154e7..1742603484 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 - 7.6.0.202602181523-m3 + 7.6.0-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 db8157a2b0..35b7f6d40f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index ac3a85995b..009a07b9ac 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 5189f9733b..9c5ca560e4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 9e2d060c2d..453f3b8653 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 4eb8875d0f..80081187e4 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 923316ac87..73e27d49a4 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 - 7.6.0.202602181523-m3 + 7.6.0-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 index 9b57ec113a..45aa6df347 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index b6b199e059..112eb4e32c 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 7585d18a0b..8290508cf5 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.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 608a555cab..36260d652a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index ebb8895efd..b013fa0bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT 4.0.13 21 3.40.0 From 5c3ec1ca6a1af53f31e724c71a148bcc8e9fca93 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 23:12:12 +0100 Subject: [PATCH 115/160] Update orbit - jakarta.xml.bind-api to 4.0.5 - junit-jupiter to 5.14.3 - junit-platform to 1.14.3 - org.objenesis to 3.5.0 Change-Id: I60c4354583502a95ad97adf22bd6cef307fdaacb --- org.eclipse.egit.target/egit-4.39.target | 32 ++++++++++---------- org.eclipse.egit.target/orbit/orbit-4.39.tpd | 30 +++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index c8ca4b1a28..e22712e296 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -29,20 +29,20 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -74,8 +74,8 @@ - - + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.39.tpd b/org.eclipse.egit.target/orbit/orbit-4.39.tpd index f770b06b63..bee978d57f 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.39.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.39.tpd @@ -17,20 +17,20 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api [4.0.4,4.0.4] + jakarta.xml.bind-api [4.0.5,4.0.5] javax.servlet-api [3.1.0,3.1.0] - junit-jupiter-api [5.14.2,5.14.2] - junit-jupiter-engine [5.14.2,5.14.2] - junit-jupiter-migrationsupport [5.14.2,5.14.2] - junit-jupiter-params [5.14.2,5.14.2] - junit-platform-commons [1.14.2,1.14.2] - junit-platform-engine [1.14.2,1.14.2] - junit-platform-launcher [1.14.2,1.14.2] - junit-platform-runner [1.14.2,1.14.2] - junit-platform-suite-api [1.14.2,1.14.2] - junit-platform-suite-commons [1.14.2,1.14.2] - junit-platform-suite-engine [1.14.2,1.14.2] - junit-vintage-engine [5.14.2,5.14.2] + junit-jupiter-api [5.14.3,5.14.3] + junit-jupiter-engine [5.14.3,5.14.3] + junit-jupiter-migrationsupport [5.14.3,5.14.3] + junit-jupiter-params [5.14.3,5.14.3] + junit-platform-commons [1.14.3,1.14.3] + junit-platform-engine [1.14.3,1.14.3] + junit-platform-launcher [1.14.3,1.14.3] + junit-platform-runner [1.14.3,1.14.3] + junit-platform-suite-api [1.14.3,1.14.3] + junit-platform-suite-commons [1.14.3,1.14.3] + junit-platform-suite-engine [1.14.3,1.14.3] + junit-vintage-engine [5.14.3,5.14.3] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] @@ -62,8 +62,8 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.objectweb.asm.tree [9.9.1, 9.9.1] org.objectweb.asm.tree.analysis [9.9.1, 9.9.1] org.objectweb.asm.util [9.9.1, 9.9.1] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] + org.objenesis [3.5.0,3.5.0] + org.objenesis.source [3.5.0,3.5.0] org.opentest4j [1.3.0,1.3.0] org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] From 316f1028d8af7fdf5919ee23838dd4173b78369d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 23:14:38 +0100 Subject: [PATCH 116/160] Update JGit dependencies - bytebuddy to 1.18.5 - commons-codec to 1.21.0 - jetty to 12.1.6 Change-Id: Ie810a9437637dc8850753cef9bf2eb81434d6329 --- org.eclipse.egit.target/egit-4.36.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.38.target | 24 +++++++++---------- org.eclipse.egit.target/egit-4.39.target | 24 +++++++++---------- .../maven/dependencies.tpd | 22 ++++++++--------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 3890c8983f..275d0fddd6 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index 1238352d59..a7d5b243bb 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index ea1e3c6540..e60d3fe7fd 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index e22712e296..1c5148f59a 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -228,49 +228,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar @@ -306,13 +306,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar @@ -370,7 +370,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index f6ed47a5c9..5a00cec53e 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -9,7 +9,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.20.0" + version = "1.21.0" } dependency { groupId = "org.apache.commons" @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.4" + version = "1.18.5" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.4" + version = "1.18.5" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "jakarta.servlet" From 7790e2ad1890ce95a688154c64f5c47ea9fd1424 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Feb 2026 12:39:46 +0100 Subject: [PATCH 117/160] ExistingOrNewPage: allow sharing nested projects The check for existing .project files in parent directories of the target location prevented sharing nested projects. Since Eclipse supports nested projects since 2015, this check is outdated and has been removed. Also adds a test to verify that projects can be shared into repositories where parent directories contain .project files. Bug: egit-63 Change-Id: I1ff9e766a347d8a95cf68dbdb2aaaecf517c0dce --- .../share/SharingWizardNestedProjectTest.java | 151 ++++++++++++++++++ .../org/eclipse/egit/ui/internal/UIText.java | 3 - .../internal/sharing/ExistingOrNewPage.java | 12 -- .../egit/ui/internal/uitext.properties | 1 - 4 files changed, 151 insertions(+), 16 deletions(-) create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardNestedProjectTest.java diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardNestedProjectTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardNestedProjectTest.java new file mode 100644 index 0000000000..b1bb7d8af5 --- /dev/null +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardNestedProjectTest.java @@ -0,0 +1,151 @@ +/******************************************************************************* + * Copyright (c) 2025 Eclipse Foundation and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.wizards.share; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.egit.core.RepositoryUtil; +import org.eclipse.egit.ui.common.ExistingOrNewPage; +import org.eclipse.egit.ui.common.LocalRepositoryTestCase; +import org.eclipse.egit.ui.common.SharingWizard; +import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.egit.ui.test.Eclipse; +import org.eclipse.egit.ui.test.TestUtil; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jgit.util.FileUtils; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Tests for sharing projects in nested configurations where parent directories + * contain .project files. This verifies that EGit correctly handles nested + * projects, a feature that Eclipse has supported since 2015. + */ +@RunWith(SWTBotJunit4ClassRunner.class) +public class SharingWizardNestedProjectTest extends LocalRepositoryTestCase { + + private static final String projectName1 = "ChildProject"; + private SharingWizard sharingWizard; + private File repoFolder; + + @Before + public void setupViews() { + TestUtil.showExplorerView(); + sharingWizard = new SharingWizard(); + } + + @After + public void after() throws Exception { + // Clean up projects if they exist + try { + erase(projectName1); + } catch (Exception e) { + // ignore + } + + if (repoFolder != null && repoFolder.exists()) { + FileUtils.delete(repoFolder, FileUtils.RECURSIVE); + } + + ResourcesPlugin.getWorkspace().getRoot().refreshLocal( + IResource.DEPTH_INFINITE, null); + new Eclipse().reset(); + } + + private void erase(String projectName) { + // Simplified erase for this test + try { + ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) + .delete(true, true, null); + } catch (CoreException e) { + // ignore + } + } + + private static void createProject(String projectName) throws CoreException { + bot.menu("File").menu("New").menu("Project...").click(); + SWTBotShell createProjectDialogShell = bot.shell("New Project"); + SWTBotTreeItem item = bot.tree().getTreeItem("General"); + TestUtil.expandAndWait(item).getNode("Project").select(); + bot.button("Next >").click(); + + bot.textWithLabel("Project name:").setText(projectName); + + bot.button("Finish").click(); + // Wait explicitly for the shell to close + bot.waitUntil(org.eclipse.swtbot.swt.finder.waits.Conditions + .shellCloses(createProjectDialogShell), 10000); + ResourcesPlugin.getWorkspace().getRoot() + .refreshLocal(IResource.DEPTH_INFINITE, null); + } + + @Test + public void shareProjectIntoRepoWithProjectFile() throws Exception { + String repoName = "RepoWithProjectFile"; + createProject(projectName1); + + // 1. Open Wizard + ExistingOrNewPage existingOrNewPage = sharingWizard.openWizard(projectName1); + + // 2. Create External Repository + SWTBotShell createRepoDialog = existingOrNewPage.clickCreateRepository(); + String repoDir = RepositoryUtil.getDefaultRepositoryDir(); + repoFolder = new File(repoDir, repoName); + if (repoFolder.exists()) { + FileUtils.delete(repoFolder, FileUtils.RECURSIVE); + } + createRepoDialog.bot() + .textWithLabel(UIText.CreateRepositoryPage_DirectoryLabel) + .setText(repoFolder.getAbsolutePath()); + createRepoDialog.bot().button(IDialogConstants.FINISH_LABEL).click(); + + // 3. Create a .project file in the repository root to simulate the repo being a project itself + new File(repoFolder, ".project").createNewFile(); + + // 4. Select the repository + SWTBotCombo combo = bot.comboBoxWithLabel(UIText.ExistingOrNewPage_ExistingRepositoryLabel); + assertTrue(combo.getText().startsWith(repoName)); + + // 5. Verify that the wizard allows sharing (nested project check removed) + + // Wait a bit for UI to update + bot.sleep(1000); + + // Check if "Finish" is enabled. It should be enabled now. + boolean finishEnabled = bot.button(IDialogConstants.FINISH_LABEL).isEnabled(); + assertTrue("Finish button should be enabled for nested projects", finishEnabled); + + // Finish the wizard + SWTBotShell shell = bot.activeShell(); + bot.button(IDialogConstants.FINISH_LABEL).click(); + bot.waitUntil(org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses(shell)); + + ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); + + // Verify that the project was shared + String projectLocation = ResourcesPlugin.getWorkspace().getRoot() + .getProject(projectName1).getLocation().toOSString(); + String expectedLocation = new File(repoFolder, projectName1).getAbsolutePath(); + assertEquals("Project should be moved to the repository", expectedLocation, projectLocation); + } +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 6c180e812f..e381c72a59 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -366,9 +366,6 @@ public class UIText extends NLS { /** */ public static String ExistingOrNewPage_InternalModeCheckbox; - /** */ - public static String ExistingOrNewPage_NestedProjectErrorMessage; - /** */ public static String ExistingOrNewPage_NewLocationTargetHeader; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java index e10fc21e75..ffe8012590 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java @@ -604,18 +604,6 @@ protected void updateControls() { prj.getName())); break; } - File parent = targetTest.getParentFile(); - while (parent != null) { - if (new File(parent, ".project").exists()) { //$NON-NLS-1$ - setErrorMessage(NLS - .bind(UIText.ExistingOrNewPage_NestedProjectErrorMessage, - new Object[] { prj.getName(), - targetTest.getPath(), - parent.getPath() })); - break; - } - parent = parent.getParentFile(); - } // break after the first error if (getErrorMessage() != null) break; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 1ac7990cf2..f409e67580 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -143,7 +143,6 @@ ExistingOrNewPage_HeaderLocation=Location ExistingOrNewPage_HeaderProject=Project ExistingOrNewPage_HeaderRepository=Repository ExistingOrNewPage_InternalModeCheckbox=&Use or create repository in parent folder of project -ExistingOrNewPage_NestedProjectErrorMessage=Cannot move project {0} to target location {1}, as this location overlaps with location {2}, which contains a .project file ExistingOrNewPage_NewLocationTargetHeader=Target Location ExistingOrNewPage_NoRepositorySelectedMessage=No repository selected ExistingOrNewPage_ProjectNameColumnHeader=Project From dc3e6c962f1d26a6ad10dd0ed80a618d48e0dc52 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 23 Feb 2026 11:18:41 +0100 Subject: [PATCH 118/160] Remove the option to create 'blank issues' in GitHub As described in the official documentation: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser Change-Id: I81d6a25478f122fdc9b5cb6db6e8a6758b4f5a0b --- .github/ISSUE_TEMPLATE/config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..3ba13e0cec --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false From 2ef313999cfc3d0508497bb26d14797ebfff78a2 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 23 Feb 2026 17:13:06 +0100 Subject: [PATCH 119/160] Add fetch result notification as alternative to result dialog Introduce FetchResultNotification, a non-blocking, auto-dismissing popup based on AbstractNotificationPopup, that appears after a successful fetch and shows how many refs were updated (or "everything up to date"). A "Details..." link opens the existing FetchResultDialog for the full details. A new boolean preference FETCH_SHOW_NOTIFICATION (default: off) lets users opt in via Team > Git > Confirmations and Warnings: "Use notification instead of dialog for fetch result". The org.eclipse.jface.notifications bundle is added as a required dependency. Bug: egit-137 Change-Id: I547f9c6e144e769b581857b38715bf76331ab581 --- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 3 +- .../egit/ui/PluginPreferenceInitializer.java | 1 + .../org/eclipse/egit/ui/UIPreferences.java | 2 + .../org/eclipse/egit/ui/internal/UIText.java | 15 +++ .../ui/internal/fetch/FetchOperationUI.java | 12 +- .../fetch/FetchResultNotification.java | 110 ++++++++++++++++++ .../preferences/DialogsPreferencePage.java | 2 + .../egit/ui/internal/uitext.properties | 5 + 8 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 45aa6df347..5566c92b71 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.e4.core.contexts;bundle-version="[1.13.100,2.0.0)", org.eclipse.e4.core.services;bundle-version="[2.5.200,3.0.0)", org.eclipse.e4.ui.workbench;bundle-version="[1.18.0,2.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)" + org.eclipse.ui.workbench;bundle-version="[3.135.100,4.0.0)", + org.eclipse.jface.notifications;bundle-version="[0.4.0,1.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java index ee9e5a8549..b1b191c547 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java @@ -119,6 +119,7 @@ public void initializeDefaultPreferences() { store.setDefault(UIPreferences.SHOW_REBASE_CONFIRM, false); store.setDefault(UIPreferences.SHOW_INITIAL_CONFIG_DIALOG, true); store.setDefault(UIPreferences.SHOW_FETCH_POPUP_SUCCESS, true); + store.setDefault(UIPreferences.FETCH_SHOW_NOTIFICATION, false); store.setDefault(UIPreferences.SHOW_PUSH_POPUP_SUCCESS, true); store.setDefault(UIPreferences.SHOW_HOME_DIR_WARNING, true); store.setDefault(UIPreferences.LFS_AUTO_CONFIGURATION, false); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java index eb85c9197a..90b2fa8ea5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java @@ -228,6 +228,8 @@ private UIPreferences() { /** */ public static final String SHOW_PUSH_POPUP_SUCCESS = "show_push_success_dialog"; //$NON-NLS-1$ /** */ + public static final String FETCH_SHOW_NOTIFICATION = "fetch_show_notification"; //$NON-NLS-1$ + /** */ public static final String SHOW_HOME_DIR_WARNING = "show_home_drive_warning"; //$NON-NLS-1$ /** */ public static final String LFS_AUTO_CONFIGURATION = "auto_lfs_config"; //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index e381c72a59..646c6753d1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -3309,6 +3309,18 @@ public class UIText extends NLS { /** */ public static String FetchResultDialog_CloseButton; + /** */ + public static String FetchResultNotification_Title; + + /** */ + public static String FetchResultNotification_UpToDate; + + /** */ + public static String FetchResultNotification_RefsUpdated; + + /** */ + public static String FetchResultNotification_Details; + /** */ public static String FetchResultTable_addingChildren; @@ -4220,6 +4232,9 @@ public class UIText extends NLS { /** */ public static String DialogsPreferencePage_ShowFetchInfoDialog; + /** */ + public static String DialogsPreferencePage_FetchShowNotification; + /** */ public static String DialogsPreferencePage_ShowPushInfoDialog; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchOperationUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchOperationUI.java index da5be1ae2b..6f0f73e822 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchOperationUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchOperationUI.java @@ -184,9 +184,15 @@ public ShowResultAction(@NonNull Repository repository, protected void showResult(@NonNull Repository repository) { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getShell(); - FetchResultDialog dialog = new FetchResultDialog(shell, repository, - result, source); - dialog.open(); + if (Activator.getDefault().getPreferenceStore() + .getBoolean(UIPreferences.FETCH_SHOW_NOTIFICATION)) { + new FetchResultNotification(shell, repository, result, source) + .open(); + } else { + FetchResultDialog dialog = new FetchResultDialog(shell, + repository, result, source); + dialog.open(); + } } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java new file mode 100644 index 0000000000..b46f94bc51 --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java @@ -0,0 +1,110 @@ +/******************************************************************************* + * Copyright (C) 2026 vogella GmbH and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.fetch; + +import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.notifications.AbstractNotificationPopup; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.transport.FetchResult; + +/** + * A non-blocking, auto-dismissing notification shown after a successful fetch + * operation when the user has enabled the notification preference. Uses Eclipse's + * {@link AbstractNotificationPopup} for proper fade animation and positioning. + */ +public class FetchResultNotification extends AbstractNotificationPopup { + + private static final long DELAY_CLOSE_MS = 5000; + + private final Repository repository; + + private final FetchResult result; + + private final String source; + + /** + * @param parent + * the parent shell (used to obtain the Display) + * @param repository + * the repository that was fetched + * @param result + * the fetch result + * @param source + * display string identifying the remote source + */ + public FetchResultNotification(Shell parent, Repository repository, + FetchResult result, String source) { + super(parent.getDisplay()); + this.repository = repository; + this.result = result; + this.source = source; + setDelayClose(DELAY_CLOSE_MS); + setFadingEnabled(true); + } + + @Override + protected void initializeBounds() { + super.initializeBounds(); // computes and applies the correct size + IWorkbenchWindow window = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow(); + if (window != null) { + Rectangle wb = window.getShell().getBounds(); + Rectangle nb = getShell().getBounds(); + getShell().setLocation(wb.x + wb.width - nb.width, + wb.y + wb.height - nb.height); + } + } + + @Override + protected String getPopupShellTitle() { + return NLS.bind(UIText.FetchResultNotification_Title, source); + } + + @Override + protected void createContentArea(Composite parent) { + GridLayoutFactory.fillDefaults().margins(4, 0).applyTo(parent); + + Label body = new Label(parent, SWT.WRAP); + int updateCount = result.getTrackingRefUpdates().size(); + if (updateCount == 0) { + body.setText(UIText.FetchResultNotification_UpToDate); + } else { + body.setText(NLS.bind(UIText.FetchResultNotification_RefsUpdated, + Integer.valueOf(updateCount))); + } + GridDataFactory.fillDefaults().grab(true, false).hint(280, SWT.DEFAULT) + .applyTo(body); + + Link details = new Link(parent, SWT.NONE); + details.setText( + "" + UIText.FetchResultNotification_Details + ""); //$NON-NLS-1$ //$NON-NLS-2$ + details.addListener(SWT.Selection, e -> { + close(); + Shell activeShell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + FetchResultDialog dialog = new FetchResultDialog(activeShell, + repository, result, source); + dialog.open(); + }); + GridDataFactory.fillDefaults().applyTo(details); + } +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java index bc23bcb4e7..0a8e48134e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java @@ -107,6 +107,8 @@ protected void createFieldEditors() { addField(editor); editor.getDescriptionControl(infoGroup) .setToolTipText(UIText.DialogsPreferencePage_ShowTooltip); + addField(new BooleanFieldEditor(UIPreferences.FETCH_SHOW_NOTIFICATION, + UIText.DialogsPreferencePage_FetchShowNotification, infoGroup)); editor = new BooleanFieldEditor(UIPreferences.SHOW_PUSH_POPUP_SUCCESS, UIText.DialogsPreferencePage_ShowPushInfoDialog, infoGroup); addField(editor); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index f409e67580..9d41eda5d0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1125,6 +1125,10 @@ FetchResultDialog_labelEmptyResult=No ref to fetch from {0} - everything up to d FetchResultDialog_labelNonEmptyResult=Fetched from {0}. FetchResultDialog_title=Fetch Results: {0} FetchResultDialog_CloseButton=C&lose +FetchResultNotification_Title=Fetched from {0} +FetchResultNotification_UpToDate=Everything up to date. +FetchResultNotification_RefsUpdated={0} ref(s) updated. +FetchResultNotification_Details=Details... FetchResultTable_addingChildren=Adding Children FetchResultTable_counterCommits=\ ({0}) @@ -1498,6 +1502,7 @@ DialogsPreferencePage_HideConfirmationGroupHeader=Show confirmation dialogs DialogsPreferencePage_ShowDeleteRepoGroup=Deletion of non-empty repository groups in the repositories view DialogsPreferencePage_ShowInfoGroupHeader=Show result dialogs after git remote operations DialogsPreferencePage_ShowFetchInfoDialog=&Fetch Result Dialog +DialogsPreferencePage_FetchShowNotification=Use ¬ification instead of dialog for fetch result DialogsPreferencePage_ShowPushInfoDialog=&Push Result Dialog DialogsPreferencePage_ShowTooltip=If unchecked, the result dialog will not be shown automatically. It will still be available via the progress view. DialogsPreferencePage_HideWarningGroupHeader=Log warnings From 010d67ba05fff35ac0464e7c3ae95645efc8da45 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Feb 2026 00:23:02 +0100 Subject: [PATCH 120/160] EGit v7.6.0.202602242313-rc1 Change-Id: Iab9a5d5c681566e4c9ee2018db32fa485de1b88e Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 914ab7a772..07415bf697 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 dea817abd1..d394321d44 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 0da673ff6f..d53b006209 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 634cde030f..9504f3b320 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d53677555..7d5886434a 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 9c74e3d6ad..d2c117c1d2 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d0b69205e8..d6d186aa2f 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 f825b80a31..26fc3c7ba3 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 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 3aa255874e..85034caa1c 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f0c5a11556..d208d6fa73 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 29d1974b2e..7e3107ffbe 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 5cc904d81e..2b725e597e 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0d71b4150a..92f1d19ee4 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 1742603484..4b97d2a741 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 35b7f6d40f..fd54753bff 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 009a07b9ac..f1eeafb54c 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9c5ca560e4..b8bd4a1ecc 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 453f3b8653..838f692d98 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 80081187e4..9a4c302dfa 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 73e27d49a4..a1902186bd 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 index 5566c92b71..9b61c89208 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 112eb4e32c..7928a78813 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8290508cf5..3e5ef61ca4 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 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 36260d652a..8d4a4175b6 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index b013fa0bf7..c3a8d139df 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 4.0.13 21 3.40.0 From 386a1c8a3e08f1748215d4f9988f9957ef2b62b2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Feb 2026 10:38:43 +0100 Subject: [PATCH 121/160] Prepare 7.6.0-SNAPSHOT builds Change-Id: I3466489782d4a306c99e399e7371af9110759f1c --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 07415bf697..914ab7a772 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-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 d394321d44..dea817abd1 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index d53b006209..0da673ff6f 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 - 7.6.0.202602242313-rc1 + 7.6.0-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 9504f3b320..634cde030f 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 7d5886434a..5d53677555 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 - 7.6.0.202602242313-rc1 + 7.6.0-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 d2c117c1d2..9c74e3d6ad 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d6d186aa2f..d0b69205e8 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-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 26fc3c7ba3..f825b80a31 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 85034caa1c..3aa255874e 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index d208d6fa73..f0c5a11556 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 - 7.6.0.202602242313-rc1 + 7.6.0-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 7e3107ffbe..29d1974b2e 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 2b725e597e..5cc904d81e 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 92f1d19ee4..0d71b4150a 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 4b97d2a741..1742603484 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 - 7.6.0.202602242313-rc1 + 7.6.0-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 fd54753bff..35b7f6d40f 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index f1eeafb54c..009a07b9ac 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index b8bd4a1ecc..9c5ca560e4 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 838f692d98..453f3b8653 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 9a4c302dfa..80081187e4 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index a1902186bd..73e27d49a4 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 - 7.6.0.202602242313-rc1 + 7.6.0-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 index 9b61c89208..5566c92b71 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7928a78813..112eb4e32c 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 3e5ef61ca4..8290508cf5 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.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 8d4a4175b6..36260d652a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index c3a8d139df..b013fa0bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT 4.0.13 21 3.40.0 From 34187e629c8a625ac9a1e9e1ebe1dd99c30cb26c Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 25 Feb 2026 11:11:03 +0100 Subject: [PATCH 122/160] Use SVG icons instead of PNG in UI plug-ins Copy the SVG source icons from the top-level icons/ directory into org.eclipse.egit.ui/icons/ and org.eclipse.egit.gitflow.ui/icons/, maintaining the existing subdirectory structure (elcl16, etool16, eview16, obj16, ovr, wizban). Update plugin.xml and UIIcons.java in both plug-ins to reference the .svg files instead of .png. The existing PNG and @2x PNG files are deliberately kept in place so that already-opened Eclipse views continue to use their cached image references until they are closed and reopened. Bug: egit-139 Change-Id: Ia4423641229e3d8d022041f35062769d7b3d3daf --- .../icons/obj16/gitflow.svg | 137 + .../icons/ovr/git-flow.svg | 73 + org.eclipse.egit.gitflow.ui/plugin.xml | 18 +- org.eclipse.egit.ui/icons/egit.svg | 146 + org.eclipse.egit.ui/icons/elcl16/add.svg | 114 + org.eclipse.egit.ui/icons/elcl16/add_all.svg | 159 + org.eclipse.egit.ui/icons/elcl16/author.svg | 424 ++ org.eclipse.egit.ui/icons/elcl16/clear_co.svg | 481 ++ .../icons/elcl16/collapseall.svg | 224 + org.eclipse.egit.ui/icons/elcl16/comment.svg | 158 + org.eclipse.egit.ui/icons/elcl16/commit.svg | 189 + .../icons/elcl16/committer.svg | 292 ++ .../icons/elcl16/compactLayout.svg | 425 ++ .../icons/elcl16/compare_view.svg | 270 + org.eclipse.egit.ui/icons/elcl16/continue.svg | 461 ++ org.eclipse.egit.ui/icons/elcl16/delete.svg | 120 + .../icons/elcl16/expandall.svg | 332 ++ .../icons/elcl16/filter_folder_funnel.svg | 618 +++ .../icons/elcl16/filter_none_funnel.svg | 457 ++ .../icons/elcl16/filter_project_funnel.svg | 596 +++ .../icons/elcl16/filter_ps_funnel.svg | 457 ++ .../icons/elcl16/filter_resource_funnel.svg | 609 +++ org.eclipse.egit.ui/icons/elcl16/find.svg | 152 + .../icons/elcl16/flatLayout.svg | 341 ++ .../icons/elcl16/goto_input.svg | 257 + .../icons/elcl16/hide_untracked.svg | 169 + .../icons/elcl16/hierarchicalLayout.svg | 354 ++ .../icons/elcl16/horizontal_view.svg | 757 +++ org.eclipse.egit.ui/icons/elcl16/next_nav.svg | 114 + org.eclipse.egit.ui/icons/elcl16/prev_nav.svg | 114 + org.eclipse.egit.ui/icons/elcl16/preview.svg | 317 ++ .../icons/elcl16/progress_stop.svg | 4573 +++++++++++++++++ org.eclipse.egit.ui/icons/elcl16/refresh.svg | 199 + org.eclipse.egit.ui/icons/elcl16/sha1.svg | 142 + org.eclipse.egit.ui/icons/elcl16/skip.svg | 170 + org.eclipse.egit.ui/icons/elcl16/start.svg | 273 + org.eclipse.egit.ui/icons/elcl16/synced.svg | 182 + .../icons/elcl16/trash_flat.svg | 203 + .../icons/elcl16/unstage_all.svg | 166 + .../icons/etool16/annotate.svg | 485 ++ .../icons/etool16/createRepository.svg | 253 + .../icons/etool16/merge_ignore_left.svg | 299 ++ .../icons/etool16/merge_ignore_right.svg | 299 ++ .../icons/etool16/newconnect_wiz.svg | 708 +++ .../icons/etool16/newgroup_wiz.svg | 483 ++ .../icons/etool16/newlocation_wiz.svg | 561 ++ .../icons/eview16/rebase_interactive.svg | 168 + org.eclipse.egit.ui/icons/eview16/reflog.svg | 173 + .../icons/eview16/repo_rep.svg | 417 ++ org.eclipse.egit.ui/icons/eview16/staging.svg | 142 + org.eclipse.egit.ui/icons/obj16/add.svg | 114 + .../icons/obj16/alphab_sort_co.svg | 177 + .../icons/obj16/annotated-tag.svg | 490 ++ .../icons/obj16/assume_unchanged.svg | 103 + .../icons/obj16/branch_obj.svg | 96 + .../icons/obj16/branches_obj.svg | 155 + .../icons/obj16/changelog_obj.svg | 468 ++ org.eclipse.egit.ui/icons/obj16/check_all.svg | 259 + org.eclipse.egit.ui/icons/obj16/checkout.svg | 189 + .../icons/obj16/cherry-pick.svg | 390 ++ .../icons/obj16/cherrypick.svg | 259 + org.eclipse.egit.ui/icons/obj16/clean_obj.svg | 371 ++ org.eclipse.egit.ui/icons/obj16/clear.svg | 200 + org.eclipse.egit.ui/icons/obj16/cloneGit.svg | 299 ++ org.eclipse.egit.ui/icons/obj16/commit.svg | 228 + .../icons/obj16/commit_amend.svg | 359 ++ .../icons/obj16/current_step.svg | 147 + .../icons/obj16/delete_obj.svg | 117 + .../icons/obj16/disconnect_co.svg | 151 + org.eclipse.egit.ui/icons/obj16/done_step.svg | 154 + .../icons/obj16/editconfig.svg | 433 ++ org.eclipse.egit.ui/icons/obj16/fetch.svg | 158 + .../icons/obj16/first_parent_only.svg | 165 + .../icons/obj16/fixup-down.svg | 110 + org.eclipse.egit.ui/icons/obj16/fixup-up.svg | 111 + .../icons/obj16/gerrit_fetch.svg | 218 + .../icons/obj16/gerrit_obj.svg | 238 + .../icons/obj16/gerrit_push.svg | 218 + .../icons/obj16/gitrepository.svg | 237 + org.eclipse.egit.ui/icons/obj16/history.svg | 500 ++ org.eclipse.egit.ui/icons/obj16/ignore.svg | 394 ++ .../icons/obj16/import_obj.svg | 337 ++ .../icons/obj16/import_prj.svg | 416 ++ org.eclipse.egit.ui/icons/obj16/merge.svg | 96 + org.eclipse.egit.ui/icons/obj16/mergetool.svg | 247 + .../icons/obj16/new_branch_obj.svg | 160 + .../icons/obj16/new_tag_obj.svg | 457 ++ .../icons/obj16/no_assume_unchanged.svg | 157 + org.eclipse.egit.ui/icons/obj16/note.svg | 195 + .../icons/obj16/open-commit.svg | 569 ++ org.eclipse.egit.ui/icons/obj16/pull.svg | 147 + .../icons/obj16/pull_with_options.svg | 153 + org.eclipse.egit.ui/icons/obj16/push.svg | 147 + org.eclipse.egit.ui/icons/obj16/rebase.svg | 196 + .../icons/obj16/rebase_interactive.svg | 168 + org.eclipse.egit.ui/icons/obj16/refresh.svg | 199 + .../icons/obj16/remote_entry_tbl.svg | 160 + .../icons/obj16/repository_gerrit.svg | 261 + .../icons/obj16/repository_rep.svg | 160 + org.eclipse.egit.ui/icons/obj16/reset.svg | 137 + org.eclipse.egit.ui/icons/obj16/revert.svg | 302 ++ org.eclipse.egit.ui/icons/obj16/reword.svg | 685 +++ .../icons/obj16/search-commit.svg | 511 ++ org.eclipse.egit.ui/icons/obj16/settings.svg | 159 + .../icons/obj16/sign-commit.svg | 294 ++ .../icons/obj16/signed-off.svg | 360 ++ .../icons/obj16/squash-down.svg | 343 ++ org.eclipse.egit.ui/icons/obj16/squash-up.svg | 298 ++ .../icons/obj16/stash-apply.svg | 430 ++ .../icons/obj16/stash-create.svg | 430 ++ org.eclipse.egit.ui/icons/obj16/stash.svg | 484 ++ .../icons/obj16/state_sort_co.svg | 133 + .../icons/obj16/submodules.svg | 441 ++ .../icons/obj16/synchronize.svg | 182 + org.eclipse.egit.ui/icons/obj16/tags.svg | 821 +++ org.eclipse.egit.ui/icons/obj16/track.svg | 244 + .../icons/obj16/uncheck_all.svg | 254 + org.eclipse.egit.ui/icons/obj16/unstage.svg | 136 + org.eclipse.egit.ui/icons/obj16/untrack.svg | 598 +++ .../icons/obj16/untracked_file.svg | 265 + .../icons/obj16/version_rep.svg | 393 ++ .../icons/ovr/assume_unchanged.svg | 117 + .../icons/ovr/checkedout_ov.svg | 164 + org.eclipse.egit.ui/icons/ovr/conflict.svg | 133 + .../icons/ovr/delete_modify.svg | 161 + org.eclipse.egit.ui/icons/ovr/dirty.svg | 152 + org.eclipse.egit.ui/icons/ovr/error.svg | 153 + .../icons/ovr/modify_delete.svg | 161 + org.eclipse.egit.ui/icons/ovr/staged.svg | 153 + .../icons/ovr/staged_added.svg | 117 + .../icons/ovr/staged_removed.svg | 150 + .../icons/ovr/staged_renamed.svg | 270 + org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg | 115 + org.eclipse.egit.ui/icons/ovr/untracked.svg | 82 + .../icons/wizban/commit_wizban.svg | 647 +++ .../icons/wizban/createpatch_wizban.svg | 736 +++ .../icons/wizban/fetch_gerrit_wizban.svg | 575 +++ .../icons/wizban/fetch_wizban.svg | 491 ++ .../icons/wizban/import_wiz.svg | 942 ++++ .../icons/wizban/newconnect_wizban.svg | 564 ++ .../icons/wizban/pull_wizban.svg | 654 +++ .../icons/wizban/push_gerrit_wizban.svg | 585 +++ .../icons/wizban/push_wizban.svg | 491 ++ .../icons/wizban/synchronize_wizban.svg | 536 ++ org.eclipse.egit.ui/plugin.xml | 322 +- .../org/eclipse/egit/ui/internal/UIIcons.java | 240 +- 146 files changed, 47285 insertions(+), 290 deletions(-) create mode 100644 org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg create mode 100644 org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg create mode 100644 org.eclipse.egit.ui/icons/egit.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/add.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/add_all.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/author.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/clear_co.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/collapseall.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/comment.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/commit.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/committer.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/compactLayout.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/compare_view.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/continue.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/delete.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/expandall.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/find.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/flatLayout.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/goto_input.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/next_nav.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/prev_nav.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/preview.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/progress_stop.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/refresh.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/sha1.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/skip.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/start.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/synced.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/trash_flat.svg create mode 100644 org.eclipse.egit.ui/icons/elcl16/unstage_all.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/annotate.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/createRepository.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg create mode 100644 org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg create mode 100644 org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg create mode 100644 org.eclipse.egit.ui/icons/eview16/reflog.svg create mode 100644 org.eclipse.egit.ui/icons/eview16/repo_rep.svg create mode 100644 org.eclipse.egit.ui/icons/eview16/staging.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/add.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/annotated-tag.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/branch_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/branches_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/changelog_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/check_all.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/checkout.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/cherry-pick.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/cherrypick.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/clean_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/clear.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/cloneGit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/commit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/commit_amend.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/current_step.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/delete_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/disconnect_co.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/done_step.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/editconfig.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/fetch.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/first_parent_only.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/fixup-down.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/fixup-up.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/gerrit_push.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/gitrepository.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/history.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/ignore.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/import_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/import_prj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/merge.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/mergetool.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/new_branch_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/note.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/open-commit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/pull.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/pull_with_options.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/push.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/rebase.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/refresh.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/remote_entry_tbl.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/repository_rep.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/reset.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/revert.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/reword.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/search-commit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/settings.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/sign-commit.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/signed-off.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/squash-down.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/squash-up.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/stash-apply.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/stash-create.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/stash.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/state_sort_co.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/submodules.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/synchronize.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/tags.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/track.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/uncheck_all.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/unstage.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/untrack.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/untracked_file.svg create mode 100644 org.eclipse.egit.ui/icons/obj16/version_rep.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/conflict.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/delete_modify.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/dirty.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/error.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/modify_delete.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/staged.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/staged_added.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/staged_removed.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/staged_renamed.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg create mode 100644 org.eclipse.egit.ui/icons/ovr/untracked.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/commit_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/fetch_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/import_wiz.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/pull_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/push_gerrit_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/push_wizban.svg create mode 100644 org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg diff --git a/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg b/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg new file mode 100644 index 0000000000..7117b77a84 --- /dev/null +++ b/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg b/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg new file mode 100644 index 0000000000..572ceb92ff --- /dev/null +++ b/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.gitflow.ui/plugin.xml b/org.eclipse.egit.gitflow.ui/plugin.xml index a6cf860171..04233fc41b 100644 --- a/org.eclipse.egit.gitflow.ui/plugin.xml +++ b/org.eclipse.egit.gitflow.ui/plugin.xml @@ -48,7 +48,7 @@ @@ -580,7 +580,7 @@ @@ -702,7 +702,7 @@ allPopups="false" locationURI="popup:org.eclipse.egit.ui.historyPageContributions?after=additions"> + icon="icons/obj16/gitflow.svg"> + icon="icons/obj16/gitflow.svg"> + icon="icons/obj16/gitflow.svg"> + icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/checkout.svg"> + icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/checkout.svg"> + icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/rebase.svg"> diff --git a/org.eclipse.egit.ui/icons/egit.svg b/org.eclipse.egit.ui/icons/egit.svg new file mode 100644 index 0000000000..8109972aad --- /dev/null +++ b/org.eclipse.egit.ui/icons/egit.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/add.svg b/org.eclipse.egit.ui/icons/elcl16/add.svg new file mode 100644 index 0000000000..a3c88ae0df --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/add.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/add_all.svg b/org.eclipse.egit.ui/icons/elcl16/add_all.svg new file mode 100644 index 0000000000..90b3c3f9b9 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/add_all.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/author.svg b/org.eclipse.egit.ui/icons/elcl16/author.svg new file mode 100644 index 0000000000..ee21508f45 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/author.svg @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/clear_co.svg b/org.eclipse.egit.ui/icons/elcl16/clear_co.svg new file mode 100644 index 0000000000..e099328ed0 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/clear_co.svg @@ -0,0 +1,481 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/collapseall.svg b/org.eclipse.egit.ui/icons/elcl16/collapseall.svg new file mode 100644 index 0000000000..291b259680 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/collapseall.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/comment.svg b/org.eclipse.egit.ui/icons/elcl16/comment.svg new file mode 100644 index 0000000000..efacd6763a --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/comment.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/commit.svg b/org.eclipse.egit.ui/icons/elcl16/commit.svg new file mode 100644 index 0000000000..8b98322d03 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/commit.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/committer.svg b/org.eclipse.egit.ui/icons/elcl16/committer.svg new file mode 100644 index 0000000000..ca096cef64 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/committer.svg @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg b/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg new file mode 100644 index 0000000000..b7dcc77375 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/compare_view.svg b/org.eclipse.egit.ui/icons/elcl16/compare_view.svg new file mode 100644 index 0000000000..4233c8963d --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/compare_view.svg @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/continue.svg b/org.eclipse.egit.ui/icons/elcl16/continue.svg new file mode 100644 index 0000000000..dcb1548549 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/continue.svg @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/delete.svg b/org.eclipse.egit.ui/icons/elcl16/delete.svg new file mode 100644 index 0000000000..6f325d2108 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/delete.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + x + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/expandall.svg b/org.eclipse.egit.ui/icons/elcl16/expandall.svg new file mode 100644 index 0000000000..cbf10848a6 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/expandall.svg @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.svg new file mode 100644 index 0000000000..cad43a4617 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.svg @@ -0,0 +1,618 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg new file mode 100644 index 0000000000..f87bcafe33 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg new file mode 100644 index 0000000000..1a3adb3916 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg @@ -0,0 +1,596 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg new file mode 100644 index 0000000000..7e990f4ffa --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg new file mode 100644 index 0000000000..b12b30e85d --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg @@ -0,0 +1,609 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/find.svg b/org.eclipse.egit.ui/icons/elcl16/find.svg new file mode 100644 index 0000000000..404490d51c --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/find.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg b/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg new file mode 100644 index 0000000000..8d169aea0f --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/goto_input.svg b/org.eclipse.egit.ui/icons/elcl16/goto_input.svg new file mode 100644 index 0000000000..3d44978b3e --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/goto_input.svg @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg b/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg new file mode 100644 index 0000000000..abf0becaf1 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg b/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg new file mode 100644 index 0000000000..ec2eebd631 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg b/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg new file mode 100644 index 0000000000..45d267e087 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg @@ -0,0 +1,757 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/next_nav.svg b/org.eclipse.egit.ui/icons/elcl16/next_nav.svg new file mode 100644 index 0000000000..80b0a7929a --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/next_nav.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg b/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg new file mode 100644 index 0000000000..e76c2fc983 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/preview.svg b/org.eclipse.egit.ui/icons/elcl16/preview.svg new file mode 100644 index 0000000000..128d5fb8fa --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/preview.svg @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg b/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg new file mode 100644 index 0000000000..d74866efc3 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg @@ -0,0 +1,4573 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/refresh.svg b/org.eclipse.egit.ui/icons/elcl16/refresh.svg new file mode 100644 index 0000000000..8f95efcf9a --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/refresh.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/sha1.svg b/org.eclipse.egit.ui/icons/elcl16/sha1.svg new file mode 100644 index 0000000000..e00ce1c92a --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/sha1.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/skip.svg b/org.eclipse.egit.ui/icons/elcl16/skip.svg new file mode 100644 index 0000000000..016bf8f889 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/skip.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/start.svg b/org.eclipse.egit.ui/icons/elcl16/start.svg new file mode 100644 index 0000000000..33348d9aa9 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/start.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/synced.svg b/org.eclipse.egit.ui/icons/elcl16/synced.svg new file mode 100644 index 0000000000..2666faab6f --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/synced.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg b/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg new file mode 100644 index 0000000000..b44f6f0a99 --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg @@ -0,0 +1,203 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg b/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg new file mode 100644 index 0000000000..6ca8a1679d --- /dev/null +++ b/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/annotate.svg b/org.eclipse.egit.ui/icons/etool16/annotate.svg new file mode 100644 index 0000000000..379057016a --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/annotate.svg @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/createRepository.svg b/org.eclipse.egit.ui/icons/etool16/createRepository.svg new file mode 100644 index 0000000000..40228a1189 --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/createRepository.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg b/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg new file mode 100644 index 0000000000..341efe91cc --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + x + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg b/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg new file mode 100644 index 0000000000..1e28b1e7c5 --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + x + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg new file mode 100644 index 0000000000..9bf51b611b --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg new file mode 100644 index 0000000000..7787ab3601 --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg new file mode 100644 index 0000000000..9e8f6d4dcd --- /dev/null +++ b/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg @@ -0,0 +1,561 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg b/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg new file mode 100644 index 0000000000..b17f3d3788 --- /dev/null +++ b/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/eview16/reflog.svg b/org.eclipse.egit.ui/icons/eview16/reflog.svg new file mode 100644 index 0000000000..5ca4994f8f --- /dev/null +++ b/org.eclipse.egit.ui/icons/eview16/reflog.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/eview16/repo_rep.svg b/org.eclipse.egit.ui/icons/eview16/repo_rep.svg new file mode 100644 index 0000000000..dba9ad2228 --- /dev/null +++ b/org.eclipse.egit.ui/icons/eview16/repo_rep.svg @@ -0,0 +1,417 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/eview16/staging.svg b/org.eclipse.egit.ui/icons/eview16/staging.svg new file mode 100644 index 0000000000..f511d0382c --- /dev/null +++ b/org.eclipse.egit.ui/icons/eview16/staging.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/add.svg b/org.eclipse.egit.ui/icons/obj16/add.svg new file mode 100644 index 0000000000..a3c88ae0df --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/add.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg b/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg new file mode 100644 index 0000000000..11ff90bcd6 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg b/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg new file mode 100644 index 0000000000..508c11163e --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg b/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg new file mode 100644 index 0000000000..6580c94743 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/branch_obj.svg b/org.eclipse.egit.ui/icons/obj16/branch_obj.svg new file mode 100644 index 0000000000..b4d4032031 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/branch_obj.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/branches_obj.svg b/org.eclipse.egit.ui/icons/obj16/branches_obj.svg new file mode 100644 index 0000000000..b71b88eda0 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/branches_obj.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/changelog_obj.svg b/org.eclipse.egit.ui/icons/obj16/changelog_obj.svg new file mode 100644 index 0000000000..557f754f6f --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/changelog_obj.svg @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/check_all.svg b/org.eclipse.egit.ui/icons/obj16/check_all.svg new file mode 100644 index 0000000000..12193964d1 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/check_all.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/checkout.svg b/org.eclipse.egit.ui/icons/obj16/checkout.svg new file mode 100644 index 0000000000..5ae02d478f --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/checkout.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg new file mode 100644 index 0000000000..78b6a9ae11 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/cherrypick.svg b/org.eclipse.egit.ui/icons/obj16/cherrypick.svg new file mode 100644 index 0000000000..df189ac6bd --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/cherrypick.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/clean_obj.svg b/org.eclipse.egit.ui/icons/obj16/clean_obj.svg new file mode 100644 index 0000000000..c3e4a2e637 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/clean_obj.svg @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/clear.svg b/org.eclipse.egit.ui/icons/obj16/clear.svg new file mode 100644 index 0000000000..33d237bab9 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/clear.svg @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + line + + + lightarea + + + darkarea + darkarea + + + divider + + + eraser + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/cloneGit.svg b/org.eclipse.egit.ui/icons/obj16/cloneGit.svg new file mode 100644 index 0000000000..f85763e111 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/cloneGit.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/commit.svg b/org.eclipse.egit.ui/icons/obj16/commit.svg new file mode 100644 index 0000000000..3125fb13b5 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/commit.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/commit_amend.svg b/org.eclipse.egit.ui/icons/obj16/commit_amend.svg new file mode 100644 index 0000000000..f0a50d3ead --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/commit_amend.svg @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/current_step.svg b/org.eclipse.egit.ui/icons/obj16/current_step.svg new file mode 100644 index 0000000000..dc89601eeb --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/current_step.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/delete_obj.svg b/org.eclipse.egit.ui/icons/obj16/delete_obj.svg new file mode 100644 index 0000000000..9af37d524e --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/delete_obj.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg b/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg new file mode 100644 index 0000000000..b807bfd0fb --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/done_step.svg b/org.eclipse.egit.ui/icons/obj16/done_step.svg new file mode 100644 index 0000000000..4ce9594d0f --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/done_step.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/editconfig.svg b/org.eclipse.egit.ui/icons/obj16/editconfig.svg new file mode 100644 index 0000000000..74eb4f9104 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/editconfig.svg @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/fetch.svg b/org.eclipse.egit.ui/icons/obj16/fetch.svg new file mode 100644 index 0000000000..4de2e90ed8 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/fetch.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg b/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg new file mode 100644 index 0000000000..c7c439d263 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + x + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-down.svg b/org.eclipse.egit.ui/icons/obj16/fixup-down.svg new file mode 100644 index 0000000000..9811742d7a --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/fixup-down.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-up.svg b/org.eclipse.egit.ui/icons/obj16/fixup-up.svg new file mode 100644 index 0000000000..da5364367b --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/fixup-up.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg b/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg new file mode 100644 index 0000000000..fbde6bce41 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg b/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg new file mode 100644 index 0000000000..e840ba7e40 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/gerrit_push.svg b/org.eclipse.egit.ui/icons/obj16/gerrit_push.svg new file mode 100644 index 0000000000..435f439131 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/gerrit_push.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/gitrepository.svg b/org.eclipse.egit.ui/icons/obj16/gitrepository.svg new file mode 100644 index 0000000000..812b204ffe --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/gitrepository.svg @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/history.svg b/org.eclipse.egit.ui/icons/obj16/history.svg new file mode 100644 index 0000000000..4af96a4c61 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/history.svg @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/ignore.svg b/org.eclipse.egit.ui/icons/obj16/ignore.svg new file mode 100644 index 0000000000..ccbe68116f --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/ignore.svg @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/import_obj.svg b/org.eclipse.egit.ui/icons/obj16/import_obj.svg new file mode 100644 index 0000000000..6047857704 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/import_obj.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/import_prj.svg b/org.eclipse.egit.ui/icons/obj16/import_prj.svg new file mode 100644 index 0000000000..07952ebb4c --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/import_prj.svg @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/merge.svg b/org.eclipse.egit.ui/icons/obj16/merge.svg new file mode 100644 index 0000000000..7a05f7a261 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/merge.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/mergetool.svg b/org.eclipse.egit.ui/icons/obj16/mergetool.svg new file mode 100644 index 0000000000..14fd18c118 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/mergetool.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/new_branch_obj.svg b/org.eclipse.egit.ui/icons/obj16/new_branch_obj.svg new file mode 100644 index 0000000000..b552a9fb25 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/new_branch_obj.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg b/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg new file mode 100644 index 0000000000..b3299162ad --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg b/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg new file mode 100644 index 0000000000..a9ddd7b1d9 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/note.svg b/org.eclipse.egit.ui/icons/obj16/note.svg new file mode 100644 index 0000000000..edd185b4b8 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/note.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/open-commit.svg b/org.eclipse.egit.ui/icons/obj16/open-commit.svg new file mode 100644 index 0000000000..cc9f3d511a --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/open-commit.svg @@ -0,0 +1,569 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/pull.svg b/org.eclipse.egit.ui/icons/obj16/pull.svg new file mode 100644 index 0000000000..1cd131cd9a --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/pull.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg b/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg new file mode 100644 index 0000000000..f4b6fd173b --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/push.svg b/org.eclipse.egit.ui/icons/obj16/push.svg new file mode 100644 index 0000000000..9a0a5254e0 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/push.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/rebase.svg b/org.eclipse.egit.ui/icons/obj16/rebase.svg new file mode 100644 index 0000000000..d26b3d8e91 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/rebase.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg b/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg new file mode 100644 index 0000000000..b17f3d3788 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/refresh.svg b/org.eclipse.egit.ui/icons/obj16/refresh.svg new file mode 100644 index 0000000000..8f95efcf9a --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/refresh.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/remote_entry_tbl.svg b/org.eclipse.egit.ui/icons/obj16/remote_entry_tbl.svg new file mode 100644 index 0000000000..3a3fc70084 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/remote_entry_tbl.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg b/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg new file mode 100644 index 0000000000..b940820dd5 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/repository_rep.svg b/org.eclipse.egit.ui/icons/obj16/repository_rep.svg new file mode 100644 index 0000000000..b6065e60f6 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/repository_rep.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/reset.svg b/org.eclipse.egit.ui/icons/obj16/reset.svg new file mode 100644 index 0000000000..e12a69ffe4 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/reset.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/revert.svg b/org.eclipse.egit.ui/icons/obj16/revert.svg new file mode 100644 index 0000000000..dc6cfe16a8 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/revert.svg @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/reword.svg b/org.eclipse.egit.ui/icons/obj16/reword.svg new file mode 100644 index 0000000000..6620a0af31 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/reword.svg @@ -0,0 +1,685 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/search-commit.svg b/org.eclipse.egit.ui/icons/obj16/search-commit.svg new file mode 100644 index 0000000000..c54a34874c --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/search-commit.svg @@ -0,0 +1,511 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/settings.svg b/org.eclipse.egit.ui/icons/obj16/settings.svg new file mode 100644 index 0000000000..12b29c2150 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/settings.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/sign-commit.svg b/org.eclipse.egit.ui/icons/obj16/sign-commit.svg new file mode 100644 index 0000000000..fd19ae8d8d --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/sign-commit.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/signed-off.svg b/org.eclipse.egit.ui/icons/obj16/signed-off.svg new file mode 100644 index 0000000000..229149591f --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/signed-off.svg @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/squash-down.svg b/org.eclipse.egit.ui/icons/obj16/squash-down.svg new file mode 100644 index 0000000000..d3c3c761e5 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/squash-down.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/squash-up.svg b/org.eclipse.egit.ui/icons/obj16/squash-up.svg new file mode 100644 index 0000000000..5fd8a03f66 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/squash-up.svg @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/stash-apply.svg b/org.eclipse.egit.ui/icons/obj16/stash-apply.svg new file mode 100644 index 0000000000..13717a1cfe --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/stash-apply.svg @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/stash-create.svg b/org.eclipse.egit.ui/icons/obj16/stash-create.svg new file mode 100644 index 0000000000..4871b26bde --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/stash-create.svg @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/stash.svg b/org.eclipse.egit.ui/icons/obj16/stash.svg new file mode 100644 index 0000000000..d9e48af591 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/stash.svg @@ -0,0 +1,484 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg b/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg new file mode 100644 index 0000000000..ca94fc91cc --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/submodules.svg b/org.eclipse.egit.ui/icons/obj16/submodules.svg new file mode 100644 index 0000000000..985acd7984 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/submodules.svg @@ -0,0 +1,441 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/synchronize.svg b/org.eclipse.egit.ui/icons/obj16/synchronize.svg new file mode 100644 index 0000000000..7949750adf --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/synchronize.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/tags.svg b/org.eclipse.egit.ui/icons/obj16/tags.svg new file mode 100644 index 0000000000..546d1c6111 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/tags.svg @@ -0,0 +1,821 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/track.svg b/org.eclipse.egit.ui/icons/obj16/track.svg new file mode 100644 index 0000000000..ef453620ba --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/track.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg b/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg new file mode 100644 index 0000000000..2279a704ef --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/unstage.svg b/org.eclipse.egit.ui/icons/obj16/unstage.svg new file mode 100644 index 0000000000..a3af75382b --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/unstage.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/untrack.svg b/org.eclipse.egit.ui/icons/obj16/untrack.svg new file mode 100644 index 0000000000..f9c6572211 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/untrack.svg @@ -0,0 +1,598 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/untracked_file.svg b/org.eclipse.egit.ui/icons/obj16/untracked_file.svg new file mode 100644 index 0000000000..371e746404 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/untracked_file.svg @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/version_rep.svg b/org.eclipse.egit.ui/icons/obj16/version_rep.svg new file mode 100644 index 0000000000..d622456e28 --- /dev/null +++ b/org.eclipse.egit.ui/icons/obj16/version_rep.svg @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg b/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg new file mode 100644 index 0000000000..13471289c7 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg b/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg new file mode 100644 index 0000000000..17a474c26b --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/conflict.svg b/org.eclipse.egit.ui/icons/ovr/conflict.svg new file mode 100644 index 0000000000..f791b48c7f --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/conflict.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/delete_modify.svg b/org.eclipse.egit.ui/icons/ovr/delete_modify.svg new file mode 100644 index 0000000000..570a966e06 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/delete_modify.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/dirty.svg b/org.eclipse.egit.ui/icons/ovr/dirty.svg new file mode 100644 index 0000000000..b38aec294c --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/dirty.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/error.svg b/org.eclipse.egit.ui/icons/ovr/error.svg new file mode 100644 index 0000000000..200dfaef40 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/error.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/modify_delete.svg b/org.eclipse.egit.ui/icons/ovr/modify_delete.svg new file mode 100644 index 0000000000..db136028c3 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/modify_delete.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/staged.svg b/org.eclipse.egit.ui/icons/ovr/staged.svg new file mode 100644 index 0000000000..33bd0c3255 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/staged.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/staged_added.svg b/org.eclipse.egit.ui/icons/ovr/staged_added.svg new file mode 100644 index 0000000000..e7d1f226e0 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/staged_added.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/staged_removed.svg b/org.eclipse.egit.ui/icons/ovr/staged_removed.svg new file mode 100644 index 0000000000..7850f78bac --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/staged_removed.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg b/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg new file mode 100644 index 0000000000..9dc2db89b8 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg b/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg new file mode 100644 index 0000000000..176dc0f092 --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/ovr/untracked.svg b/org.eclipse.egit.ui/icons/ovr/untracked.svg new file mode 100644 index 0000000000..2d1f6780dc --- /dev/null +++ b/org.eclipse.egit.ui/icons/ovr/untracked.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg b/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg new file mode 100644 index 0000000000..f153b77bcb --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg @@ -0,0 +1,647 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg b/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg new file mode 100644 index 0000000000..cfa459e623 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg b/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg new file mode 100644 index 0000000000..4ef8e1be74 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg @@ -0,0 +1,575 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/fetch_wizban.svg b/org.eclipse.egit.ui/icons/wizban/fetch_wizban.svg new file mode 100644 index 0000000000..b9298c3ef0 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/fetch_wizban.svg @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/import_wiz.svg b/org.eclipse.egit.ui/icons/wizban/import_wiz.svg new file mode 100644 index 0000000000..fbd0f065ee --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/import_wiz.svg @@ -0,0 +1,942 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg b/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg new file mode 100644 index 0000000000..e5c184be94 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg b/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg new file mode 100644 index 0000000000..65767c568a --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg @@ -0,0 +1,654 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/push_gerrit_wizban.svg b/org.eclipse.egit.ui/icons/wizban/push_gerrit_wizban.svg new file mode 100644 index 0000000000..959276c1c5 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/push_gerrit_wizban.svg @@ -0,0 +1,585 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/push_wizban.svg b/org.eclipse.egit.ui/icons/wizban/push_wizban.svg new file mode 100644 index 0000000000..eb4c19892f --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/push_wizban.svg @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg b/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg new file mode 100644 index 0000000000..31211c3cf7 --- /dev/null +++ b/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg @@ -0,0 +1,536 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index b557c21d19..58544e4a85 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -12,7 +12,7 @@ @@ -20,7 +20,7 @@ @@ -30,7 +30,7 @@ @@ -46,7 +46,7 @@ @@ -69,7 +69,7 @@ @@ -1019,7 +1019,7 @@ @@ -3659,14 +3659,14 @@ @@ -3677,7 +3677,7 @@ @@ -3686,7 +3686,7 @@ allowMultiple="false" category="org.eclipse.egit.ui.GitCategory" class="org.eclipse.egit.ui.internal.reflog.ReflogView" - icon="icons/eview16/reflog.png" + icon="icons/eview16/reflog.svg" id="org.eclipse.egit.ui.ReflogView" name="%ReflogView"> @@ -3695,7 +3695,7 @@ point="org.eclipse.ui.perspectives"> @@ -3750,7 +3750,7 @@ point="org.eclipse.ui.navigator.navigatorContent"> @@ -4103,7 +4103,7 @@ @@ -4154,7 +4154,7 @@ @@ -4261,7 +4261,7 @@ locationURI="popup:org.eclipse.egit.ui.historyPageContributions?after=additions"> @@ -4313,7 +4313,7 @@ @@ -4459,7 +4459,7 @@ @@ -4632,14 +4632,14 @@ locationURI="popup:org.eclipse.egit.ui.RepositoriesView?after=remote"> @@ -4780,7 +4780,7 @@ + icon="icons/obj16/stash.svg"> @@ -4961,7 +4961,7 @@ locationURI="popup:org.eclipse.egit.ui.RepositoriesView?after=repo-commit"> @@ -5617,7 +5617,7 @@ @@ -5793,8 +5793,8 @@ + icon="icons/obj16/stash.svg"> @@ -6080,7 +6080,7 @@ + icon="icons/obj16/branches_obj.svg"> @@ -6095,7 +6095,7 @@ + icon="icons/obj16/branches_obj.svg"> @@ -6204,7 +6204,7 @@ + icon="icons/obj16/branches_obj.svg"> @@ -6242,7 +6242,7 @@ + icon="$nl$/icons/obj16/synchronize.svg"> @@ -6363,7 +6363,7 @@ + icon="icons/etool16/newlocation_wiz.svg"> + icon="icons/obj16/cloneGit.svg"> + icon="icons/elcl16/synced.svg"> + icon="icons/eview16/repo_rep.svg"> + icon="icons/obj16/history.svg"> + icon="icons/obj16/cherry-pick.svg"> + icon="icons/obj16/stash-apply.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/obj16/squash-down.svg"> + icon="icons/obj16/squash-down.svg"> + icon="icons/obj16/reword.svg"> + icon="icons/obj16/reword.svg"> + icon="icons/obj16/editconfig.svg"> + icon="icons/obj16/editconfig.svg"> + icon="icons/obj16/checkout.svg"> + icon="icons/obj16/new_branch_obj.svg"> + icon="icons/obj16/synchronize.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/import_prj.svg"> + icon="icons/obj16/import_prj.svg"> + icon="icons/etool16/createRepository.svg"> + icon="icons/elcl16/hierarchicalLayout.svg"> + icon="icons/obj16/changelog_obj.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/obj16/clear.svg"> + icon="icons/elcl16/progress_stop.svg"> + icon="icons/elcl16/continue.svg"> + icon="icons/elcl16/skip.svg"> + icon="icons/obj16/merge.svg"> + icon="icons/obj16/rebase.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/gerrit_fetch.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/add.svg"> + icon="icons/obj16/unstage.svg"> + icon="icons/obj16/branch_obj.svg"> + icon="icons/obj16/commit.svg"> + icon="icons/obj16/fetch.svg"> + icon="icons/obj16/push.svg"> + icon="icons/obj16/ignore.svg"> + icon="icons/obj16/merge.svg"> + icon="icons/obj16/mergetool.svg"> + icon="icons/obj16/rebase.svg"> + icon="icons/obj16/pull.svg"> + icon="icons/obj16/pull_with_options.svg"> + icon="icons/obj16/reset.svg"> + icon="icons/obj16/synchronize.svg"> + icon="icons/obj16/new_tag_obj.svg"> + icon="icons/obj16/assume_unchanged.svg"> + icon="icons/obj16/no_assume_unchanged.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/obj16/editconfig.svg"> + icon="icons/obj16/editconfig.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/elcl16/sha1.svg"> + icon="icons/obj16/rebase_interactive.svg"> + icon="icons/obj16/open-commit.svg"> + icon="icons/elcl16/compare_view.svg"> + icon="icons/elcl16/compare_view.svg"> + icon="icons/obj16/revert.svg"> + icon="icons/obj16/clean_obj.svg"> + icon="icons/obj16/stash-create.svg"> + icon="icons/etool16/annotate.svg"> + icon="icons/obj16/gerrit_push.svg"> + icon="icons/obj16/gerrit_obj.svg"> + icon="icons/elcl16/trash_flat.svg"> + icon="icons/obj16/disconnect_co.svg"> + icon="icons/obj16/delete_obj.svg"> + icon="icons/obj16/untrack.svg"> + icon="icons/obj16/open-commit.svg"> + icon="icons/elcl16/goto_input.svg"> + icon="icons/obj16/changelog_obj.svg"> + icon="icons/obj16/changelog_obj.svg"> + icon="icons/obj16/submodules.svg"> + icon="icons/obj16/branches_obj.svg"> + icon="icons/obj16/branches_obj.svg"> + icon="icons/etool16/newgroup_wiz.svg"> + icon="icons/obj16/changelog_obj.svg"> @@ -7451,7 +7451,7 @@ class="org.eclipse.egit.ui.internal.synchronize.GitModelSynchronizeParticipant" id="org.eclipse.egit.ui.modelCompareParticipant" name="%Synchronize_Name" - icon="icons/obj16/gitrepository.png" + icon="icons/obj16/gitrepository.svg" persistent="true"/> @@ -7871,7 +7871,7 @@ category="org.eclipse.egit.ui.wizardCategory" class="org.eclipse.egit.ui.internal.repository.NewRepositoryWizard" hasPages="true" - icon="icons/etool16/createRepository.png" + icon="icons/etool16/createRepository.svg" id="org.eclipse.egit.ui.CreateRepositoryWizard" name="%CreateRepositoryWizard.name"> @@ -7912,7 +7912,7 @@ class="org.eclipse.egit.ui.internal.commit.CommitEditor" contributorClass="org.eclipse.egit.ui.internal.commit.CommitEditorActionBarContributor" default="false" - icon="icons/obj16/changelog_obj.png" + icon="icons/obj16/changelog_obj.svg" id="org.eclipse.egit.ui.commitEditor" name="%CommitEditor.name"> @@ -7920,7 +7920,7 @@ class="org.eclipse.egit.ui.internal.commit.DiffEditor" contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor" default="false" - icon="icons/obj16/changelog_obj.png" + icon="icons/obj16/changelog_obj.svg" id="org.eclipse.egit.ui.diffEditor" name="%DiffEditor.name"> @@ -8017,7 +8017,7 @@ @@ -8026,7 +8026,7 @@ point="org.eclipse.search.searchResultViewPages"> @@ -8042,7 +8042,7 @@ @@ -8188,7 +8188,7 @@ point="org.eclipse.egit.ui.cloneSourceProvider"> Date: Wed, 25 Feb 2026 13:36:16 +0100 Subject: [PATCH 123/160] Sort tags in descending order in repository view Tags are usually used to tag releases, typically the most recent versions are more interesting hence sort them in descending order. Change-Id: Icbba1974b09b8e78e16fc55410d36bc9f8399b30 --- .../egit/ui/internal/repository/tree/RepositoryTreeNode.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java index 08428870e7..601eebed96 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java @@ -332,11 +332,13 @@ public int compareTo(RepositoryTreeNode otherNode) { // ok for positive indexes < ~2 billion return ((StashedCommitNode) this).getIndex() - ((StashedCommitNode) otherNode).getIndex(); - case TAG: case ADDITIONALREF: case REF: return CommonUtils.REF_ASCENDING_COMPARATOR.compare((Ref) myObject, (Ref) otherNode.getObject()); + case TAG: + return CommonUtils.REF_ASCENDING_COMPARATOR.reversed() + .compare((Ref) myObject, (Ref) otherNode.getObject()); case REPO: int nameCompare = CommonUtils.STRING_ASCENDING_COMPARATOR.compare( getDirectoryContainingRepo((Repository) myObject).getName(), From efb1244fff2bb8bb60d70e294dd30fc1177f6721 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Thu, 26 Feb 2026 10:38:47 +0100 Subject: [PATCH 124/160] Fetch notification should open in the bottom right corner Currently the fetch notification opens in the middle of the screen, better to anchor it to the bottom right corner. Current behavior anchors it to the primary monitor's client area, meaning the popup always anchors to the primary monitor's bottom-right, regardless of where the application window actually is. Change-Id: If8c91d379bfa83bf97dd73e85d69756e6feb530f --- .../internal/fetch/FetchResultNotification.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java index b46f94bc51..99446a54a9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultNotification.java @@ -16,12 +16,10 @@ import org.eclipse.jface.notifications.AbstractNotificationPopup; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.FetchResult; @@ -54,6 +52,7 @@ public class FetchResultNotification extends AbstractNotificationPopup { public FetchResultNotification(Shell parent, Repository repository, FetchResult result, String source) { super(parent.getDisplay()); + setParentShell(parent); this.repository = repository; this.result = result; this.source = source; @@ -61,19 +60,6 @@ public FetchResultNotification(Shell parent, Repository repository, setFadingEnabled(true); } - @Override - protected void initializeBounds() { - super.initializeBounds(); // computes and applies the correct size - IWorkbenchWindow window = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow(); - if (window != null) { - Rectangle wb = window.getShell().getBounds(); - Rectangle nb = getShell().getBounds(); - getShell().setLocation(wb.x + wb.width - nb.width, - wb.y + wb.height - nb.height); - } - } - @Override protected String getPopupShellTitle() { return NLS.bind(UIText.FetchResultNotification_Title, source); From 8a23c32fa9117e1b818e8054218f38ee347ce021 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 1 Mar 2026 09:17:54 +0100 Subject: [PATCH 125/160] Bazel: Pin jcl-over-slf4j to SLF4J_VERSION Maven resolved org.slf4j:jcl-over-slf4j to 1.7.36 via transitive dependencies of org.apache.sshd.osgi, while slf4j-api and slf4j-simple are pinned to 2.0.17. Change-Id: I53d0e2968e76ecdb3f758a9ffdd5b82bce8b2001 --- org.eclipse.egit.repository/category.xml | 6 ++++++ org.eclipse.egit.target/egit-4.36.target | 8 +++++++- org.eclipse.egit.target/egit-4.37.target | 8 +++++++- org.eclipse.egit.target/egit-4.38.target | 8 +++++++- org.eclipse.egit.target/egit-4.39.target | 8 +++++++- org.eclipse.egit.target/maven/dependencies.tpd | 5 +++++ 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index 91693f0ce9..bb37b58919 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -90,6 +90,12 @@ + + + + + + diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index 275d0fddd6..a3c8b10ba4 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -179,6 +179,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index a7d5b243bb..d37e88a6d5 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -179,6 +179,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index e60d3fe7fd..8cc11a4b38 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -179,6 +179,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 1c5148f59a..3c37c5a6f0 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -179,6 +179,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 5a00cec53e..eb8d3a0fa1 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -249,6 +249,11 @@ maven slf4j artifactId = "slf4j-simple" version = "2.0.17" } + dependency { + groupId = "org.slf4j" + artifactId = "jcl-over-slf4j" + version = "2.0.17" + } } maven xz From a16b62fca0a0b8da1a701de10bd8d31c860ae503 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Mar 2026 00:02:04 +0100 Subject: [PATCH 126/160] EGit v7.6.0.202603022253-r Change-Id: I1ed890e3024659eff90b50b5f5ce8065b9ac455e Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.junit/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- 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 | 2 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 914ab7a772..d64240d515 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 dea817abd1..9caad33ea7 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index 0da673ff6f..630118368a 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 634cde030f..dd1ba222e9 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 5d53677555..2bfd4f51b2 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 9c74e3d6ad..f1d692de5c 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index d0b69205e8..08b0ae8018 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 f825b80a31..1f6a71b498 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r 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 3aa255874e..b980396f6a 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f0c5a11556..8de49316fc 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 29d1974b2e..b1e6271590 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 5cc904d81e..f398b31835 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 0d71b4150a..9a2e4ce66e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 1742603484..4f033f1cdb 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 35b7f6d40f..3afd09f67d 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 009a07b9ac..634df162d4 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9c5ca560e4..208ca4e803 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 453f3b8653..03f56e2558 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 80081187e4..4511979a0b 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 73e27d49a4..881d117021 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 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 index 5566c92b71..621015cd16 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 112eb4e32c..4e0e31ae79 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 8290508cf5..de570e1e8c 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r 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 36260d652a..57d6826280 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.egit diff --git a/pom.xml b/pom.xml index b013fa0bf7..abdb9c6f41 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 4.0.13 21 3.40.0 From 8536e98cf2358f1bdb7fd201e5db4d2a3b62ff68 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Mar 2026 14:37:10 +0100 Subject: [PATCH 127/160] Prepare 7.6.1-SNAPSHOT builds Change-Id: Ibc23c43816fb32e9f9a8b53cc4b41ea70f6024ea --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 218 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 290 insertions(+), 290 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index d64240d515..e70ba510a7 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.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 9caad33ea7..6627c1dcc2 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" +Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.6.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="7.6.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 630118368a..e95412ec97 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 - 7.6.0.202603022253-r + 7.6.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 dd1ba222e9..fe4e29c571 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,26 +5,26 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", net.bytebuddy.agent;version="[1.7.9,2.0.0)", - org.eclipse.egit.core;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.egit.core;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.mockito;version="[5.4.0,6.0.0)", org.mockito.junit;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 2bfd4f51b2..553e5d6a93 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 - 7.6.0.202603022253-r + 7.6.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 f1d692de5c..ca581fc966 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.6.0"; +Export-Package: org.eclipse.egit.core;version="7.6.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="7.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.6.0"; + org.eclipse.egit.core.attributes;version="7.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.6.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="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.6.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.6.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.6.0"; + org.eclipse.egit.core.internal.credentials;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.6.1";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.6.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.6.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.6.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.6.0", - org.eclipse.egit.core.settings;version="7.6.0", - org.eclipse.egit.core.storage;version="7.6.0"; + org.eclipse.egit.core.project;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.6.1", + org.eclipse.egit.core.settings;version="7.6.1", + org.eclipse.egit.core.storage;version="7.6.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.6.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.6.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.6.0" + org.eclipse.egit.core.synchronize;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.6.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.6.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.events;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.signing.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)" + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.events;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.signing.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.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 08b0ae8018..3795500fd0 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.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 1f6a71b498..606d22e230 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.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 b980396f6a..9f8662b933 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.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 8de49316fc..f72e025e8f 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 - 7.6.0.202603022253-r + 7.6.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 b1e6271590..bb191dac62 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", +Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index f398b31835..082a11304a 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 - 7.6.0.202603022253-r + 7.6.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 index 9a2e4ce66e..de38839386 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.settings;version="[7.6.0,7.7.0)", - org.eclipse.egit.gitflow;version="[7.6.0,7.7.0)", - org.eclipse.egit.gitflow.op;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.actions;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.branch;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.commit;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.components;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.push;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.6.0,7.7.0)", - org.eclipse.egit.ui.internal.selection;version="[7.6.0,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" +Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.settings;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow.op;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.actions;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.branch;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.commit;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.components;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.push;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.6.1,7.7.0)", + org.eclipse.egit.ui.internal.selection;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.6.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.6.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.6.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.6.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.6.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.6.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.6.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.6.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.6.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.6.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.6.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.6.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.6.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 4f033f1cdb..85dd28a817 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 - 7.6.0.202603022253-r + 7.6.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 3afd09f67d..7452e06905 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.6.0"; +Export-Package: org.eclipse.egit.gitflow;version="7.6.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="7.6.0"; + org.eclipse.egit.gitflow.op;version="7.6.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="7.6.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 634df162d4..fe39cb4de0 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 208ca4e803..70075b4c34 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.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 03f56e2558..58bb243476 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 4511979a0b..aefe452e05 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,24 +13,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.0,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.6.0,7.7.0)", - org.eclipse.egit.gitflow.op;version="[7.6.0,7.7.0)", - org.eclipse.egit.gitflow.ui;version="[7.6.0,7.7.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.egit.gitflow;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow.op;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow.ui;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.waits, diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 881d117021..33d3474978 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 - 7.6.0.202603022253-r + 7.6.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 index 621015cd16..aa2b1960a6 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -36,115 +36,115 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.jface.notifications;bundle-version="[0.4.0,1.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.attributes;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.credentials;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.info;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.credentials;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.efs;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.hosts;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.info;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.job;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.rebase;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.signing;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.storage;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.internal.util;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.settings;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.synchronize;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.6.0,7.7.0)", - org.eclipse.egit.core.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.events;version="[7.6.0,7.7.0)", - org.eclipse.jgit.ignore;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", +Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.attributes;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.credentials;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.info;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.credentials;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.efs;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.hosts;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.info;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.rebase;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.signing;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.storage;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.internal.util;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.settings;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.synchronize;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.6.1,7.7.0)", + org.eclipse.egit.core.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.events;version="[7.6.1,7.7.0)", + org.eclipse.jgit.ignore;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.api;version="7.6.0", - org.eclipse.egit.ui.commit;version="7.6.0", - org.eclipse.egit.ui.history;version="7.6.0", - org.eclipse.egit.ui.internal;version="7.6.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.6.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.6.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.6.0";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.api;version="7.6.1", + org.eclipse.egit.ui.commit;version="7.6.1", + org.eclipse.egit.ui.history;version="7.6.1", + org.eclipse.egit.ui.internal;version="7.6.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.6.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.6.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 4e0e31ae79..f25a1594b5 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.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 de570e1e8c..0e54f0df8e 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.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 57d6826280..9c24ff0e76 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index abdb9c6f41..a3f9e39847 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT 4.0.13 21 3.40.0 From f7b9fa5226cd54643488e9f238520dbde6443edd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 5 Mar 2026 10:10:17 +0100 Subject: [PATCH 128/160] Add org.osgi.service.event and org.osgi.service.prefs to target platform Without that the build in Eclipse IDE fails with target platform egit-4.39 complaining that the following classes cannot be resolved: - The type org.osgi.service.event.Event cannot be resolved. It is indirectly referenced from required type org.eclipse.e4.ui.workbench.UIEvents - The type org.osgi.service.prefs.Preferences cannot be resolved. It is indirectly referenced from required type org.eclipse.core.runtime.preferences.IEclipsePreferences Change-Id: I49f611db4c68c27fd2bcf9676082bf0d51bfc1b3 --- org.eclipse.egit.target/egit-4.39.target | 4 +++- org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 3c37c5a6f0..933bedd974 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -120,7 +120,9 @@ + + diff --git a/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd index 64ced01757..ff61d63c61 100644 --- a/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd +++ b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd @@ -37,7 +37,9 @@ location "https://download.eclipse.org/staging/2026-03" { org.eclipse.sdk.ide lazy org.eclipse.search.core lazy org.eclipse.swt.tools.base lazy + org.osgi.service.event lazy org.osgi.service.http.whiteboard lazy + org.osgi.service.prefs lazy org.osgi.service.repository lazy org.sat4j.core lazy org.sat4j.pb lazy From 0da838415b4b374cb63d6e171609d0efbdaa6ce9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Mar 2026 14:38:36 +0100 Subject: [PATCH 129/160] Prepare 7.7.0-SNAPSHOT builds Change-Id: Iedba88ff6cc34064c5be5dcfcc6d63d0eb2875c9 --- org.eclipse.egit-feature/feature.xml | 10 +- org.eclipse.egit-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +-- org.eclipse.egit.core.junit/pom.xml | 2 +- .../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 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 76 +++--- 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.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 4 +- org.eclipse.egit.source-feature/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 | 218 +++++++++--------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 290 insertions(+), 290 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index e70ba510a7..a71ede29d7 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - - - - + + + + org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-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 6627c1dcc2..65824e342f 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" +Import-Package: org.eclipse.egit.core;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.op;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: org.eclipse.egit.core.test;version="7.6.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="7.7.0";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 e95412ec97..abe722dc71 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 - 7.6.1-SNAPSHOT + 7.7.0-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 fe4e29c571..836d227b77 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,26 +5,26 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.team.core;bundle-version="[3.10.700,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.42.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.7.0,7.8.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="[7.6.1,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.egit.core;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.op;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.project;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.mockito;version="[5.4.0,6.0.0)", org.mockito.junit;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 553e5d6a93..ccfac86a38 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 - 7.6.1-SNAPSHOT + 7.7.0-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 ca581fc966..a448341f3c 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -14,34 +14,34 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.4.600,2.0.0)", org.eclipse.core.variables;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.400,4.0.0)" -Export-Package: org.eclipse.egit.core;version="7.6.1"; +Export-Package: org.eclipse.egit.core;version="7.7.0"; 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="7.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="7.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="7.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="7.6.1"; + org.eclipse.egit.core.attributes;version="7.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="7.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="7.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="7.7.0"; 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="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="7.6.1";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="7.6.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="7.6.1"; + org.eclipse.egit.core.internal.credentials;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="7.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="7.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="7.7.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="7.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="7.7.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="7.7.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -49,17 +49,17 @@ Export-Package: org.eclipse.egit.core;version="7.6.1"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="7.6.1", - org.eclipse.egit.core.settings;version="7.6.1", - org.eclipse.egit.core.storage;version="7.6.1"; + org.eclipse.egit.core.project;version="7.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="7.7.0", + org.eclipse.egit.core.settings;version="7.7.0", + org.eclipse.egit.core.storage;version="7.7.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="7.6.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="7.6.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="7.6.1" + org.eclipse.egit.core.synchronize;version="7.7.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="7.7.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="7.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", @@ -67,32 +67,32 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.events;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.signing.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)" + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.events;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.signing.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.submodule;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.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 3795500fd0..ff1a06e768 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-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 606d22e230..c2a53f84a0 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 9f8662b933..ed006be4ba 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index f72e025e8f..f3695b3778 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 - 7.6.1-SNAPSHOT + 7.7.0-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 bb191dac62..2e263fce5a 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", +Import-Package: org.eclipse.egit.core;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.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.22.200,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 082a11304a..0734c3fe87 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.gitflow.test diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index de38839386..ab9a922319 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.settings;version="[7.6.1,7.7.0)", - org.eclipse.egit.gitflow;version="[7.6.1,7.7.0)", - org.eclipse.egit.gitflow.op;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.actions;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.branch;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.commit;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.components;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.decorators;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.dialogs;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.expressions;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.push;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.rebase;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[7.6.1,7.7.0)", - org.eclipse.egit.ui.internal.selection;version="[7.6.1,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" +Import-Package: org.eclipse.egit.core;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.job;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.op;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.project;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.settings;version="[7.7.0,7.8.0)", + org.eclipse.egit.gitflow;version="[7.7.0,7.8.0)", + org.eclipse.egit.gitflow.op;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.actions;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.branch;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.commit;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.components;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.decorators;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.dialogs;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.expressions;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.push;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.rebase;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[7.7.0,7.8.0)", + org.eclipse.egit.ui.internal.selection;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.team.ui;bundle-version="[3.11.100,4.0.0)", @@ -46,12 +46,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.10.400,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.13.500,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="7.6.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="7.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="7.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="7.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="7.6.1";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="7.6.1";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="7.7.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="7.7.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="7.7.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="7.7.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="7.7.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="7.7.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="7.7.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="7.7.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="7.7.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 85dd28a817..642333aa16 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 - 7.6.1-SNAPSHOT + 7.7.0-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 7452e06905..890a10b989 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="7.6.1"; +Export-Package: org.eclipse.egit.gitflow;version="7.7.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="7.6.1"; + org.eclipse.egit.gitflow.op;version="7.7.0"; 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="7.6.1"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.op;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index fe39cb4de0..82ed720d2f 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 70075b4c34..c3038f8bdc 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 58bb243476..911ee6c709 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index aefe452e05..88a0c37e1b 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.11.200,2.0.0)", @@ -13,24 +13,24 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.search;bundle-version="[3.17.200,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.207.200,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.23.300,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[7.6.1,7.7.0)" + org.eclipse.egit.core.junit;bundle-version="[7.7.0,7.8.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", - org.eclipse.egit.gitflow;version="[7.6.1,7.7.0)", - org.eclipse.egit.gitflow.op;version="[7.6.1,7.7.0)", - org.eclipse.egit.gitflow.ui;version="[7.6.1,7.7.0)", - org.eclipse.egit.gitflow.ui.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.egit.gitflow;version="[7.7.0,7.8.0)", + org.eclipse.egit.gitflow.op;version="[7.7.0,7.8.0)", + org.eclipse.egit.gitflow.ui;version="[7.7.0,7.8.0)", + org.eclipse.egit.gitflow.ui.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.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 33d3474978..385f3a9d9c 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 - 7.6.1-SNAPSHOT + 7.7.0-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 index aa2b1960a6..6f5bb7fc36 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -36,115 +36,115 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.100,4.0.0)", org.eclipse.jface.notifications;bundle-version="[0.4.0,1.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.egit.core;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.attributes;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.credentials;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.info;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.credentials;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.efs;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.gerrit;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.hosts;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.indexdiff;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.info;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.job;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.rebase;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.signing;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.storage;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.internal.util;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.op;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.project;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.settings;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.synchronize;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.synchronize.dto;version="[7.6.1,7.7.0)", - org.eclipse.egit.core.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.events;version="[7.6.1,7.7.0)", - org.eclipse.jgit.ignore;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", +Import-Package: org.eclipse.egit.core;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.attributes;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.credentials;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.info;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.credentials;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.efs;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.gerrit;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.hosts;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.indexdiff;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.info;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.job;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.rebase;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.signing;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.storage;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.internal.util;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.op;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.project;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.settings;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.synchronize;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.synchronize.dto;version="[7.7.0,7.8.0)", + org.eclipse.egit.core.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.events;version="[7.7.0,7.8.0)", + org.eclipse.jgit.ignore;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.submodule;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.ui;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.api;version="7.6.1", - org.eclipse.egit.ui.commit;version="7.6.1", - org.eclipse.egit.ui.history;version="7.6.1", - org.eclipse.egit.ui.internal;version="7.6.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.actions;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.clean;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.clipboard;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.commit.command;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.filediff;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="7.6.1";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.trace;version="7.6.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="7.6.1";x-internal:=true +Export-Package: org.eclipse.egit.ui;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.api;version="7.7.0", + org.eclipse.egit.ui.commit;version="7.7.0", + org.eclipse.egit.ui.history;version="7.7.0", + org.eclipse.egit.ui.internal;version="7.7.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.clipboard;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.filediff;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="7.7.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="7.7.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="7.7.0";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 f25a1594b5..f5f4152b28 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 0e54f0df8e..310e1797b0 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.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 9c24ff0e76..7990d0a13a 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index a3f9e39847..f91fcc7d08 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ 3.9.0 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT 4.0.13 21 3.40.0 From 29b9462a4dd0d868651a8026b8469e00c974a253 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 8 Mar 2026 20:39:10 +0100 Subject: [PATCH 130/160] [oomph] Update and cycle API baselines Add 7.6.0, remove 7.3.0. Also add a choice for the 4.39 target platform. Change-Id: I3a44b13a60a50c3748eeb6058d382e5d811da507 --- tools/oomph/EGit.setup | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index c8dbc10ec3..2f6754299d 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -126,17 +126,11 @@ + Default target platform for EGit development. - - EGit 7.3.0 API baseline; to be used with branch stable-7.4 - - EGit 7.5.0 API baseline; to be used with branch master + EGit 7.5.0 API baseline; to be used with branch stable-7.6 + + + EGit 7.6.0 API baseline; to be used with branch master Date: Fri, 6 Mar 2026 23:06:02 +0100 Subject: [PATCH 131/160] Bump minimum dependency for Bouncy Castle to 1.83.0 To ensure that a p2 installer does include BC 1.83 when installing EGit in an environment that doesn't have it. Bug: jgit-249 Change-Id: Ie4514e69dd9576a720a89b671c81f7fc094241c1 --- org.eclipse.egit.core/META-INF/MANIFEST.MF | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index a448341f3c..fa41a6baf2 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -62,10 +62,10 @@ Export-Package: org.eclipse.egit.core;version="7.7.0"; org.eclipse.egit.core.util;version="7.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.bouncycastle.jce.provider;version="[1.81.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.81.0,2.0.0)", - org.bouncycastle.openpgp.bc;version="[1.81.0,2.0.0)", - org.bouncycastle.pkcs;version="[1.81.0,2.0.0)", +Import-Package: org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.bc;version="[1.83.0,2.0.0)", + org.bouncycastle.pkcs;version="[1.83.0,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.5.700,2.0.0)", org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", org.eclipse.jgit.api;version="[7.7.0,7.8.0)", From df0bf29c0ab944a0ae18e78bd345edfeba5bd40e Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 14 Mar 2026 17:48:50 +0100 Subject: [PATCH 132/160] Restore the cherry-pick icon Commit 34187e6 just copied all SVGs from the top-level icons directory into the bundles. Alas, the top-level icons directory was inconsistent for the cherry-pick icon, resulting in a wrong icon being shown in Eclipse versions that support rendering SVG icons directly. Correct this, and correct the SVG such that the icon renders properly directly from SVG. Bug: egit-146 Change-Id: Ifcca2ce8fc1c6db109d37f91763eee6ae9999e1a --- .../icons/obj16/cherry-pick.svg | 400 ++++-------------- .../icons/obj16/cherrypick.svg | 259 ------------ .../icons/obj16/cherry-pick.svg | 400 ++++-------------- .../icons/obj16/cherrypick.svg | 259 ------------ 4 files changed, 158 insertions(+), 1160 deletions(-) delete mode 100644 icons/org.eclipse.egit.ui/icons/obj16/cherrypick.svg delete mode 100644 org.eclipse.egit.ui/icons/obj16/cherrypick.svg diff --git a/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg b/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg index 78b6a9ae11..05286eee0b 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg @@ -1,297 +1,54 @@ - - + inkscape:version="1.4.3 (0d15f750, 2025-12-25)" + sodipodi:docname="cherrypick.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(-0.5,0,0,0.5,3,1039.3622)" + x1="-16" + y1="15" + x2="-16" + y2="3" /> - - + gradientTransform="matrix(0.5,0,0,0.5,12,1039.3622)" + x1="-16" + y1="15" + x2="-16" + y2="3" /> + inkscape:snap-global="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + id="grid4000" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" /> @@ -326,7 +91,7 @@ image/svg+xml - + @@ -339,52 +104,45 @@ + + + + - - - - - - - - + id="path3133" + d="M 6.5,1040.8622 H 4 c -1.5,0 -2.5,1.5 -2.5,3 v 0 c 0,1.5 1,3 2.5,3 h 2.5 v -2 h -2 c -0.5,0 -1,-0.5 -1,-1 v 0 c 0,-0.5 0.5,-1 1,-1 h 2 z" + style="display:inline;fill:url(#linearGradient4784);fill-opacity:1;stroke:#555555;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + diff --git a/icons/org.eclipse.egit.ui/icons/obj16/cherrypick.svg b/icons/org.eclipse.egit.ui/icons/obj16/cherrypick.svg deleted file mode 100644 index df189ac6bd..0000000000 --- a/icons/org.eclipse.egit.ui/icons/obj16/cherrypick.svg +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg index 78b6a9ae11..05286eee0b 100644 --- a/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg +++ b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg @@ -1,297 +1,54 @@ - - + inkscape:version="1.4.3 (0d15f750, 2025-12-25)" + sodipodi:docname="cherrypick.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(-0.5,0,0,0.5,3,1039.3622)" + x1="-16" + y1="15" + x2="-16" + y2="3" /> - - + gradientTransform="matrix(0.5,0,0,0.5,12,1039.3622)" + x1="-16" + y1="15" + x2="-16" + y2="3" /> + inkscape:snap-global="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + id="grid4000" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" /> @@ -326,7 +91,7 @@ image/svg+xml - + @@ -339,52 +104,45 @@ + + + + - - - - - - - - + id="path3133" + d="M 6.5,1040.8622 H 4 c -1.5,0 -2.5,1.5 -2.5,3 v 0 c 0,1.5 1,3 2.5,3 h 2.5 v -2 h -2 c -0.5,0 -1,-0.5 -1,-1 v 0 c 0,-0.5 0.5,-1 1,-1 h 2 z" + style="display:inline;fill:url(#linearGradient4784);fill-opacity:1;stroke:#555555;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + diff --git a/org.eclipse.egit.ui/icons/obj16/cherrypick.svg b/org.eclipse.egit.ui/icons/obj16/cherrypick.svg deleted file mode 100644 index df189ac6bd..0000000000 --- a/org.eclipse.egit.ui/icons/obj16/cherrypick.svg +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - From ad0477c1481530d970458263c9b6f423adf97dcc Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 4 Mar 2026 14:48:09 +0100 Subject: [PATCH 133/160] Enable "Show all branches" and "All Changes in Repository" by default New Git users are often confused when the history view does not show all commits and branches. Change the defaults so that the history view opens with "Show all branches" enabled and the resource filter set to "All Changes in Repository", giving a complete picture of the repository history without requiring manual configuration. Bug: egit-143 Change-Id: I1b04215ab939ae32a79efc3cad5146316925fe33 --- .../eclipse/egit/ui/test/history/HistoryViewTest.java | 9 +++++++++ .../org/eclipse/egit/ui/PluginPreferenceInitializer.java | 2 +- .../eclipse/egit/ui/internal/history/GitHistoryPage.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java index c2effad868..35d633d1f0 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java @@ -40,7 +40,9 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.egit.core.RepositoryUtil; import org.eclipse.egit.gitflow.op.InitOperation; +import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.JobFamilies; +import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.history.RefFilterHelper; import org.eclipse.egit.ui.internal.history.RefFilterHelper.RefFilter; @@ -125,11 +127,18 @@ public void setupTests() throws Exception { RepositoryUtil.INSTANCE.addConfiguredRepository(repoFile); + // Reset to ensure reproducible state regardless of defaults + Activator.getDefault().getPreferenceStore().setValue( + UIPreferences.RESOURCEHISTORY_SHOW_ALL_BRANCHES, false); + Repository repo = myRepoViewUtil.lookupRepository(repoFile); refFilterHelper = new RefFilterHelper(repo); refFilterHelper.setRefFilters(refFilterHelper.getDefaults()); refFilterHelper.resetLastSelectionStateToDefault(); + + // Reset resource filter to SHOWALLRESOURCE for test isolation + initFilter(0); } private void checkout(Git git, String ref, boolean create) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java index b1b191c547..39c3ae4f94 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java @@ -62,7 +62,7 @@ public void initializeDefaultPreferences() { store.setDefault(UIPreferences.RESOURCEHISTORY_SHOW_REV_COMMENT, true); store.setDefault(UIPreferences.RESOURCEHISTORY_SHOW_TOOLTIPS, false); store.setDefault(UIPreferences.RESOURCEHISTORY_SHOW_ALL_BRANCHES, - false); + true); store.setDefault(UIPreferences.RESOURCEHISTORY_SELECTED_REF_FILTERS, "HEAD"); //$NON-NLS-1$ store.setDefault( diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java index 372b567893..3e49c07971 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java @@ -1668,7 +1668,7 @@ private void initActions() { showAllFilter = ShowFilter.valueOf(Activator.getDefault() .getPreferenceStore().getString(PREF_SHOWALLFILTER)); } catch (IllegalArgumentException e) { - showAllFilter = ShowFilter.SHOWALLRESOURCE; + showAllFilter = ShowFilter.SHOWALLREPO; } actions = new GitHistoryPageActions(this); From f0bfd428489a628b7b3bda19eee3c4bf7ddb6298 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Mar 2026 12:01:56 +0100 Subject: [PATCH 134/160] Replace search icon in history view with standard platform icon Bug: egit-149 Change-Id: Icc2a4ee96fe073490ed9ec31a056596d3894f213 --- .../org.eclipse.egit.ui/icons/elcl16/find.svg | 678 ++++++++++++++---- org.eclipse.egit.ui/icons/elcl16/find.png | Bin 396 -> 259 bytes org.eclipse.egit.ui/icons/elcl16/find.svg | 678 ++++++++++++++---- org.eclipse.egit.ui/icons/elcl16/find@2x.png | Bin 906 -> 454 bytes 4 files changed, 1094 insertions(+), 262 deletions(-) diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/find.svg b/icons/org.eclipse.egit.ui/icons/elcl16/find.svg index 404490d51c..b312689771 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/find.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/find.svg @@ -1,152 +1,568 @@ - + - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - image/svg+xml - - - - - - - - - - - + style="display:inline" + transform="translate(0,-1036.3622)"> \ No newline at end of file diff --git a/org.eclipse.egit.ui/icons/elcl16/find.png b/org.eclipse.egit.ui/icons/elcl16/find.png index 7405e88e30cd0a936e2ee8fe5d7eb5119967465b..997b0545b895c9553dc6c142f38c9ae675190186 100644 GIT binary patch delta 232 zcmVlozNMiSki;G3bP3E_uhMX@gEtMeI5RlD4&8I1H3Dl75AVYwG idYG(S3pHdvDBuC5h~7X?9iZC)0000yZfCUxK?Bm;dXKE$bLi)nAAkP;`2F|) zm!E(Bzxn*@|M~+5|CaPLpCM>KO#Rf4Pv3n7YyA29-~X>a|9^rFxc~a||LpemZv+kS zubThy(c3ToKYaWBALNRUK>F3Epa1W_`usn>v7fL3E+s3DOxbk)CrH!VFTcQ=pT7U` zfByC}|HJF%TqbCMLDqT$^W1e`C#=8p`|gX+K%2k(pRwiQf7jy0|3gzJKZ{A8szT5Z z?bNLX#yMM$7;9#4`D~oM>6>-_rptlJ)1O87R{f8TpYSv$d6GBDX(Kvil1xm(q??ic z)qi3VCcKJDndnclAqffn0?`Q*u7V7SPM-XktW*jzBqnLnWnfsmW*A-o0O>W)*=4}n QH2?qr07*qoM6N<$f>cb;_y7O^ diff --git a/org.eclipse.egit.ui/icons/elcl16/find.svg b/org.eclipse.egit.ui/icons/elcl16/find.svg index 404490d51c..b312689771 100644 --- a/org.eclipse.egit.ui/icons/elcl16/find.svg +++ b/org.eclipse.egit.ui/icons/elcl16/find.svg @@ -1,152 +1,568 @@ - + - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - image/svg+xml - - - - - - - - - - - + style="display:inline" + transform="translate(0,-1036.3622)"> \ No newline at end of file diff --git a/org.eclipse.egit.ui/icons/elcl16/find@2x.png b/org.eclipse.egit.ui/icons/elcl16/find@2x.png index 417cd8ea3a388de524a0cd8bd88bec4af06444b4..79a530e97569b6b8986f637bd08d2283fb36c192 100644 GIT binary patch delta 429 zcmV;e0aE^o2gU=CBYy#nNkl(KOeP5rqY4W^5)!Gm7g$364|; zKocfPD3am;ltcs!QWkP@61q7<$^io&1p}K1v1LPi1rUyGc%STSIN${lzM{CexLAZh zQ9PgGqL_%vsDA=T8^Cf0kgoxab8I!|U!bD`2dX-T;qO4~L+=L3Uvx(RLoI^rwgD&} zNokUSf*tB}bb0bZ0!yRxIa<2dj@~E*s&&EQ2=YUM%;Go%h<{^A%n5XJ1TZ8#u!O{K zilT!`A@Q58Apwee90@aop3&hl7(yZj-4UQ7oUZ*$peCgONRHS{wXPhgApyj*VU_~` X6W$XS7=>%l00000NkvXXu0mjfd-b&? delta 884 zcmV-)1B?8|1BwTbBYy)?NklFJkgn>oLG&)3Np7Z5mns}I}p{_9r^PXsXPlklOd7gruRP*zu?@Nf3iRz8U; zgwa;ru*+(Jx$zV}_x9sQP=6*cYXb<#_P62!)=`FRO z=nyeLTKPq3-Tn)7bHCap$H1mM30`^pUIH5&55hefP|aD|!*$^3A_hn;X?3NRwBY3j zx4P541i>9M2(RAhe*lla$2(>I`eQFL51m1#`E=wFBo|++UsZes)t6tYCTzw#et24Z zJwTuLj(_~>zW&y8P;|&RC`P^slT2+1D@-?}OA|X3Xzp=Mvnfh zL~S6QQG=NA@g0W9Ij(5dmLhAz0cignMBRS|k=G~_gmcc0a1244FqE_7q^wCRNA|WO z1R)}BE{gy*QRhK64r|U2vpe#eQnh;VMNXb*=c&Yw_pyrA-|8p$C>PoRZ}h$Z0000< KMNUMnLSTZm45AwV From b9798e23ad045a0aeb669ecc61dd1b183a1fc9d6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 19 Mar 2026 00:32:40 +0100 Subject: [PATCH 135/160] Update 4.39 p2 repo to use the releases URL Change-Id: I22738c4b50eeebb2583b672c22cc783c341678cd --- org.eclipse.egit.target/egit-4.39.target | 4 ++-- org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 933bedd974..b5187d80a5 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd index ff61d63c61..5a5cf2e240 100644 --- a/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd +++ b/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd @@ -1,6 +1,6 @@ target "4.39-2026-03" with source configurePhase -location "https://download.eclipse.org/staging/2026-03" { +location "https://download.eclipse.org/releases/2026-03" { // Eclipse platform biz.aQute.bnd.util lazy biz.aQute.bndlib lazy From acc2641e33409e7fe798d3f02127b0ad7db0f757 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Mar 2026 11:29:04 +0100 Subject: [PATCH 136/160] Add toggle button for filter files in staging view The staging view always showed the filter files input field. Add a toggle button similar to the "Show Find Toolbar" button in the history view. The filter is hidden by default and its visibility state is persisted via preferences. When hiding the filter, any active filter text is cleared. The toggle is bound to the standard Edit > Find command so that Ctrl+F toggles filter visibility, consistent with the history view. Bug: egit-150 Change-Id: I9a7db15f8283533ad8d154ffba2798009822e5b1 --- .../egit/ui/PluginPreferenceInitializer.java | 1 + .../org/eclipse/egit/ui/UIPreferences.java | 2 + .../org/eclipse/egit/ui/internal/UIText.java | 6 +++ .../egit/ui/internal/staging/StagingView.java | 54 +++++++++++++++++-- .../egit/ui/internal/uitext.properties | 4 +- 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java index 39c3ae4f94..82c5925155 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java @@ -147,6 +147,7 @@ public void initializeDefaultPreferences() { StagingView.Presentation.LIST.name()); store.setDefault(UIPreferences.STAGING_VIEW_FILENAME_MODE, true); store.setDefault(UIPreferences.STAGING_VIEW_COMPARE_MODE, true); + store.setDefault(UIPreferences.STAGING_VIEW_SHOW_FILTER, false); store.setDefault(UIPreferences.STAGING_VIEW_MAX_LIMIT_LIST_MODE, 10000); store.setDefault(UIPreferences.STAGING_VIEW_PRESENTATION_CHANGED, false); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java index 90b2fa8ea5..99daa5d328 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java @@ -289,6 +289,8 @@ private UIPreferences() { /** */ public static final String STAGING_VIEW_COMPARE_MODE = "StagingView_CompareMode"; //$NON-NLS-1$ /** */ + public static final String STAGING_VIEW_SHOW_FILTER = "StagingView_ShowFilter"; //$NON-NLS-1$ + /** */ public static final String STAGING_VIEW_FILENAME_MODE = "StagingView_FileNameMode"; //$NON-NLS-1$ /** */ public static final String STAGING_VIEW_PRESENTATION = "StagingView_Presentation"; //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 646c6753d1..ad1e15afbc 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -6205,6 +6205,12 @@ public class UIText extends NLS { /** */ public static String StagingView_Find; + /** */ + public static String StagingView_ShowFilterTooltip; + + /** */ + public static String StagingView_HideFilterTooltip; + /** */ public static String StagingView_MergeTool; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index ee15a0fd92..35e2f3d5ed 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -321,6 +321,8 @@ public class StagingView extends ViewPart private Text filterText; + private ControlContribution filterContribution; + /** Remember compiled pattern of the current filter string for performance. */ private Pattern filterPattern; @@ -2150,7 +2152,7 @@ private void initPresentation() { private void updateToolbar() { - ControlContribution controlContribution = new ControlContribution( + filterContribution = new ControlContribution( "StagingView.searchText") { //$NON-NLS-1$ @Override @@ -2180,11 +2182,58 @@ protected Control createControl(Composite parent) { return toolbarComposite; } }; + boolean showFilter = getPreferenceStore() + .getBoolean(UIPreferences.STAGING_VIEW_SHOW_FILTER); + filterContribution.setVisible(showFilter); IActionBars actionBars = getViewSite().getActionBars(); IToolBarManager toolbar = actionBars.getToolBarManager(); + IMenuManager dropdownMenu = actionBars.getMenuManager(); + + toolbar.removeAll(); + dropdownMenu.removeAll(); - toolbar.add(controlContribution); + toolbar.add(filterContribution); + + Action showFilterAction = new Action(UIText.StagingView_Find, + IAction.AS_CHECK_BOX) { + + @Override + public void run() { + boolean checked = isChecked(); + getPreferenceStore().setValue( + UIPreferences.STAGING_VIEW_SHOW_FILTER, checked); + filterContribution.setVisible(checked); + if (!checked && filterText != null + && !filterText.isDisposed() + && !filterText.getText().isEmpty()) { + filterText.setText(""); //$NON-NLS-1$ + } + toolbar.update(true); + if (checked && filterText != null && !filterText.isDisposed()) { + filterText.setFocus(); + } + } + + @Override + public void setChecked(boolean checked) { + super.setChecked(checked); + if (checked) { + setToolTipText( + UIText.StagingView_HideFilterTooltip); + } else { + setToolTipText( + UIText.StagingView_ShowFilterTooltip); + } + } + }; + showFilterAction.setActionDefinitionId( + IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE); + showFilterAction.setImageDescriptor(UIIcons.ELCL16_FIND); + showFilterAction.setChecked(showFilter); + toolbar.add(showFilterAction); + actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), + showFilterAction); refreshAction = new Action(UIText.StagingView_Refresh, IAction.AS_PUSH_BUTTON) { @Override @@ -2307,7 +2356,6 @@ public void run() { fileNameModeAction.setChecked(getPreferenceStore().getBoolean( UIPreferences.STAGING_VIEW_FILENAME_MODE)); - IMenuManager dropdownMenu = actionBars.getMenuManager(); dropdownMenu.add(presentationAction); dropdownMenu.add(new Separator()); dropdownMenu.add(openNewCommitsAction); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 9d41eda5d0..11175a9dba 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -2174,7 +2174,9 @@ StagingView_Presentation=Presentation StagingView_List=List StagingView_Tree=Tree StagingView_CompactTree=Compact Tree -StagingView_Find=Filter files +StagingView_Find=Filter &Toolbar +StagingView_ShowFilterTooltip=Show Filter Toolbar +StagingView_HideFilterTooltip=Hide Filter Toolbar StagingView_MergeTool=Merge Tool StagingView_AddJob=Adding files to index... StagingView_RemoveJob=Removing files from index... From 05d51522dd6f8a81e826ae3e8af9b46de82d4795 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Mar 2026 11:17:06 +0100 Subject: [PATCH 137/160] Move staging view repository info from form heading to label Replace the decorated form heading (with gradient and separator) with a simple CLabel inside the view body. This saves vertical space while keeping the repository info visible in the view. Bug: egit-148 Change-Id: I7b3cfb56a4022ab6704a7d58bc2a466543080143 --- .../org/eclipse/egit/ui/internal/UIText.java | 9 ++ .../egit/ui/internal/staging/StagingView.java | 86 +++++++++++++++---- .../egit/ui/internal/uitext.properties | 3 + 3 files changed, 83 insertions(+), 15 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index ad1e15afbc..6f937e2f9d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -6109,6 +6109,15 @@ public class UIText extends NLS { /** */ public static String StagingView_NoSelectionTitle; + /** */ + public static String StagingView_RepoTooltipRepository; + + /** */ + public static String StagingView_RepoTooltipPath; + + /** */ + public static String StagingView_RepoTooltipBranch; + /** */ public static String StagingView_CompareMode; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 35e2f3d5ed..de7bfcab32 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -86,6 +86,7 @@ import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.commit.CommitContext; import org.eclipse.egit.ui.internal.ActionUtils; +import org.eclipse.egit.ui.internal.GitLabels; import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.UIIcons; @@ -183,6 +184,7 @@ import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NoFilepatternException; import org.eclipse.jgit.events.ListenerHandle; +import org.eclipse.jgit.lib.BranchTrackingStatus; import org.eclipse.jgit.lib.CommitConfig; import org.eclipse.jgit.lib.CommitConfig.CleanupMode; import org.eclipse.jgit.lib.Constants; @@ -195,6 +197,7 @@ import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.util.StringUtils; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.custom.VerifyKeyListener; @@ -299,6 +302,8 @@ public class StagingView extends ViewPart private Form form; + private CLabel repoLabel; + private RepositoryNode titleNode; private final Map titleLabels = new HashMap<>(); @@ -810,7 +815,8 @@ public void createPartControl(final Composite parent) { new RepositoryTreeNodeLabelProvider(), PlatformUI.getWorkbench().getDecoratorManager()); titleLabelProvider.addListener(e -> { - if (titleNode != null && form != null && !form.isDisposed()) { + if (titleNode != null && repoLabel != null + && !repoLabel.isDisposed()) { updateTitle(false); } }); @@ -854,12 +860,15 @@ public void controlMoved(ControlEvent e) { // ignore } }); - form.setImage(getImage(UIIcons.REPOSITORY)); - form.setText(UIText.StagingView_NoSelectionTitle); GridDataFactory.fillDefaults().grab(true, true).applyTo(form); - toolkit.decorateFormHeading(form); GridLayoutFactory.swtDefaults().applyTo(form.getBody()); + repoLabel = new CLabel(form.getBody(), SWT.NONE); + repoLabel.setImage(getImage(UIIcons.REPOSITORY)); + repoLabel.setText(UIText.StagingView_NoSelectionTitle); + GridDataFactory.fillDefaults().grab(true, false) + .applyTo(repoLabel); + mainSashForm = new SashForm(form.getBody(), getMainSashFormOrientation()); saveSashFormOrientationOnDisposal(mainSashForm, MAIN_SASH_FORM_ORIENTATION_VERTICAL); saveSashFormWeightsOnDisposal(mainSashForm, @@ -1520,20 +1529,66 @@ private void updateTitle(boolean force) { titleNode.getRepository().getDirectory(), r -> new ViewerLabel(null, null)); if (force) { - if (label.getImage() != null) { - form.setImage(label.getImage()); - } if (!StringUtils.isEmptyOrNull(label.getText())) { - form.setText(label.getText()); + updateRepoLabel(label.getText(), + label.getImage() != null ? label.getImage() + : getImage(UIIcons.REPOSITORY)); } } titleLabelProvider.updateLabel(label, titleNode); - if (label.hasNewImage()) { - form.setImage(label.getImage()); + if (label.hasNewText() || label.hasNewImage()) { + updateRepoLabel(label.getText(), + label.getImage() != null ? label.getImage() + : getImage(UIIcons.REPOSITORY)); + } + } + + private void updateRepoLabel(String text, Image image) { + if (repoLabel != null && !repoLabel.isDisposed()) { + repoLabel.setText(text); + repoLabel.setImage(image); + repoLabel.setToolTipText(buildRepoTooltip()); + repoLabel.requestLayout(); } - if (label.hasNewText()) { - form.setText(label.getText()); + } + + private String buildRepoTooltip() { + if (titleNode == null) { + return null; + } + Repository repository = titleNode.getRepository(); + StringBuilder sb = new StringBuilder(); + sb.append(UIText.StagingView_RepoTooltipRepository).append(": ") //$NON-NLS-1$ + .append(RepositoryUtil.INSTANCE + .getRepositoryName(repository)); + sb.append('\n'); + sb.append(UIText.StagingView_RepoTooltipPath).append(": ") //$NON-NLS-1$ + .append(repository.getDirectory().getAbsolutePath()); + try { + String branch = RepositoryUtil.INSTANCE + .getShortBranch(repository); + if (branch != null) { + sb.append('\n'); + sb.append(UIText.StagingView_RepoTooltipBranch) + .append(": ") //$NON-NLS-1$ + .append(branch); + BranchTrackingStatus trackingStatus = BranchTrackingStatus + .of(repository, branch); + if (trackingStatus != null) { + int ahead = trackingStatus.getAheadCount(); + int behind = trackingStatus.getBehindCount(); + if (ahead != 0 || behind != 0) { + sb.append('\n'); + sb.append(GitLabels + .formatBranchTrackingStatus( + trackingStatus)); + } + } + } + } catch (IOException e) { + // ignore } + return sb.toString(); } private void setCommentCharTooltip() { @@ -4175,11 +4230,12 @@ private void clearRepository(@Nullable Repository repository) { refreshAction.setEnabled(false); updateSectionText(); titleNode = null; - form.setImage(getImage(UIIcons.REPOSITORY)); if (repository != null && repository.isBare()) { - form.setText(UIText.StagingView_BareRepoSelection); + updateRepoLabel(UIText.StagingView_BareRepoSelection, + getImage(UIIcons.REPOSITORY)); } else { - form.setText(UIText.StagingView_NoSelectionTitle); + updateRepoLabel(UIText.StagingView_NoSelectionTitle, + getImage(UIIcons.REPOSITORY)); } updateIgnoreErrorsButtonVisibility(); updateRebaseButtonVisibility(false); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 11175a9dba..817fa7f466 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -2142,6 +2142,9 @@ StagingView_headCommitChanged=WARNING: head commit changed in the meantime StagingView_noStagedFiles=There are no staged files. StagingView_BareRepoSelection=Bare Repository Selected StagingView_NoSelectionTitle=No Repository Selected +StagingView_RepoTooltipRepository=Repository +StagingView_RepoTooltipPath=Path +StagingView_RepoTooltipBranch=Branch StagingView_CompareMode=Compare Mode StagingView_OpenNewCommits=Open New Commits StagingView_ColumnLayout=Column Layout From afe2f0cf8e28cc85990f33db03eb3f73a17aadc0 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Mar 2026 12:42:16 +0100 Subject: [PATCH 138/160] Use standard font for staging view section headers The section headers (Unstaged Changes, Staged Changes, Commit Message, Rebase) used a bold font from the Forms toolkit. Override with the parent's standard font to save vertical space and provide a more consistent look. Bug: egit-151 Change-Id: Ie839177bac1d278995d47fb77b61e0fac3f3a5ec --- .../src/org/eclipse/egit/ui/internal/staging/StagingView.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index de7bfcab32..024b48c5b2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -933,6 +933,7 @@ public void run() { unstagedSection = toolkit.createSection(stagingSashForm, ExpandableComposite.SHORT_TITLE_BAR); + unstagedSection.setFont(stagingSashForm.getFont()); unstagedSection.clientVerticalSpacing = 0; unstagedSection.setLayoutData( @@ -962,6 +963,7 @@ public void run() { rebaseSection = toolkit.createSection(rebaseAndCommitComposite, ExpandableComposite.SHORT_TITLE_BAR); + rebaseSection.setFont(rebaseAndCommitComposite.getFont()); rebaseSection.clientVerticalSpacing = 0; rebaseSection.setText(UIText.StagingView_RebaseLabel); @@ -1012,6 +1014,7 @@ public void widgetSelected(SelectionEvent e) { commitMessageSection = toolkit.createSection(rebaseAndCommitComposite, ExpandableComposite.SHORT_TITLE_BAR); + commitMessageSection.setFont(rebaseAndCommitComposite.getFont()); commitMessageSection.clientVerticalSpacing = 0; commitMessageSection.setText(UIText.StagingView_CommitMessage); commitMessageSection.setLayoutData(GridDataFactory.fillDefaults() @@ -1333,6 +1336,7 @@ public void widgetSelected(SelectionEvent e) { stagedSection = toolkit.createSection(stagingSashForm, ExpandableComposite.SHORT_TITLE_BAR); + stagedSection.setFont(stagingSashForm.getFont()); stagedSection.clientVerticalSpacing = 0; createStagedToolBarComposite(); From f4415ed6d942f7826e54edd9f1b79bccdef0083f Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Fri, 20 Mar 2026 13:50:49 +0100 Subject: [PATCH 139/160] [CommitGraphTable] Coalesce history table resize relayout Do not re-layout directly, request a re-layout asynchronously and only if there is no re-layouting happening already. Bug: egit-69 Change-Id: I889dd6c1ff80e9353c9f26cb4929c48d492606e4 --- .../ui/internal/history/CommitGraphTable.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java index e1b94d2526..0455fc29d1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java @@ -190,6 +190,8 @@ static Font highlightFont() { private boolean enableAntialias = true; + private boolean resizeLayoutPending; + /** * Creates a new {@link CommitGraphTable} using the given * {@link TableLoader} and {@link ResourceManager} with the given style. @@ -304,7 +306,7 @@ public void handleEvent(Event event) { rawTable.addDisposeListener( event -> store.removePropertyChangeListener(prefsChanged)); } - rawTable.addListener(SWT.Resize, event -> layout(rawTable)); + rawTable.addListener(SWT.Resize, event -> scheduleResizeLayout(rawTable)); table = new TableViewer(rawTable) { @Override @@ -699,6 +701,22 @@ public TableViewer getTableView() { return table; } + private void scheduleResizeLayout(Table rawTable) { + if (resizeLayoutPending) { + return; + } + resizeLayoutPending = true; + rawTable.getDisplay().asyncExec(() -> { + try { + if (!rawTable.isDisposed()) { + layout(rawTable); + } + } finally { + resizeLayoutPending = false; + } + }); + } + private void layout(Table rawTable) { rawTable.getParent().layout(); // Check that the table now fits From 48b060d252f87adaf659ad00731b8ec085f98213 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 15:27:55 +0100 Subject: [PATCH 140/160] Fix egit-4.39 target platform Eclipse didn't start anymore when trying to debug EGit. Fix this by updating - jakarta.servlet-api to 4.0.0 and adding - org.apache.felix.scr 2.2.14 - org.apache.felix.gogo.runtime 1.1.6 - org.apache.felix.gogo.shell 1.1.4 - org.mortbay.jasper.mortbay-apache-jsp 9.0.111 - org.osgi.service.component 1.5.1.202212101352 - org.osgi.service.coordinator 1.0.2.201505202024 - org.osgi.service.device 1.1.1.202109301733 - org.osgi.service.log.stream 1.0.0.202109301733 - org.osgi.service.metatype 1.4.1.202109301733 - org.osgi.service.provisioning 1.2.0.201505202024 - org.osgi.service.upnp 1.2.1.202109301733 - org.osgi.service.useradmin 1.1.1.202109301733 - org.osgi.service.wireadmin 1.0.2.202109301733 - org.osgi.util.function 1.2.0.202109301733 - org.osgi.util.measurement 1.0.2.201802012109 - org.osgi.util.position 1.0.1.201505202026 - org.osgi.util.promise 1.3.0.202212101352 - org.osgi.util.pushstream 1.1.0.202212101352 - org.osgi.util.xml 1.0.2.202109301733 Change-Id: I1582524d317ab8acd063b03086fd43cd6d913c7d --- org.eclipse.egit.target/egit-4.39.target | 24 +++++++++++++++++--- org.eclipse.egit.target/orbit/orbit-4.39.tpd | 22 ++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index b5187d80a5..1f9dee162f 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -52,6 +52,9 @@ + + + @@ -68,6 +71,7 @@ + @@ -81,7 +85,21 @@ - + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.target/orbit/orbit-4.39.tpd b/org.eclipse.egit.target/orbit/orbit-4.39.tpd index bee978d57f..c907a352ce 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.39.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.39.tpd @@ -18,7 +18,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] jakarta.xml.bind-api [2.3.3,2.3.3] jakarta.xml.bind-api [4.0.5,4.0.5] - javax.servlet-api [3.1.0,3.1.0] + jakarta.servlet-api [4.0.0,4.0.0] junit-jupiter-api [5.14.3,5.14.3] junit-jupiter-engine [5.14.3,5.14.3] junit-jupiter-migrationsupport [5.14.3,5.14.3] @@ -40,6 +40,9 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.commons.logging [1.2.0,1.2.0] org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.felix.scr [2.2.14,2.2.14] + org.apache.felix.gogo.runtime [1.1.6,1.1.6] + org.apache.felix.gogo.shell [1.1.4,1.1.4] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] org.apache.httpcomponents.httpcore [4.4.16,4.4.16] @@ -56,6 +59,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.hamcrest.source [3.0.0,3.0.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.mortbay.jasper.mortbay-apache-jsp [9.0.111,9.0.111] org.objectweb.asm [9.9.1, 9.9.1] org.objectweb.asm.source [9.9.1, 9.9.1] org.objectweb.asm.commons [9.9.1,9.9.1] @@ -69,5 +73,19 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.component [1.5.1.202212101352,1.5.1.202212101352] + org.osgi.service.coordinator [1.0.2.201505202024,1.0.2.201505202024] + org.osgi.service.device [1.1.1.202109301733,1.1.1.202109301733] + org.osgi.service.log.stream [1.0.0.202109301733,1.0.0.202109301733] + org.osgi.service.metatype [1.4.1.202109301733,1.4.1.202109301733] + org.osgi.service.provisioning [1.2.0.201505202024,1.2.0.201505202024] + org.osgi.service.upnp [1.2.1.202109301733,1.2.1.202109301733] + org.osgi.service.useradmin [1.1.1.202109301733,1.1.1.202109301733] + org.osgi.service.wireadmin [1.0.2.202109301733,1.0.2.202109301733] + org.osgi.util.function [1.2.0.202109301733,1.2.0.202109301733] + org.osgi.util.measurement [1.0.2.201802012109,1.0.2.201802012109] + org.osgi.util.position [1.0.1.201505202026,1.0.1.201505202026] + org.osgi.util.promise [1.3.0.202212101352,1.3.0.202212101352] + org.osgi.util.pushstream [1.1.0.202212101352,1.1.0.202212101352] + org.osgi.util.xml [1.0.2.202109301733,1.0.2.202109301733] } From 820b4e4f8e75367da59326864ccc6f5873ef904d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 15:36:46 +0100 Subject: [PATCH 141/160] Add egit-4.40 target platform for simrel 2026-06 Change-Id: If9b3ad6de65d834469da34c062e0476feae200a5 --- org.eclipse.egit.target/egit-4.40.target | 428 ++++++++++++++++++ org.eclipse.egit.target/egit-4.40.tpd | 7 + org.eclipse.egit.target/orbit/orbit-4.40.tpd | 91 ++++ .../releasetrain/4.40-2026-06.tpd | 48 ++ 4 files changed, 574 insertions(+) create mode 100644 org.eclipse.egit.target/egit-4.40.target create mode 100644 org.eclipse.egit.target/egit-4.40.tpd create mode 100644 org.eclipse.egit.target/orbit/orbit-4.40.tpd create mode 100644 org.eclipse.egit.target/releasetrain/4.40-2026-06.tpd diff --git a/org.eclipse.egit.target/egit-4.40.target b/org.eclipse.egit.target/egit-4.40.target new file mode 100644 index 0000000000..a9539993e9 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.40.target @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + jar + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + jar + + + org.osgi + org.osgi.service.component.annotations + 1.5.1 + jar + + + org.osgi + org.osgi.service.metatype.annotations + 1.4.1 + jar + + + + + + + org.tukaani + xz + 1.11 + jar + + + + + + + org.slf4j + slf4j-api + 2.0.17 + jar + + + org.slf4j + slf4j-simple + 2.0.17 + jar + + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.17.1 + jar + + + org.apache.sshd + sshd-sftp + 2.17.1 + jar + + + + + + + org.mockito + mockito-core + 5.21.0 + jar + + + + + + + net.java.dev.jna + jna + 5.18.1 + jar + + + net.java.dev.jna + jna-platform + 5.18.1 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.1.6 + jar + + + org.eclipse.jetty + jetty-http + 12.1.6 + jar + + + org.eclipse.jetty + jetty-io + 12.1.6 + jar + + + org.eclipse.jetty + jetty-security + 12.1.6 + jar + + + org.eclipse.jetty + jetty-server + 12.1.6 + jar + + + org.eclipse.jetty + jetty-session + 12.1.6 + jar + + + org.eclipse.jetty + jetty-util + 12.1.6 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.1.6 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + com.google.code.gson + gson + 2.13.2 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.18.5 + jar + + + net.bytebuddy + byte-buddy-agent + 1.18.5 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.83 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.83 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.83 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.83 + jar + + + + + + + org.assertj + assertj-core + 3.27.7 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.21.0 + jar + + + org.apache.commons + commons-compress + 1.28.0 + jar + + + org.apache.commons + commons-lang3 + 3.20.0 + jar + + + commons-io + commons-io + 2.21.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.egit.target/egit-4.40.tpd b/org.eclipse.egit.target/egit-4.40.tpd new file mode 100644 index 0000000000..eb298dd778 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.40.tpd @@ -0,0 +1,7 @@ +target "egit-4.40" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.40.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.40-2026-06.tpd" diff --git a/org.eclipse.egit.target/orbit/orbit-4.40.tpd b/org.eclipse.egit.target/orbit/orbit-4.40.tpd new file mode 100644 index 0000000000..f965a2f8ce --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.40.tpd @@ -0,0 +1,91 @@ +target "orbit-4.40" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-06" { + aQute.libg [7.2.1.202601121903,7.2.1.202601121903] + bndtools.api [7.2.1.202601121903,7.2.1.202601121903] + com.ibm.icu [78.2.0,78.2.0] + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [2.0.0,2.0.0] + jakarta.activation-api [2.1.4,2.1.4] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api [2.1.1,2.1.1] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.5,4.0.5] + jakarta.servlet-api [4.0.0,4.0.0] + junit-jupiter-api [5.14.3,5.14.3] + junit-jupiter-engine [5.14.3,5.14.3] + junit-jupiter-migrationsupport [5.14.3,5.14.3] + junit-jupiter-params [5.14.3,5.14.3] + junit-platform-commons [1.14.3,1.14.3] + junit-platform-engine [1.14.3,1.14.3] + junit-platform-launcher [1.14.3,1.14.3] + junit-platform-runner [1.14.3,1.14.3] + junit-platform-suite-api [1.14.3,1.14.3] + junit-platform-suite-commons [1.14.3,1.14.3] + junit-platform-suite-engine [1.14.3,1.14.3] + junit-vintage-engine [5.14.3,5.14.3] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.felix.scr [2.2.14,2.2.14] + org.apache.felix.gogo.runtime [1.1.6,1.1.6] + org.apache.felix.gogo.shell [1.1.4,1.1.4] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] + org.apache.lucene.analysis-common [10.4.0.v20260226-1000,10.4.0.v20260226-1000] + org.apache.lucene.analysis-smartcn [10.4.0.v20260226-1000,10.4.0.v20260226-1000] + org.apache.lucene.core [10.4.0.v20260226-1000,10.4.0.v20260226-1000] + org.commonmark [0.27.1,0.27.1] + org.commonmark.ext-gfm-tables [0.27.1,0.27.1] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] + org.hamcrest [3.0.0,3.0.0] + org.hamcrest.source [3.0.0,3.0.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.mortbay.jasper.mortbay-apache-jsp [9.0.111,9.0.111] + org.objectweb.asm [9.9.1, 9.9.1] + org.objectweb.asm.source [9.9.1, 9.9.1] + org.objectweb.asm.commons [9.9.1,9.9.1] + org.objectweb.asm.tree [9.9.1, 9.9.1] + org.objectweb.asm.tree.analysis [9.9.1, 9.9.1] + org.objectweb.asm.util [9.9.1, 9.9.1] + org.objenesis [3.5.0,3.5.0] + org.objenesis.source [3.5.0,3.5.0] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.component [1.5.1.202212101352,1.5.1.202212101352] + org.osgi.service.coordinator [1.0.2.201505202024,1.0.2.201505202024] + org.osgi.service.device [1.1.1.202109301733,1.1.1.202109301733] + org.osgi.service.log.stream [1.0.0.202109301733,1.0.0.202109301733] + org.osgi.service.metatype [1.4.1.202109301733,1.4.1.202109301733] + org.osgi.service.provisioning [1.2.0.201505202024,1.2.0.201505202024] + org.osgi.service.upnp [1.2.1.202109301733,1.2.1.202109301733] + org.osgi.service.useradmin [1.1.1.202109301733,1.1.1.202109301733] + org.osgi.service.wireadmin [1.0.2.202109301733,1.0.2.202109301733] + org.osgi.util.function [1.2.0.202109301733,1.2.0.202109301733] + org.osgi.util.measurement [1.0.2.201802012109,1.0.2.201802012109] + org.osgi.util.position [1.0.1.201505202026,1.0.1.201505202026] + org.osgi.util.promise [1.3.0.202212101352,1.3.0.202212101352] + org.osgi.util.pushstream [1.1.0.202212101352,1.1.0.202212101352] + org.osgi.util.xml [1.0.2.202109301733,1.0.2.202109301733] +} diff --git a/org.eclipse.egit.target/releasetrain/4.40-2026-06.tpd b/org.eclipse.egit.target/releasetrain/4.40-2026-06.tpd new file mode 100644 index 0000000000..c2d80fed63 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.40-2026-06.tpd @@ -0,0 +1,48 @@ +target "4.40-2026-06" with source configurePhase + +location "https://download.eclipse.org/staging/2026-06" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + biz.aQute.repository + biz.aQute.resolve lazy + bndtools.jareditor lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.bndtools.headless.build.manager lazy + org.bndtools.headless.build.plugin.gradle lazy + org.bndtools.templates.template lazy + org.bndtools.templating lazy + org.bndtools.versioncontrol.ignores.manager lazy + org.bndtools.versioncontrol.ignores.plugin.git lazy + org.commonmark lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.jdt.core.manipulation lazy + org.eclipse.jdt.ui lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.pde.bnd.ui lazy + org.eclipse.pde.core lazy + org.eclipse.sdk.ide lazy + org.eclipse.search.core lazy + org.osgi.service.event lazy + org.osgi.service.http.whiteboard lazy + org.osgi.service.prefs lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} From 1aa7c88dca7aa4f58af581313cd21e15137bfe6e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 24 Mar 2026 14:32:48 +0100 Subject: [PATCH 142/160] Update JGit dependencies - bytebuddy to 1.18.7 - commons-logging to 1.3.6 - Jetty to 12.1.7 - mockito to 5.23.0 - org.tukaani:xz to 1.12 Change-Id: I2ebd0d86a1fa8f00cda9f4c06316d4978a0b33ac --- org.eclipse.egit.target/egit-4.36.target | 28 +++++++++---------- org.eclipse.egit.target/egit-4.37.target | 28 +++++++++---------- org.eclipse.egit.target/egit-4.38.target | 28 +++++++++---------- org.eclipse.egit.target/egit-4.39.target | 28 +++++++++---------- org.eclipse.egit.target/egit-4.40.target | 28 +++++++++---------- .../maven/dependencies.tpd | 26 ++++++++--------- 6 files changed, 83 insertions(+), 83 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index a3c8b10ba4..b4e95b0412 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.11 + 1.12 jar @@ -208,7 +208,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar @@ -400,7 +400,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index d37e88a6d5..d3e79af789 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.11 + 1.12 jar @@ -208,7 +208,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar @@ -400,7 +400,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index 8cc11a4b38..c4880aa06b 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -160,7 +160,7 @@ org.tukaani xz - 1.11 + 1.12 jar @@ -208,7 +208,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar @@ -400,7 +400,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index 1f9dee162f..fee565955a 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -180,7 +180,7 @@ org.tukaani xz - 1.11 + 1.12 jar @@ -228,7 +228,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar @@ -254,49 +254,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar @@ -332,13 +332,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar @@ -420,7 +420,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.egit.target/egit-4.40.target b/org.eclipse.egit.target/egit-4.40.target index a9539993e9..79575ac522 100644 --- a/org.eclipse.egit.target/egit-4.40.target +++ b/org.eclipse.egit.target/egit-4.40.target @@ -1,7 +1,7 @@ - + @@ -179,7 +179,7 @@ org.tukaani xz - 1.11 + 1.12 jar @@ -227,7 +227,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar @@ -253,49 +253,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar @@ -331,13 +331,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar @@ -419,7 +419,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index eb8d3a0fa1..09da340743 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -29,7 +29,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.5" + version = "1.3.6" } } @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.5" + version = "1.18.7" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.5" + version = "1.18.7" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "jakarta.servlet" @@ -211,7 +211,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.21.0" + version = "5.23.0" } } @@ -265,7 +265,7 @@ maven xz dependency { groupId = "org.tukaani" artifactId = "xz" - version = "1.11" + version = "1.12" } } From b5299b868218f9639ea4c8a65bf512b6d7e19b0f Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 18 Mar 2026 11:17:06 +0100 Subject: [PATCH 143/160] Replace Form with Composite in staging view Replace the Eclipse Forms Form widget with a plain SWT Composite for the staging view's main container. The decorated form heading with its gradient and separator line consumed vertical space without adding value, since the repository info is already shown in a CLabel. Using a plain Composite is lighter weight, saves vertical space for the staged/unstaged file lists, and removes the dependency on the Form class while keeping all functionality intact. Change-Id: Ib85fa44cfdf4e05df2b4511c1e15b1df2c56b8c3 --- .../egit/ui/internal/staging/StagingView.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index de7bfcab32..422d8c252f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -253,7 +253,6 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.Form; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.handlers.IHandlerService; @@ -300,7 +299,7 @@ public class StagingView extends ViewPart private FormToolkit toolkit; - private Form form; + private Composite composite; private CLabel repoLabel; @@ -835,7 +834,7 @@ public void widgetDisposed(DisposeEvent e) { } }); - form = toolkit.createForm(parent); + composite = new Composite(parent, SWT.NONE); parent.addControlListener(new ControlListener() { private int[] defaultWeights = { 1, 1 }; @@ -860,16 +859,16 @@ public void controlMoved(ControlEvent e) { // ignore } }); - GridDataFactory.fillDefaults().grab(true, true).applyTo(form); - GridLayoutFactory.swtDefaults().applyTo(form.getBody()); + GridDataFactory.fillDefaults().grab(true, true).applyTo(composite); + GridLayoutFactory.swtDefaults().applyTo(composite); - repoLabel = new CLabel(form.getBody(), SWT.NONE); + repoLabel = new CLabel(composite, SWT.NONE); repoLabel.setImage(getImage(UIIcons.REPOSITORY)); repoLabel.setText(UIText.StagingView_NoSelectionTitle); GridDataFactory.fillDefaults().grab(true, false) .applyTo(repoLabel); - mainSashForm = new SashForm(form.getBody(), getMainSashFormOrientation()); + mainSashForm = new SashForm(composite, getMainSashFormOrientation()); saveSashFormOrientationOnDisposal(mainSashForm, MAIN_SASH_FORM_ORIENTATION_VERTICAL); saveSashFormWeightsOnDisposal(mainSashForm, HORIZONTAL_SASH_FORM_WEIGHT); @@ -3704,7 +3703,7 @@ public void run() { if (files.isEmpty()) { return; } - if (!CommandConfirmation.confirmCheckout(form.getShell(), repo)) { + if (!CommandConfirmation.confirmCheckout(composite.getShell(), repo)) { return; } DiscardChangesOperation operation = new DiscardChangesOperation( From 1a95207b3f46238f56182f9f8e4efa7a93658031 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 25 Mar 2026 10:13:32 +0100 Subject: [PATCH 144/160] Replace Form with Composite in interactive rebase view Replace the Eclipse Forms Form widget with a plain SWT Composite for the interactive rebase view's main container. The decorated form heading with its gradient and separator line consumed vertical space without adding value, since the repository info is now shown in a CLabel. Using a plain Composite is lighter weight, saves vertical space for the rebase plan, and removes the dependency on the Form class while keeping all functionality intact. Bug: egit-155 Change-Id: Ic6e44686cd84dd5555724190ddcc020ed0b1dad2 --- .../rebase/RebaseInteractiveView.java | 75 +++++++++++-------- .../egit/ui/internal/staging/StagingView.java | 20 ++--- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java index 74cf1adb0f..8b02031bab 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java @@ -93,6 +93,7 @@ import org.eclipse.jgit.util.GitDateFormatter; import org.eclipse.jgit.util.GitDateFormatter.Format; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.events.DisposeEvent; @@ -105,6 +106,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; @@ -123,7 +125,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; -import org.eclipse.ui.forms.widgets.Form; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.part.ViewPart; @@ -166,7 +167,9 @@ public class RebaseInteractiveView extends ViewPart implements private boolean dndEnabled = false; - private Form form; + private Composite composite; + + private CLabel repoLabel; private LocalResourceManager resources = new LocalResourceManager( JFaceResources.getResources()); @@ -281,15 +284,41 @@ public void widgetDisposed(DisposeEvent e) { toolkit.dispose(); } }); - form = createForm(parent, toolkit); - createCommandToolBar(form, toolkit); - planTreeViewer = createPlanTreeViewer(form.getBody(), toolkit); + + composite = new Composite(parent, SWT.NONE); + GridDataFactory.fillDefaults().grab(true, true).applyTo(composite); + GridLayoutFactory.fillDefaults().margins(0, 0).spacing(0, 0) + .applyTo(composite); + + repoLabel = new CLabel(composite, SWT.NONE); + repoLabel.setImage(UIIcons.getImage(resources, UIIcons.REPOSITORY)); + repoLabel.setText(UIText.RebaseInteractiveView_NoSelection); + GridDataFactory.fillDefaults().grab(true, false).indent(5, 5) + .applyTo(repoLabel); + + Label repoSeparator = new Label(composite, SWT.SEPARATOR + | SWT.HORIZONTAL); + GridDataFactory.fillDefaults().grab(true, false).applyTo(repoSeparator); + + headComposite = new Composite(composite, SWT.NONE); + GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false) + .margins(5, 2).applyTo(headComposite); + GridDataFactory.fillDefaults().grab(true, false).applyTo(headComposite); + + createCommandToolBar(headComposite, toolkit); + createStepActionToolBar(toolkit); + + Label headerSeparator = new Label(composite, SWT.SEPARATOR + | SWT.HORIZONTAL); + GridDataFactory.fillDefaults().grab(true, false).applyTo(headerSeparator); + + planTreeViewer = createPlanTreeViewer(composite, toolkit); planLayout = new PlanLayout(); planTreeViewer.getTree().getParent().setLayout(planLayout); createColumns(planLayout); - createStepActionToolBar(toolkit); + createPopupMenu(planTreeViewer); setupListeners(); @@ -409,12 +438,8 @@ public void apply(boolean value) { planTreeViewer, () -> currentRepository)); } - private void createCommandToolBar(Form theForm, FormToolkit toolkit) { - headComposite = new Composite(theForm.getHead(), SWT.NONE); - theForm.setHeadClient(headComposite); - GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false) - .margins(0, 0).applyTo(headComposite); - ToolBar toolBar = new ToolBar(headComposite, SWT.FLAT); + private void createCommandToolBar(Composite parent, FormToolkit toolkit) { + ToolBar toolBar = new ToolBar(parent, SWT.FLAT); GridDataFactory.fillDefaults().grab(false, false).applyTo(toolBar); toolkit.adapt(toolBar); toolkit.paintBordersFor(toolBar); @@ -477,7 +502,7 @@ private TreeViewer createPlanTreeViewer(Composite parent, toolkit.paintBordersFor(rebasePlanTableComposite); GridDataFactory.fillDefaults().grab(true, true) .applyTo(rebasePlanTableComposite); - GridLayoutFactory.fillDefaults().extendedMargins(2, 2, 2, 2) + GridLayoutFactory.fillDefaults().extendedMargins(5, 5, 5, 5) .applyTo(rebasePlanTableComposite); final Tree planTree = toolkit.createTree(rebasePlanTableComposite, @@ -495,20 +520,6 @@ private TreeViewer createPlanTreeViewer(Composite parent, return viewer; } - private Form createForm(Composite parent, final FormToolkit toolkit) { - Form newForm = toolkit.createForm(parent); - - Image repoImage = UIIcons.REPOSITORY.createImage(); - UIUtils.hookDisposal(newForm, repoImage); - newForm.setImage(repoImage); - newForm.setText(UIText.RebaseInteractiveView_NoSelection); - GridDataFactory.fillDefaults().grab(true, true).applyTo(newForm); - toolkit.decorateFormHeading(newForm); - GridLayoutFactory.swtDefaults().applyTo(newForm.getBody()); - - return newForm; - } - private void setupListeners() { setupRepositoryViewSelectionChangeListener(); refreshUI(); @@ -884,13 +895,13 @@ private static String getRepositoryName(Repository repository) { String repoName = RepositoryUtil.INSTANCE.getRepositoryName(repository); RepositoryState state = repository.getRepositoryState(); if (state != RepositoryState.SAFE) - return repoName + '|' + state.getDescription(); + return repoName + " | " + state.getDescription(); //$NON-NLS-1$ else return repoName; } private void showRepository(final Repository repository) { - if (form.isDisposed()) + if (composite.isDisposed()) return; if (currentPlan != null) @@ -899,7 +910,7 @@ private void showRepository(final Repository repository) { if (isValidRepo(repository)) { currentPlan = RebaseInteractivePlan.getPlan(repository); currentPlan.addRebaseInteractivePlanChangeListener(this); - form.setText(getRepositoryName(repository)); + repoLabel.setText(getRepositoryName(repository)); } else { currentPlan = null; } @@ -975,9 +986,9 @@ private void refreshUI() { if (currentPlan == null || repo == null || !repo.getRepositoryState().isRebasing()) { if (repo == null) - form.setText(UIText.RebaseInteractiveView_NoSelection); + repoLabel.setText(UIText.RebaseInteractiveView_NoSelection); else - form.setText(getRepositoryName(repo)); + repoLabel.setText(getRepositoryName(repo)); return; } IndexDiffCacheEntry entry = IndexDiffCache.INSTANCE diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index ce5a5983ab..a35ae37f1b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -1207,23 +1207,23 @@ public Repository getRepository() { previewLayout.topControl = commitMessageText; - Composite composite = toolkit.createComposite(commitMessageComposite); - toolkit.paintBordersFor(composite); - GridDataFactory.fillDefaults().grab(true, false).applyTo(composite); + Composite personComposite = toolkit.createComposite(commitMessageComposite); + toolkit.paintBordersFor(personComposite); + GridDataFactory.fillDefaults().grab(true, false).applyTo(personComposite); GridLayoutFactory.swtDefaults().margins(1, 2).numColumns(3) - .spacing(1, LayoutConstants.getSpacing().y).applyTo(composite); + .spacing(1, LayoutConstants.getSpacing().y).applyTo(personComposite); - createPersonLabel(composite, UIIcons.ELCL16_AUTHOR, + createPersonLabel(personComposite, UIIcons.ELCL16_AUTHOR, UIText.StagingView_Author); - authorText = toolkit.createText(composite, null); + authorText = toolkit.createText(personComposite, null); authorText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); authorText.setLayoutData(GridDataFactory.fillDefaults().indent(5, 0) .grab(true, false).align(SWT.FILL, SWT.CENTER).create()); - createPersonLabel(composite, UIIcons.ELCL16_COMMITTER, + createPersonLabel(personComposite, UIIcons.ELCL16_COMMITTER, UIText.StagingView_Committer); - committerText = toolkit.createText(composite, null); + committerText = toolkit.createText(personComposite, null); committerText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); committerText.setLayoutData(GridDataFactory.fillDefaults().indent(5, 0) @@ -2491,8 +2491,8 @@ private boolean isExpandAllowed(boolean staged) { return contentProvider.getCount() <= getMaxLimitForListMode(); } - private TreeViewer createTree(Composite composite) { - Tree tree = toolkit.createTree(composite, SWT.FULL_SELECTION + private TreeViewer createTree(Composite parent) { + Tree tree = toolkit.createTree(parent, SWT.FULL_SELECTION | SWT.MULTI); TreeViewer treeViewer = new TreeViewer(tree); treeViewer.setUseHashlookup(true); From 3037a7750e7d54649b64bf7cf3036c239241b5c1 Mon Sep 17 00:00:00 2001 From: "Klare, Heiko" Date: Thu, 26 Mar 2026 14:23:54 +0100 Subject: [PATCH 145/160] Clean up SVG images Clean up all SVG image files from unused contents with Inkscape's cleanup functionality. Change-Id: I44fd55326b453d62ea10327fce0e3e621623fdb3 Signed-off-by: Klare, Heiko --- icons/components/arrow_green.svg | 98 +- icons/components/arrow_green_angled.svg | 51 +- icons/components/arrow_red angled.svg | 51 +- icons/components/arrow_red.svg | 51 +- icons/components/checkmark.svg | 97 +- icons/components/cloud.svg | 50 +- icons/components/delta.svg | 49 +- icons/components/gerrit.svg | 67 +- icons/components/git.svg | 450 +- icons/components/new_plus.svg | 58 +- icons/components/person.svg | 96 +- icons/components/person_blue.svg | 90 +- icons/components/repo.svg | 154 +- icons/components/tag.svg | 297 +- .../icons/obj16/gitflow.svg | 116 +- .../icons/ovr/git-flow.svg | 50 +- icons/org.eclipse.egit.ui/icons/egit.svg | 70 +- .../org.eclipse.egit.ui/icons/elcl16/add.svg | 53 +- .../icons/elcl16/add_all.svg | 74 +- .../icons/elcl16/author.svg | 99 +- .../icons/elcl16/clear_co.svg | 199 +- .../icons/elcl16/collapseall.svg | 103 +- .../icons/elcl16/comment.svg | 85 +- .../icons/elcl16/commit.svg | 74 +- .../icons/elcl16/committer.svg | 79 +- .../icons/elcl16/compactLayout.svg | 173 +- .../icons/elcl16/compare_view.svg | 75 +- .../icons/elcl16/continue.svg | 125 +- .../icons/elcl16/delete.svg | 52 +- .../icons/elcl16/expandall.svg | 118 +- .../icons/elcl16/filter_folder_funnel.svg | 142 +- .../icons/elcl16/filter_none_funnel.svg | 125 +- .../icons/elcl16/filter_project_funnel.svg | 138 +- .../icons/elcl16/filter_ps_funnel.svg | 125 +- .../icons/elcl16/filter_resource_funnel.svg | 166 +- .../org.eclipse.egit.ui/icons/elcl16/find.svg | 543 +- .../icons/elcl16/flatLayout.svg | 111 +- .../icons/elcl16/goto_input.svg | 104 +- .../icons/elcl16/hide_untracked.svg | 60 +- .../icons/elcl16/hierarchicalLayout.svg | 120 +- .../icons/elcl16/horizontal_view.svg | 228 +- .../icons/elcl16/next_nav.svg | 49 +- .../icons/elcl16/prev_nav.svg | 49 +- .../icons/elcl16/preview.svg | 78 +- .../icons/elcl16/progress_stop.svg | 4453 +---------------- .../icons/elcl16/refresh.svg | 83 +- .../org.eclipse.egit.ui/icons/elcl16/sha1.svg | 102 +- .../org.eclipse.egit.ui/icons/elcl16/skip.svg | 63 +- .../icons/elcl16/start.svg | 70 +- .../icons/elcl16/synced.svg | 74 +- .../icons/elcl16/trash_flat.svg | 84 +- .../icons/elcl16/unstage_all.svg | 71 +- .../icons/etool16/annotate.svg | 392 +- .../icons/etool16/createRepository.svg | 72 +- .../icons/etool16/merge_ignore_left.svg | 78 +- .../icons/etool16/merge_ignore_right.svg | 78 +- .../icons/etool16/newconnect_wiz.svg | 382 +- .../icons/etool16/newgroup_wiz.svg | 213 +- .../icons/etool16/newlocation_wiz.svg | 314 +- .../icons/eview16/rebase_interactive.svg | 56 +- .../icons/eview16/reflog.svg | 60 +- .../icons/eview16/repo_rep.svg | 115 +- .../icons/eview16/staging.svg | 77 +- icons/org.eclipse.egit.ui/icons/obj16/add.svg | 53 +- .../icons/obj16/alphab_sort_co.svg | 90 +- .../icons/obj16/annotated-tag.svg | 94 +- .../icons/obj16/assume_unchanged.svg | 53 +- .../icons/obj16/branch_obj.svg | 50 +- .../icons/obj16/branches_obj.svg | 75 +- .../icons/obj16/changelog_obj.svg | 230 +- .../icons/obj16/check_all.svg | 72 +- .../icons/obj16/checkout.svg | 72 +- .../icons/obj16/cherry-pick.svg | 45 - .../icons/obj16/clean_obj.svg | 107 +- .../org.eclipse.egit.ui/icons/obj16/clear.svg | 69 +- .../icons/obj16/cloneGit.svg | 114 +- .../icons/obj16/commit.svg | 108 +- .../icons/obj16/commit_amend.svg | 89 +- .../icons/obj16/current_step.svg | 51 +- .../icons/obj16/delete_obj.svg | 52 +- .../icons/obj16/disconnect_co.svg | 71 +- .../icons/obj16/done_step.svg | 66 +- .../icons/obj16/editconfig.svg | 130 +- .../org.eclipse.egit.ui/icons/obj16/fetch.svg | 68 +- .../icons/obj16/first_parent_only.svg | 76 +- .../icons/obj16/fixup-down.svg | 56 +- .../icons/obj16/fixup-up.svg | 56 +- .../icons/obj16/gerrit_fetch.svg | 65 +- .../icons/obj16/gerrit_obj.svg | 70 +- .../icons/obj16/gerrit_push.svg | 65 +- .../icons/obj16/gitrepository.svg | 75 +- .../icons/obj16/history.svg | 258 +- .../icons/obj16/ignore.svg | 132 +- .../icons/obj16/import_obj.svg | 75 +- .../icons/obj16/import_prj.svg | 336 +- .../org.eclipse.egit.ui/icons/obj16/merge.svg | 50 +- .../icons/obj16/mergetool.svg | 79 +- .../icons/obj16/new_branch_obj.svg | 53 +- .../icons/obj16/new_tag_obj.svg | 82 +- .../icons/obj16/no_assume_unchanged.svg | 98 +- .../org.eclipse.egit.ui/icons/obj16/note.svg | 62 +- .../icons/obj16/open-commit.svg | 142 +- .../org.eclipse.egit.ui/icons/obj16/pull.svg | 59 +- .../icons/obj16/pull_with_options.svg | 63 +- .../org.eclipse.egit.ui/icons/obj16/push.svg | 59 +- .../icons/obj16/rebase.svg | 129 +- .../icons/obj16/rebase_interactive.svg | 56 +- .../icons/obj16/refresh.svg | 83 +- .../icons/obj16/remote_entry_tbl.svg | 64 +- .../icons/obj16/repository_gerrit.svg | 70 +- .../icons/obj16/repository_rep.svg | 64 +- .../org.eclipse.egit.ui/icons/obj16/reset.svg | 68 +- .../icons/obj16/revert.svg | 84 +- .../icons/obj16/reword.svg | 276 +- .../icons/obj16/search-commit.svg | 102 +- .../icons/obj16/settings.svg | 58 +- .../icons/obj16/sign-commit.svg | 81 +- .../icons/obj16/signed-off.svg | 87 +- .../icons/obj16/squash-down.svg | 139 +- .../icons/obj16/squash-up.svg | 81 +- .../icons/obj16/stash-apply.svg | 239 +- .../icons/obj16/stash-create.svg | 239 +- .../org.eclipse.egit.ui/icons/obj16/stash.svg | 259 +- .../icons/obj16/state_sort_co.svg | 50 +- .../icons/obj16/submodules.svg | 99 +- .../icons/obj16/synchronize.svg | 65 +- .../org.eclipse.egit.ui/icons/obj16/tags.svg | 364 +- .../org.eclipse.egit.ui/icons/obj16/track.svg | 98 +- .../icons/obj16/uncheck_all.svg | 71 +- .../icons/obj16/unstage.svg | 69 +- .../icons/obj16/untrack.svg | 381 +- .../icons/obj16/untracked_file.svg | 176 +- .../icons/obj16/version_rep.svg | 79 +- .../icons/ovr/assume_unchanged.svg | 88 +- .../icons/ovr/checkedout_ov.svg | 62 +- .../icons/ovr/conflict.svg | 64 +- .../icons/ovr/delete_modify.svg | 68 +- icons/org.eclipse.egit.ui/icons/ovr/dirty.svg | 70 +- icons/org.eclipse.egit.ui/icons/ovr/error.svg | 76 +- .../icons/ovr/modify_delete.svg | 68 +- .../org.eclipse.egit.ui/icons/ovr/staged.svg | 71 +- .../icons/ovr/staged_added.svg | 58 +- .../icons/ovr/staged_removed.svg | 59 +- .../icons/ovr/staged_renamed.svg | 215 +- .../icons/ovr/symlink_ovr.svg | 49 +- .../icons/ovr/untracked.svg | 51 +- .../icons/wizban/commit_wizban.svg | 228 +- .../icons/wizban/createpatch_wizban.svg | 283 +- .../icons/wizban/fetch_gerrit_wizban.svg | 157 +- .../icons/wizban/fetch_wizban.svg | 171 +- .../icons/wizban/import_wiz.svg | 506 +- .../icons/wizban/newconnect_wizban.svg | 176 +- .../icons/wizban/pull_wizban.svg | 238 +- .../icons/wizban/push_gerrit_wizban.svg | 167 +- .../icons/wizban/push_wizban.svg | 171 +- .../icons/wizban/synchronize_wizban.svg | 192 +- .../help/images/topiclabel/egit.svg | 85 +- .../images/topiclabel/egit.svg | 85 +- .../icons/obj16/gitflow.svg | 116 +- .../icons/ovr/git-flow.svg | 50 +- org.eclipse.egit.ui/icons/egit.svg | 70 +- org.eclipse.egit.ui/icons/elcl16/add.svg | 53 +- org.eclipse.egit.ui/icons/elcl16/add_all.svg | 74 +- org.eclipse.egit.ui/icons/elcl16/author.svg | 99 +- org.eclipse.egit.ui/icons/elcl16/clear_co.svg | 199 +- .../icons/elcl16/collapseall.svg | 103 +- org.eclipse.egit.ui/icons/elcl16/comment.svg | 85 +- org.eclipse.egit.ui/icons/elcl16/commit.svg | 74 +- .../icons/elcl16/committer.svg | 79 +- .../icons/elcl16/compactLayout.svg | 173 +- .../icons/elcl16/compare_view.svg | 75 +- org.eclipse.egit.ui/icons/elcl16/continue.svg | 125 +- org.eclipse.egit.ui/icons/elcl16/delete.svg | 52 +- .../icons/elcl16/expandall.svg | 118 +- .../icons/elcl16/filter_folder_funnel.svg | 142 +- .../icons/elcl16/filter_none_funnel.svg | 125 +- .../icons/elcl16/filter_project_funnel.svg | 138 +- .../icons/elcl16/filter_ps_funnel.svg | 125 +- .../icons/elcl16/filter_resource_funnel.svg | 166 +- org.eclipse.egit.ui/icons/elcl16/find.svg | 543 +- .../icons/elcl16/flatLayout.svg | 111 +- .../icons/elcl16/goto_input.svg | 104 +- .../icons/elcl16/hide_untracked.svg | 60 +- .../icons/elcl16/hierarchicalLayout.svg | 120 +- .../icons/elcl16/horizontal_view.svg | 228 +- org.eclipse.egit.ui/icons/elcl16/next_nav.svg | 49 +- org.eclipse.egit.ui/icons/elcl16/prev_nav.svg | 49 +- org.eclipse.egit.ui/icons/elcl16/preview.svg | 78 +- .../icons/elcl16/progress_stop.svg | 4453 +---------------- org.eclipse.egit.ui/icons/elcl16/refresh.svg | 83 +- org.eclipse.egit.ui/icons/elcl16/sha1.svg | 102 +- org.eclipse.egit.ui/icons/elcl16/skip.svg | 63 +- org.eclipse.egit.ui/icons/elcl16/start.svg | 70 +- org.eclipse.egit.ui/icons/elcl16/synced.svg | 74 +- .../icons/elcl16/trash_flat.svg | 84 +- .../icons/elcl16/unstage_all.svg | 71 +- .../icons/etool16/annotate.svg | 392 +- .../icons/etool16/createRepository.svg | 72 +- .../icons/etool16/merge_ignore_left.svg | 78 +- .../icons/etool16/merge_ignore_right.svg | 78 +- .../icons/etool16/newconnect_wiz.svg | 382 +- .../icons/etool16/newgroup_wiz.svg | 213 +- .../icons/etool16/newlocation_wiz.svg | 314 +- .../icons/eview16/rebase_interactive.svg | 56 +- org.eclipse.egit.ui/icons/eview16/reflog.svg | 60 +- .../icons/eview16/repo_rep.svg | 115 +- org.eclipse.egit.ui/icons/eview16/staging.svg | 77 +- org.eclipse.egit.ui/icons/obj16/add.svg | 53 +- .../icons/obj16/alphab_sort_co.svg | 90 +- .../icons/obj16/annotated-tag.svg | 94 +- .../icons/obj16/assume_unchanged.svg | 53 +- .../icons/obj16/branch_obj.svg | 50 +- .../icons/obj16/branches_obj.svg | 75 +- .../icons/obj16/changelog_obj.svg | 230 +- org.eclipse.egit.ui/icons/obj16/check_all.svg | 72 +- org.eclipse.egit.ui/icons/obj16/checkout.svg | 72 +- .../icons/obj16/cherry-pick.svg | 45 - org.eclipse.egit.ui/icons/obj16/clean_obj.svg | 107 +- org.eclipse.egit.ui/icons/obj16/clear.svg | 69 +- org.eclipse.egit.ui/icons/obj16/cloneGit.svg | 114 +- org.eclipse.egit.ui/icons/obj16/commit.svg | 108 +- .../icons/obj16/commit_amend.svg | 89 +- .../icons/obj16/current_step.svg | 51 +- .../icons/obj16/delete_obj.svg | 52 +- .../icons/obj16/disconnect_co.svg | 71 +- org.eclipse.egit.ui/icons/obj16/done_step.svg | 66 +- .../icons/obj16/editconfig.svg | 130 +- org.eclipse.egit.ui/icons/obj16/fetch.svg | 68 +- .../icons/obj16/first_parent_only.svg | 76 +- .../icons/obj16/fixup-down.svg | 56 +- org.eclipse.egit.ui/icons/obj16/fixup-up.svg | 56 +- .../icons/obj16/gerrit_fetch.svg | 65 +- .../icons/obj16/gerrit_obj.svg | 70 +- .../icons/obj16/gerrit_push.svg | 65 +- .../icons/obj16/gitrepository.svg | 75 +- org.eclipse.egit.ui/icons/obj16/history.svg | 258 +- org.eclipse.egit.ui/icons/obj16/ignore.svg | 132 +- .../icons/obj16/import_obj.svg | 75 +- .../icons/obj16/import_prj.svg | 336 +- org.eclipse.egit.ui/icons/obj16/merge.svg | 50 +- org.eclipse.egit.ui/icons/obj16/mergetool.svg | 79 +- .../icons/obj16/new_branch_obj.svg | 53 +- .../icons/obj16/new_tag_obj.svg | 82 +- .../icons/obj16/no_assume_unchanged.svg | 98 +- org.eclipse.egit.ui/icons/obj16/note.svg | 62 +- .../icons/obj16/open-commit.svg | 142 +- org.eclipse.egit.ui/icons/obj16/pull.svg | 59 +- .../icons/obj16/pull_with_options.svg | 63 +- org.eclipse.egit.ui/icons/obj16/push.svg | 59 +- org.eclipse.egit.ui/icons/obj16/rebase.svg | 129 +- .../icons/obj16/rebase_interactive.svg | 56 +- org.eclipse.egit.ui/icons/obj16/refresh.svg | 83 +- .../icons/obj16/remote_entry_tbl.svg | 64 +- .../icons/obj16/repository_gerrit.svg | 70 +- .../icons/obj16/repository_rep.svg | 64 +- org.eclipse.egit.ui/icons/obj16/reset.svg | 68 +- org.eclipse.egit.ui/icons/obj16/revert.svg | 84 +- org.eclipse.egit.ui/icons/obj16/reword.svg | 276 +- .../icons/obj16/search-commit.svg | 102 +- org.eclipse.egit.ui/icons/obj16/settings.svg | 58 +- .../icons/obj16/sign-commit.svg | 81 +- .../icons/obj16/signed-off.svg | 87 +- .../icons/obj16/squash-down.svg | 139 +- org.eclipse.egit.ui/icons/obj16/squash-up.svg | 81 +- .../icons/obj16/stash-apply.svg | 239 +- .../icons/obj16/stash-create.svg | 239 +- org.eclipse.egit.ui/icons/obj16/stash.svg | 259 +- .../icons/obj16/state_sort_co.svg | 50 +- .../icons/obj16/submodules.svg | 99 +- .../icons/obj16/synchronize.svg | 65 +- org.eclipse.egit.ui/icons/obj16/tags.svg | 364 +- org.eclipse.egit.ui/icons/obj16/track.svg | 98 +- .../icons/obj16/uncheck_all.svg | 71 +- org.eclipse.egit.ui/icons/obj16/unstage.svg | 69 +- org.eclipse.egit.ui/icons/obj16/untrack.svg | 381 +- .../icons/obj16/untracked_file.svg | 176 +- .../icons/obj16/version_rep.svg | 79 +- .../icons/ovr/assume_unchanged.svg | 88 +- .../icons/ovr/checkedout_ov.svg | 62 +- org.eclipse.egit.ui/icons/ovr/conflict.svg | 64 +- .../icons/ovr/delete_modify.svg | 68 +- org.eclipse.egit.ui/icons/ovr/dirty.svg | 70 +- org.eclipse.egit.ui/icons/ovr/error.svg | 76 +- .../icons/ovr/modify_delete.svg | 68 +- org.eclipse.egit.ui/icons/ovr/staged.svg | 71 +- .../icons/ovr/staged_added.svg | 58 +- .../icons/ovr/staged_removed.svg | 59 +- .../icons/ovr/staged_renamed.svg | 215 +- org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg | 49 +- org.eclipse.egit.ui/icons/ovr/untracked.svg | 51 +- .../icons/wizban/commit_wizban.svg | 228 +- .../icons/wizban/createpatch_wizban.svg | 283 +- .../icons/wizban/fetch_gerrit_wizban.svg | 157 +- .../icons/wizban/fetch_wizban.svg | 171 +- .../icons/wizban/import_wiz.svg | 506 +- .../icons/wizban/newconnect_wizban.svg | 176 +- .../icons/wizban/pull_wizban.svg | 238 +- .../icons/wizban/push_gerrit_wizban.svg | 167 +- .../icons/wizban/push_wizban.svg | 171 +- .../icons/wizban/synchronize_wizban.svg | 192 +- org.eclipse.egit/egit.svg | 73 +- 301 files changed, 4020 insertions(+), 40100 deletions(-) diff --git a/icons/components/arrow_green.svg b/icons/components/arrow_green.svg index 88f6f12571..42dba9e742 100644 --- a/icons/components/arrow_green.svg +++ b/icons/components/arrow_green.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - @@ -128,16 +48,12 @@ + id="path3873" /> diff --git a/icons/components/arrow_green_angled.svg b/icons/components/arrow_green_angled.svg index 47ee846ba8..ed985862b7 100644 --- a/icons/components/arrow_green_angled.svg +++ b/icons/components/arrow_green_angled.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -81,16 +48,12 @@ + id="path3873" /> diff --git a/icons/components/arrow_red angled.svg b/icons/components/arrow_red angled.svg index 8480f3a0fc..62734dd7a2 100644 --- a/icons/components/arrow_red angled.svg +++ b/icons/components/arrow_red angled.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -81,16 +48,12 @@ + id="path3873" /> diff --git a/icons/components/arrow_red.svg b/icons/components/arrow_red.svg index 9dd90db749..e3de5a830d 100644 --- a/icons/components/arrow_red.svg +++ b/icons/components/arrow_red.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -81,16 +48,12 @@ + id="path3873" /> diff --git a/icons/components/checkmark.svg b/icons/components/checkmark.svg index 11c66d78b3..a40bd37bc2 100644 --- a/icons/components/checkmark.svg +++ b/icons/components/checkmark.svg @@ -2,27 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4"> + id="linearGradient4994-4-6"> + id="linearGradient4994-4-1"> - - - @@ -253,13 +203,11 @@ image/svg+xml - + @@ -267,19 +215,14 @@ id="g4084" transform="translate(-26,-20.000055)"> @@ -295,19 +238,14 @@ id="g3892" transform="matrix(0.45459079,0,0,0.45457615,-5.0464066,568.84683)"> @@ -322,8 +260,7 @@ + id="path4065" /> + id="rect3997-9-1-1-7" /> + id="rect4853-82-7-0" /> + id="rect4853-82-0-3" /> diff --git a/icons/components/cloud.svg b/icons/components/cloud.svg index 4d729e774d..8ab3901947 100644 --- a/icons/components/cloud.svg +++ b/icons/components/cloud.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -106,15 +73,12 @@ + id="path4126" /> diff --git a/icons/components/delta.svg b/icons/components/delta.svg index 8b02814e46..d1a9056cf3 100644 --- a/icons/components/delta.svg +++ b/icons/components/delta.svg @@ -2,48 +2,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -52,31 +21,25 @@ image/svg+xml - + diff --git a/icons/components/gerrit.svg b/icons/components/gerrit.svg index e61287a665..8ac1ecfb5b 100644 --- a/icons/components/gerrit.svg +++ b/icons/components/gerrit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -51,7 +45,6 @@ id="stop3813-3" /> - - - @@ -108,13 +73,11 @@ image/svg+xml - + @@ -140,13 +103,8 @@ + style="fill:url(#radialGradient4090);fill-opacity:1;stroke:none;display:inline" /> @@ -206,13 +164,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - + id="path4919" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -490,8 +76,6 @@ @@ -509,18 +93,15 @@ + id="path3048" /> + id="path3050" /> + id="path3052" /> + id="path3048-7" /> + id="path3050-9" /> + id="path3052-3" /> diff --git a/icons/components/new_plus.svg b/icons/components/new_plus.svg index 4d6d042a5b..708ff2dc94 100644 --- a/icons/components/new_plus.svg +++ b/icons/components/new_plus.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - @@ -90,8 +48,6 @@ @@ -99,8 +55,6 @@ id="g3969" transform="translate(37,-16)"> diff --git a/icons/components/person.svg b/icons/components/person.svg index 1eb9550c66..dfee78380b 100644 --- a/icons/components/person.svg +++ b/icons/components/person.svg @@ -1,22 +1,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -32,8 +26,7 @@ + id="linearGradient4181"> + id="linearGradient4238"> + xlink:href="#linearGradient4887-7-5" /> + xlink:href="#linearGradient4893-4-1" /> + id="linearGradient4893-4-1"> + id="linearGradient4877-7"> + id="linearGradient4901-2"> - - - - - + xlink:href="#linearGradient4238" /> - - - diff --git a/icons/components/person_blue.svg b/icons/components/person_blue.svg index 85441a3a3c..3137e263a5 100644 --- a/icons/components/person_blue.svg +++ b/icons/components/person_blue.svg @@ -1,22 +1,16 @@ + version="1.1" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -32,7 +26,6 @@ + xlink:href="#linearGradient4877-7" /> - - - - - + id="linearGradient4887-7-5-3"> - - - + id="path4207" /> + id="rect4875-2-1-8" /> diff --git a/icons/components/repo.svg b/icons/components/repo.svg index 8661ca9eb5..c03b85c53a 100644 --- a/icons/components/repo.svg +++ b/icons/components/repo.svg @@ -2,79 +2,18 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - + id="linearGradient4721-1"> - - - - @@ -214,8 +88,6 @@ @@ -224,15 +96,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/icons/components/tag.svg b/icons/components/tag.svg index 3df8131d7b..8d2006bc81 100644 --- a/icons/components/tag.svg +++ b/icons/components/tag.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> - + id="path4919" /> - - - - - - - - - - - - - - + id="linearGradient3967-0"> - - - - - - - - - - - @@ -445,8 +172,6 @@ @@ -486,14 +211,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> diff --git a/icons/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg b/icons/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg index 7117b77a84..4803ade517 100644 --- a/icons/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg +++ b/icons/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg @@ -2,114 +2,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - + id="defs4" /> @@ -118,20 +21,17 @@ image/svg+xml - + + id="path3123" /> diff --git a/icons/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg b/icons/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg index 572ceb92ff..5b530b17be 100644 --- a/icons/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg +++ b/icons/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg @@ -2,50 +2,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -54,20 +21,17 @@ image/svg+xml - + + id="path3123" /> diff --git a/icons/org.eclipse.egit.ui/icons/egit.svg b/icons/org.eclipse.egit.ui/icons/egit.svg index 8109972aad..b27c03b66a 100644 --- a/icons/org.eclipse.egit.ui/icons/egit.svg +++ b/icons/org.eclipse.egit.ui/icons/egit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -88,24 +54,17 @@ image/svg+xml - + + style="fill:#2c2255;fill-opacity:1;stroke:none" /> + style="fill:url(#linearGradient4028);fill-opacity:1;stroke:none" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/add.svg b/icons/org.eclipse.egit.ui/icons/elcl16/add.svg index a3c88ae0df..553ad064a0 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/add.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/add.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -99,16 +70,12 @@ + id="path5581" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/add_all.svg b/icons/org.eclipse.egit.ui/icons/elcl16/add_all.svg index 90b3c3f9b9..e73d0eecda 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/add_all.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/add_all.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -133,25 +81,19 @@ image/svg+xml - + + id="path3770" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/author.svg b/icons/org.eclipse.egit.ui/icons/elcl16/author.svg index ee21508f45..d0b51de953 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/author.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/author.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> + xlink:href="#linearGradient4877-7" /> - - - @@ -345,28 +288,21 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path4207" /> + id="rect4875-2-1-8" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/clear_co.svg b/icons/org.eclipse.egit.ui/icons/elcl16/clear_co.svg index e099328ed0..2203195169 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/clear_co.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/clear_co.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147"> + id="linearGradient5141"> + id="linearGradient5135"> + id="linearGradient4877"> + id="linearGradient4852-7-8"> + xlink:href="#linearGradient4852-7-8" /> + xlink:href="#linearGradient4844-4-1" /> + id="path6206" /> + x="-0.39259929" + width="1.7850301" + y="-0.39254203" + height="1.7850802"> - - - - - - - - - - - - - - - - - - - - - - - @@ -384,28 +248,21 @@ + id="rect4001-3" /> + id="path4884" /> + id="rect4001" /> + id="rect4043" /> + id="rect3911" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/collapseall.svg b/icons/org.eclipse.egit.ui/icons/elcl16/collapseall.svg index 291b259680..d5647e2b58 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/collapseall.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/collapseall.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - + + xlink:href="#blue_gradient_left" /> - - + id="blue_gradient_top"> - + xlink:href="#minus_shadow_gradient" /> - - - - @@ -151,67 +112,45 @@ + id="front_background-5" /> + id="back_rect" /> + id="back_left_shadow" /> + id="back_top_shadow" /> + id="front_rect" /> + id="front_background" /> + id="minus_sign_shadow" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#blue_gradient_left" /> + id="blue_gradient_top"> - - - @@ -96,63 +63,45 @@ image/svg+xml - + + id="front_rect" /> + id="front_background" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + id="path10612" /> + id="path11386" /> + id="path11386-3" /> + id="path11386-0" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/commit.svg b/icons/org.eclipse.egit.ui/icons/elcl16/commit.svg index 8b98322d03..c766c50c40 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/commit.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/commit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#blue_gradient_left" /> + id="blue_gradient_top"> - - - @@ -143,46 +108,33 @@ image/svg+xml - + + id="front_background" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + id="path3063" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/committer.svg b/icons/org.eclipse.egit.ui/icons/elcl16/committer.svg index ca096cef64..0e486a5e28 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/committer.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/committer.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + xlink:href="#linearGradient4721-1" /> + xlink:href="#linearGradient4877-7" /> - - - @@ -232,8 +188,6 @@ @@ -244,15 +198,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> @@ -282,8 +227,6 @@ rx="1.5" ry="1.4999999" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg b/icons/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg index b7dcc77375..cbfc19817e 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - + xlink:href="#linearGradient11290" /> + xlink:href="#linearGradient11290" /> + id="linearGradient3967-5"> + id="linearGradient3973-6"> - + xlink:href="#linearGradient3955-1" /> - - - @@ -305,20 +188,17 @@ image/svg+xml - + + id="layer1-2"> + id="rect13693-39" /> + id="path13797-3" /> @@ -407,14 +275,11 @@ fFsQD9RW9BVzqfUb15L9P37RxEJK6gr8JT4B/yLqHka74fYAAAAASUVORK5CYII= + id="rect13693" /> + id="path13797" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/compare_view.svg b/icons/org.eclipse.egit.ui/icons/elcl16/compare_view.svg index 4233c8963d..c10d134895 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/compare_view.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/compare_view.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -199,33 +154,23 @@ image/svg+xml - + + d="m 1,1043.3872 0,-1.0072 3.0258837,0 0,1.0072 z m 1.0562135,-3.0084 0,-1.0072 5.9633832,0 0,1.0072 z m 3.9468134,-2.0166 1.0072572,0 0,3.0259 -1.0072572,0 z m -3.999973,1.0312 1.0072023,0 0,4.938 -1.0072023,0 z" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + x="-0.42731049" + width="1.854621" + y="-0.15071173" + height="1.3014235"> + x="-0.42731049" + width="1.854621" + y="-0.15071173" + height="1.3014235"> - - - @@ -373,20 +285,17 @@ image/svg+xml - + + id="path8117" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/delete.svg b/icons/org.eclipse.egit.ui/icons/elcl16/delete.svg index 6f325d2108..7640f72568 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/delete.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/delete.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -102,17 +70,13 @@ + id="x"> x diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/expandall.svg b/icons/org.eclipse.egit.ui/icons/elcl16/expandall.svg index cbf10848a6..bb7d780e8e 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/expandall.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/expandall.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4-7"> + xlink:href="#linearGradient4910-4-4" /> + xlink:href="#linearGradient4910-4-4-2" /> + id="linearGradient4994-4-7-4"> + xlink:href="#linearGradient4989" /> + xlink:href="#linearGradient4989-1" /> - - - @@ -244,75 +198,49 @@ + id="rect3997-9-1" /> + id="rect3997-9-1-1" /> + id="rect4853-82-7" /> + id="rect4853-82-0" /> + id="rect3997-9-1-2" /> + id="rect3997-9-1-1-2" /> + id="rect4853-82-0-6-8" /> + id="rect4853-82-7-1" /> + id="rect4853-82-0-6" /> + id="rect4853-82-0-6-8-41" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient3967"> + id="linearGradient3973"> + id="linearGradient4807-2-8"> - - - @@ -470,29 +398,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> @@ -594,13 +491,10 @@ id="rect13693-3" style="display:inline;fill:#fdf7eb;fill-opacity:0.90588236;stroke:url(#linearGradient3251);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg b/icons/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg index f87bcafe33..d2c1b2ef4d 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> - - - @@ -334,34 +272,26 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg b/icons/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg index 1a3adb3916..ad77b57abb 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient3973"> + id="linearGradient3967"> - - - @@ -448,29 +378,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> @@ -572,13 +471,10 @@ id="rect13693-3" style="display:inline;fill:#fdf7eb;fill-opacity:0.90532547;stroke:url(#linearGradient3110);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg b/icons/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg index 7e990f4ffa..d2c1b2ef4d 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> - - - @@ -334,34 +272,26 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg b/icons/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg index b12b30e85d..dfa8b9f27b 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4877-6"> + id="linearGradient5147-4"> - - - @@ -459,29 +386,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> + id="rect3997-9-1" /> + id="rect3997-9-1-1" /> + id="rect4853-82-7-6" /> + id="rect4853-82-0-1" /> + id="rect3997-9-1-2" /> + id="rect3997-9-1-1-2" /> + id="rect4853-82-0-6-8" /> + id="rect4853-82-7-1" /> + id="rect4853-82-0-6" /> + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> image/svg+xml \ No newline at end of file + id="path2" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg b/icons/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg index 8d169aea0f..266db5f020 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4980"> + id="linearGradient4974"> - - - @@ -213,32 +170,24 @@ + id="rect4035-1-1-5-2-2-6-5" /> + id="rect4035-1-1-5-2-2-6-5-2" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -252,15 +201,11 @@ + id="rect4035-1-7-1" /> + id="rect4035-1-7-4-5" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -286,15 +229,11 @@ + id="rect4035-1-7-1-5" /> + id="rect4035-1-7-4-5-1" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -320,22 +257,16 @@ + id="rect4035-1-7-1-5-2" /> + id="rect4035-1-7-4-5-1-3" /> + id="rect4035-1-1-5-2-2-6" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg b/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg index 3d44978b3e..fbfdcd0da0 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg @@ -1,24 +1,20 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient16147" /> - - - @@ -170,88 +133,61 @@ + id="rect3997-9" /> + id="rect4816-1-1-4" /> + id="rect4816-1-1-4-8" /> + id="rect4816-1-1-4-8-5" /> + id="rect4816-1-1-4-8-5-5" /> + id="rect4816-1-1-4-8-5-5-4" /> + id="rect4816-1-1-4-8-5-5-4-1" /> + id="rect4816-1-1-4-8-5-5-4-1-6" /> + id="rect4816-1-1-4-8-2" /> + id="rect4816-1-1-4-8-5-3" /> + id="path4108-1-2" /> + id="path4108-1-6-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg b/icons/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg index abf0becaf1..b912a8209e 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -123,8 +88,6 @@ @@ -132,36 +95,27 @@ id="g4180" transform="translate(-1,0)"> + id="path3109" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg b/icons/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg index ec2eebd631..353ac83d81 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4980"> + id="linearGradient4974"> - - - @@ -211,32 +168,24 @@ + id="rect4035-1-1-5-2-2-6-5" /> + id="rect4035-1-1-5-2-2-6-5-2" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -250,15 +199,11 @@ + id="rect4035-1-7-1" /> + id="rect4035-1-7-4-5" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -284,15 +227,11 @@ + id="rect4035-1-7-1-5" /> + id="rect4035-1-7-4-5-1" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -318,37 +255,28 @@ + id="rect4035-1-7-1-5-2" /> + id="rect4035-1-7-4-5-1-3" /> + id="rect4035-1-1-5-2" /> + id="rect4035-1-1-5-2-2" /> + id="rect4035-1-1-5-2-2-1" /> + id="rect4035-1-1-5-2-2-6" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg b/icons/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg index 45d267e087..3d3b2fc057 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg @@ -2,25 +2,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4810"> + id="linearGradient5067"> + xlink:href="#linearGradient4962-2" /> + xlink:href="#linearGradient4910-4" /> + id="linearGradient4994-4"> + xlink:href="#linearGradient4810" /> + xlink:href="#linearGradient4962-2-2" /> + xlink:href="#linearGradient5057-7" /> + xlink:href="#linearGradient5057-4" /> + xlink:href="#linearGradient4962-2-2-7" /> + xlink:href="#linearGradient5057-7-4" /> + id="linearGradient4994-4-4"> + xlink:href="#linearGradient4910-4-7" /> + xlink:href="#linearGradient4962-2-7" /> + id="linearGradient4810-7"> + xlink:href="#linearGradient4810-7" /> + xlink:href="#linearGradient4828-8" /> + xlink:href="#linearGradient4818" /> + id="linearGradient4994-4-3"> + xlink:href="#linearGradient4910-4-8" /> + id="linearGradient4810-77"> + xlink:href="#linearGradient4810-77" /> - - - @@ -566,8 +491,6 @@ @@ -588,113 +511,68 @@ + id="rect4816-1-1-4" /> + id="rect4816-1-1-4-2" /> + id="rect4853-82-7" /> + id="rect4853-82-0" /> + id="rect4816-1-1-4-1" /> + id="rect4816-1-1-4-27" /> + id="rect4853-82-7-5" /> + id="rect4853-82-0-4" /> + id="rect4816-1-1-4-1-3" /> + id="rect4816-1-1-4-4" /> + id="rect4853-82-7-9" /> + id="rect4853-82-0-8" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/next_nav.svg b/icons/org.eclipse.egit.ui/icons/elcl16/next_nav.svg index 80b0a7929a..0f2d7e3c3b 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/next_nav.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/next_nav.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -100,15 +70,12 @@ + id="rect3968" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg b/icons/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg index e76c2fc983..bbad426201 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -100,15 +70,12 @@ + id="rect3968" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/preview.svg b/icons/org.eclipse.egit.ui/icons/elcl16/preview.svg index 128d5fb8fa..8363b08276 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/preview.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/preview.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147"> + id="linearGradient4877"> - - - @@ -231,23 +186,17 @@ + id="rect4001-3" /> + id="rect4001" /> + id="path4271" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg b/icons/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg index d74866efc3..bf2b3edb72 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(0.397748,0.19882835)" + xlink:href="#linearGradient4729" + id="linearGradient4735" + x1="7.5007138" + y1="1040.3939" + x2="7.5007138" + y2="1048.3102" + gradientUnits="userSpaceOnUse" /> + id="linearGradient4729"> + id="stop4731" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="stop-color:#f07878;stop-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient4760" /> - - - @@ -4537,8 +130,6 @@ diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/refresh.svg b/icons/org.eclipse.egit.ui/icons/elcl16/refresh.svg index 8f95efcf9a..a433c11aa7 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/refresh.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/refresh.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,53 +105,35 @@ image/svg+xml - + + id="path7582" /> + id="path7602" /> + id="path7582-7" /> + id="path7602-2" /> + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - + id="defs4" /> @@ -96,45 +21,38 @@ image/svg+xml - + + id="tspan3003" + style="font-size:6px;line-height:1.25;font-family:sans-serif">  diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/skip.svg b/icons/org.eclipse.egit.ui/icons/elcl16/skip.svg index 016bf8f889..b0a269a020 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/skip.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/skip.svg @@ -1,26 +1,23 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5275"> - - - @@ -144,27 +111,21 @@ + id="rect6259" /> + id="rect3968" /> + id="rect3968-7" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/start.svg b/icons/org.eclipse.egit.ui/icons/elcl16/start.svg index 33348d9aa9..ca0a10b324 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/start.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/start.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient8190-8" /> + x="-0.36955386" + width="1.7391077" + y="-0.13034106" + height="1.2606821"> - - - @@ -226,15 +187,12 @@ + id="path8117" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5103-4" /> - - - @@ -149,34 +109,24 @@ + id="path4108-1" /> + id="path4108-1-6" /> + id="path4108-1-2" /> + id="path4108-1-6-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg b/icons/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg index b44f6f0a99..f9588e69ca 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg @@ -1,22 +1,19 @@ + + style="fill:#000000" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -25,14 +22,13 @@ image/svg+xml - + - - - + style="display:inline"> + d="m 30.026253,2.9209222 c 0,0 0,5.7561004 0,9.5900998 0,1.189 1.635185,1.9888 2.96101,1.9888 1.757376,4e-4 2.13047,0 3.093592,0 1.325826,0 2.96101,-0.7998 2.96101,-1.9887 0,-3.8339994 0,-9.5901998 0,-9.5901998" /> + style="fill:none;stroke:url(#linearGradient6198);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:url(#linearGradient6200);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="rect6322" /> + id="path5058" /> + id="path5058-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg b/icons/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg index 6ca8a1679d..f9e082eb4e 100644 --- a/icons/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg +++ b/icons/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -136,13 +81,11 @@ image/svg+xml - + diff --git a/icons/org.eclipse.egit.ui/icons/etool16/annotate.svg b/icons/org.eclipse.egit.ui/icons/etool16/annotate.svg index 379057016a..debfa4e64c 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/annotate.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/annotate.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -437,49 +83,37 @@ image/svg+xml - + + id="path3887" /> + id="path3876" /> + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path3874" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/createRepository.svg b/icons/org.eclipse.egit.ui/icons/etool16/createRepository.svg index 40228a1189..d24f42d80a 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/createRepository.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/createRepository.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -160,13 +124,11 @@ image/svg+xml - + @@ -176,15 +138,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + transform="translate(0,1036.3622)" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg b/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg index 341efe91cc..a1996f7bfe 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg @@ -4,25 +4,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4452"> + id="linearGradient4380"> + id="linearGradient4374"> + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -245,8 +197,6 @@ @@ -282,8 +232,6 @@ x="636.35394" y="301.04733" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg b/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg index 1e28b1e7c5..c0e642b709 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg @@ -4,25 +4,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4452"> + id="linearGradient4380"> + id="linearGradient4374"> + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -245,8 +197,6 @@ @@ -282,8 +232,6 @@ x="636.35394" y="301.04733" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg b/icons/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg index 9bf51b611b..d04d3302b1 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + id="path4919" /> @@ -92,16 +75,6 @@ offset="1" id="stop10754-8-48" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -574,13 +228,11 @@ image/svg+xml - + @@ -602,7 +254,6 @@ id="rect10007-0-74-2-7-6" style="fill:url(#linearGradient3194);fill-opacity:1;stroke:none;display:inline" /> @@ -628,22 +279,17 @@ id="rect3123" style="fill:url(#linearGradient3196);fill-opacity:1;stroke:url(#linearGradient3198);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> + id="path3136" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg b/icons/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg index 7787ab3601..2b83608b78 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967-5"> + id="linearGradient3973-6"> + xlink:href="#linearGradient5068-6" /> + id="linearGradient5068-6"> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> - - - - - - - - - - + xlink:href="#linearGradient5068-6" /> - - - - - - - - - - + xlink:href="#linearGradient5068-6" /> - - - @@ -380,8 +246,6 @@ + id="rect13693" /> + id="path13797" /> + id="path5581-1-1" /> + id="path5581-1-1-8" /> + id="path5581-1-1-7" /> + id="path5581-1-1-6" /> + id="path5581-1-1-1" /> + id="path5581-1-1-89" /> + id="path5581-1-1-2" /> + id="path5581-1-1-79" /> diff --git a/icons/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg b/icons/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg index 9e8f6d4dcd..cc9940aa6b 100644 --- a/icons/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg +++ b/icons/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg @@ -2,55 +2,18 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - + id="linearGradient4721-1"> - - - - + id="linearGradient3967"> - + id="linearGradient3973"> - - + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> - - - - - - - - - - - - - - - @@ -484,13 +215,11 @@ image/svg+xml - + @@ -509,14 +238,11 @@ + id="rect13693" /> + id="path13797" /> + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg b/icons/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg index b17f3d3788..2ec7bb4a7f 100644 --- a/icons/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg +++ b/icons/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -97,13 +63,11 @@ image/svg+xml - + @@ -111,20 +75,14 @@ id="g3116" transform="translate(-2,-2.5082885e-5)"> diff --git a/icons/org.eclipse.egit.ui/icons/eview16/reflog.svg b/icons/org.eclipse.egit.ui/icons/eview16/reflog.svg index 5ca4994f8f..125dd7da0f 100644 --- a/icons/org.eclipse.egit.ui/icons/eview16/reflog.svg +++ b/icons/org.eclipse.egit.ui/icons/eview16/reflog.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -118,32 +83,25 @@ image/svg+xml - + @@ -153,18 +111,14 @@ style="display:inline" id="g4174"> diff --git a/icons/org.eclipse.egit.ui/icons/eview16/repo_rep.svg b/icons/org.eclipse.egit.ui/icons/eview16/repo_rep.svg index dba9ad2228..35484ef58d 100644 --- a/icons/org.eclipse.egit.ui/icons/eview16/repo_rep.svg +++ b/icons/org.eclipse.egit.ui/icons/eview16/repo_rep.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + id="linearGradient4721-1-2"> + xlink:href="#linearGradient4721-1-2" /> + id="linearGradient4721-1-2-6"> + xlink:href="#linearGradient4721-1-2-6" /> - - - @@ -285,13 +243,11 @@ image/svg+xml - + @@ -301,15 +257,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3868-1-1" /> + id="path3868-1-4-7" /> + id="path3868-1-1-4" /> + id="path3868-1-4-7-1" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> diff --git a/icons/org.eclipse.egit.ui/icons/eview16/staging.svg b/icons/org.eclipse.egit.ui/icons/eview16/staging.svg index f511d0382c..6bdc00dc55 100644 --- a/icons/org.eclipse.egit.ui/icons/eview16/staging.svg +++ b/icons/org.eclipse.egit.ui/icons/eview16/staging.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -117,26 +63,21 @@ image/svg+xml - + + id="path3873" /> + id="path3089" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/add.svg b/icons/org.eclipse.egit.ui/icons/obj16/add.svg index a3c88ae0df..553ad064a0 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/add.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/add.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -99,16 +70,12 @@ + id="path5581" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg b/icons/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg index 11ff90bcd6..97e89580d1 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg @@ -1,35 +1,21 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - + xlink:href="#linearGradient4789-1" /> - - - @@ -150,28 +90,20 @@ + id="path4771" /> + id="path3986" /> + id="path4758" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg b/icons/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg index 508c11163e..824c9a8041 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> + width="1.5794848" + height="1.2146358" + x="-0.23393579" + y="-0.086642911"> - - - @@ -302,13 +255,11 @@ image/svg+xml - + @@ -348,14 +299,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> @@ -455,32 +402,21 @@ style="display:inline;filter:url(#filter4096)" id="g4004-6"> + style="fill:url(#linearGradient4000-5);fill-opacity:1;stroke:#ebb312;stroke-width:1.74999988;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg b/icons/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg index 6580c94743..b52525c180 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,13 +43,11 @@ image/svg+xml - + @@ -96,8 +61,6 @@ + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/branch_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/branch_obj.svg index b4d4032031..6189f6045f 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/branch_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/branch_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -88,9 +56,7 @@ + id="path3091" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/branches_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/branches_obj.svg index b71b88eda0..f35be7597a 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/branches_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/branches_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -124,13 +71,11 @@ image/svg+xml - + @@ -139,12 +84,8 @@ + id="path3091" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - + id="linearGradient4877-6"> - - + id="linearGradient5147-4"> - + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - - @@ -374,33 +183,26 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/check_all.svg b/icons/org.eclipse.egit.ui/icons/obj16/check_all.svg index 12193964d1..dfeff0f382 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/check_all.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/check_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4"> + id="linearGradient4994-4-1"> - - - @@ -189,8 +148,6 @@ @@ -198,19 +155,14 @@ id="g4084" transform="translate(-26,-20.000055)"> @@ -226,19 +178,14 @@ id="g3892" transform="matrix(0.45459079,0,0,0.45457615,-5.0464066,568.84683)"> @@ -253,7 +200,6 @@ + id="path4065" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/checkout.svg b/icons/org.eclipse.egit.ui/icons/obj16/checkout.svg index 5ae02d478f..a8433fea00 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/checkout.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/checkout.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + xlink:href="#linearGradient4721-1" /> - - - @@ -139,13 +103,11 @@ image/svg+xml - + @@ -156,15 +118,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg b/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg index 05286eee0b..0caf0f1568 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg @@ -6,10 +6,6 @@ height="16" id="svg2" version="1.1" - inkscape:version="1.4.3 (0d15f750, 2025-12-25)" - sodipodi:docname="cherrypick.svg" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" @@ -30,7 +26,6 @@ id="stop3813" /> - - - @@ -96,8 +57,6 @@ @@ -120,14 +79,10 @@ d="m 10.961911,1049.9718 -1.9049442,-3.2301 0.02692,-0.016 v 0" id="path1-3-3-7-4-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/clean_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/clean_obj.svg index c3e4a2e637..a3f3a4ff49 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/clean_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/clean_obj.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient11290" /> + xlink:href="#linearGradient11290" /> + id="linearGradient3967-5"> + id="linearGradient3973-6"> - + xlink:href="#linearGradient3955-1" /> - - - - @@ -276,20 +211,17 @@ image/svg+xml - + + id="layer1-2"> + id="rect13693" /> + id="path13797" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,8 +108,6 @@ @@ -154,26 +116,21 @@ + id="line"> line + id="lightarea"> lightarea + id="darkarea"> darkarea + id="divider"> divider + id="eraser"> eraser diff --git a/icons/org.eclipse.egit.ui/icons/obj16/cloneGit.svg b/icons/org.eclipse.egit.ui/icons/obj16/cloneGit.svg index f85763e111..06bb660c4a 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/cloneGit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/cloneGit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4029" /> + xlink:href="#linearGradient3950" /> + id="linearGradient4721-1-9"> + xlink:href="#linearGradient4721-1-9" /> - - - - - @@ -205,27 +148,22 @@ image/svg+xml - + + id="path4126" /> + id="path3125" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path7602" /> @@ -276,21 +202,15 @@ + id="path7602-2-3" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/commit.svg b/icons/org.eclipse.egit.ui/icons/obj16/commit.svg index 3125fb13b5..046e8ffec4 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/commit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/commit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - @@ -183,19 +103,15 @@ image/svg+xml - + @@ -207,22 +123,14 @@ id="path3868" style="fill:none;stroke:#c99d19;stroke-width:0.75741528999999985;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m 26.128192,1044.4362 c 0,0.5523 -1.119287,1 -2.499999,1 -1.380712,0 -2.5,-0.4477 -2.5,-1 0,-0.5523 1.119288,-1.0001 2.5,-1.0001 1.380712,0 2.499999,0.4478 2.499999,1.0001 z" - sodipodi:cx="23.628193" - sodipodi:cy="1044.4362" - sodipodi:rx="2.4999995" - sodipodi:ry="1.0000277" transform="matrix(1.3898503,0,0,1.3674896,-21.818685,-387.98391)" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/commit_amend.svg b/icons/org.eclipse.egit.ui/icons/obj16/commit_amend.svg index f0a50d3ead..ca79c50b1f 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/commit_amend.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/commit_amend.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - @@ -249,33 +203,26 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> @@ -343,14 +286,10 @@ id="g3909" transform="translate(15.866796,-4.6488344)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/current_step.svg b/icons/org.eclipse.egit.ui/icons/obj16/current_step.svg index dc89601eeb..db320181e6 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/current_step.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/current_step.svg @@ -4,24 +4,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -112,20 +80,17 @@ image/svg+xml - + diff --git a/icons/org.eclipse.egit.ui/icons/obj16/delete_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/delete_obj.svg index 9af37d524e..99b0ed5252 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/delete_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/delete_obj.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -102,16 +70,12 @@ + id="rect4043" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg b/icons/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg index b807bfd0fb..9c96294b19 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4962-2-7" /> - - - @@ -100,52 +68,35 @@ + id="path4874-4" /> + id="path4894" /> + id="path4894-8" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/done_step.svg b/icons/org.eclipse.egit.ui/icons/obj16/done_step.svg index 4ce9594d0f..06518b4b50 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/done_step.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/done_step.svg @@ -2,21 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4019"> - - - - @@ -124,13 +80,11 @@ image/svg+xml - + @@ -138,14 +92,10 @@ id="g4241" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,738.69742,301.29041)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/editconfig.svg b/icons/org.eclipse.egit.ui/icons/obj16/editconfig.svg index 74eb4f9104..a7103587fb 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/editconfig.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/editconfig.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4-5"> + id="linearGradient4810-5"> + id="linearGradient4908-52-3-2-6"> + x="-0.098946937" + y="-0.10066635" + width="1.1978939" + height="1.2013327"> + stdDeviation="0.22207033" /> @@ -204,7 +195,6 @@ style="stop-color:#4d4d4d;stop-opacity:1" /> + x="-0.34969947" + width="1.6994111" + y="-0.35042714" + height="1.7008444"> - - - @@ -312,32 +269,22 @@ @@ -345,8 +292,6 @@ id="g7581" mask="url(#mask7584)"> @@ -356,75 +301,52 @@ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,726.06628,283.93164)"> + id="path5226-6-14-1-5-9" /> + id="path5424-7" /> + id="path5226-6-14-1-5-2-9" /> + id="path5226-6-14-1-5-2-7-1" /> + id="path5426-9" /> + id="path5006-1-8" /> + style="fill:#f5b9ac;fill-opacity:1;stroke:url(#linearGradient12300);stroke-width:0.2935867;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/fetch.svg b/icons/org.eclipse.egit.ui/icons/obj16/fetch.svg index 4de2e90ed8..e9173523e1 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/fetch.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/fetch.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - @@ -133,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg b/icons/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg index c7c439d263..0d264b9e72 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -128,13 +83,11 @@ image/svg+xml - + @@ -143,17 +96,12 @@ + id="path3091" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/fixup-down.svg b/icons/org.eclipse.egit.ui/icons/obj16/fixup-down.svg index 9811742d7a..a4a3ff1941 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/fixup-down.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/fixup-down.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,26 +43,21 @@ image/svg+xml - + @@ -103,8 +65,6 @@ + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/fixup-up.svg b/icons/org.eclipse.egit.ui/icons/obj16/fixup-up.svg index da5364367b..f6d14f4fcf 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/fixup-up.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/fixup-up.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,13 +43,11 @@ image/svg+xml - + @@ -90,13 +55,10 @@ id="g4716" transform="translate(0,-7)"> @@ -104,8 +66,6 @@ + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg b/icons/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg index fbde6bce41..cc53f46467 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865-9" /> - - - @@ -144,21 +109,18 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg index e840ba7e40..3bed739c07 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg @@ -2,23 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -54,7 +45,6 @@ id="stop3813-3" /> - - - @@ -111,13 +73,11 @@ image/svg+xml - + @@ -143,13 +103,8 @@ + style="fill:url(#radialGradient4090);fill-opacity:1;stroke:none;display:inline" /> @@ -209,13 +164,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -144,21 +109,18 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/gitrepository.svg b/icons/org.eclipse.egit.ui/icons/obj16/gitrepository.svg index 812b204ffe..d9ddc44948 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/gitrepository.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/gitrepository.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -164,8 +128,6 @@ @@ -175,15 +137,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/history.svg b/icons/org.eclipse.egit.ui/icons/obj16/history.svg index 4af96a4c61..fd8e156b50 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/history.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/history.svg @@ -1,26 +1,23 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4322"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -330,7 +159,6 @@ style="stop-color:#c99d19;stop-opacity:1" /> + id="linearGradient4721-1"> - - - @@ -410,13 +207,11 @@ image/svg+xml - + @@ -428,17 +223,7 @@ y="1034.9207" x="-1.5280007" id="image4319" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbxJREFU -OI2Nk09sTEEcxz/z3ttng9ImJKInJA44rzTphXATQQQHpCniIC4u6LVNhDYSvQhuSBxIozcHskfS -BD01cWi71UhaRRvdzu78eTMO1jbLm9TvNPObbz7z+33nN8J7Tyjevih5XZmGNMYZR31e0l7aQ9fJ -MfFHI0KA8tOdvnvXetheItp2kOznBOrHR/znKd7PGw6cnRIAUej2dDmDOIZMAaLlbPH1l+Y6CQEW -Z2O+ti3QsWWORJbR3z5RrUySjS+xuWPT2oDivtOwt4tlsZs464StH9gY3cInFZJX3/MBzx5daDFk -YWy0BXr40ClSbiOiVdk/FRw7/yC3opePL69uRACgbILLHFcHRlDaUasrpDI8v9eLcvndtmRrNsF4 -uHvzBAC+8UY2cyhVAKBanmFpNgRQKcbA9TsjaG1ZqRtqyvBksIeqSZs6ub8tH7Biimjr6b92/HcF -jby2HqlT3r2ZY8OOTs5cmhS5AKlSlHUMDI+itUM2PLjffw6pihy52CegL+yBtEVsBjeuHAUvmgOo -LEi7LsfCv1/BFLDW4wCEJ/IC12ikbgprA7RNGBp+mCsMDW3wN/5v/AJczcNxJFjGigAAAABJRU5E -rkJggg== -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbxJREFU OI2Nk09sTEEcxz/z3ttng9ImJKInJA44rzTphXATQQQHpCniIC4u6LVNhDYSvQhuSBxIozcHskfS BD01cWi71UhaRRvdzu78eTMO1jbLm9TvNPObbz7z+33nN8J7Tyjevih5XZmGNMYZR31e0l7aQ9fJ MfFHI0KA8tOdvnvXetheItp2kOznBOrHR/znKd7PGw6cnRIAUej2dDmDOIZMAaLlbPH1l+Y6CQEW Z2O+ti3QsWWORJbR3z5RrUySjS+xuWPT2oDivtOwt4tlsZs464StH9gY3cInFZJX3/MBzx5daDFk YWy0BXr40ClSbiOiVdk/FRw7/yC3opePL69uRACgbILLHFcHRlDaUasrpDI8v9eLcvndtmRrNsF4 uHvzBAC+8UY2cyhVAKBanmFpNgRQKcbA9TsjaG1ZqRtqyvBksIeqSZs6ub8tH7Biimjr6b92/HcF jby2HqlT3r2ZY8OOTs5cmhS5AKlSlHUMDI+itUM2PLjffw6pihy52CegL+yBtEVsBjeuHAUvmgOo LEi7LsfCv1/BFLDW4wCEJ/IC12ikbgprA7RNGBp+mCsMDW3wN/5v/AJczcNxJFjGigAAAABJRU5E rkJggg== " style="image-rendering:optimizeSpeed" preserveAspectRatio="none" height="17.118193" @@ -448,8 +233,6 @@ rkJggg== id="g4537" transform="matrix(1.4869828,0,0,1.3418433,-8.8456538,-364.69538)"> @@ -461,8 +244,6 @@ rkJggg== id="path3868" style="display:inline;fill:none;stroke:url(#linearGradient4800-4);stroke-width:0.75741529;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -471,30 +252,23 @@ rkJggg== style="display:inline;opacity:0.73999999;fill:url(#linearGradient4482-7);fill-opacity:1;stroke:none;stroke-width:1.06988704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2.5999999;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4389)" d="m 22.009514,1039.2002 6.419323,0 0,7.1505 -6.419323,0 z" id="rect4466-0" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccc" transform="matrix(0.99050735,0,0,1,0.20892857,0)" /> + id="rect4466" /> + id="path4484" /> + id="path4484-7" /> + id="path4484-75" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/ignore.svg b/icons/org.eclipse.egit.ui/icons/obj16/ignore.svg index ccbe68116f..2d6fb94893 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/ignore.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/ignore.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - - - - - - - - + xlink:href="#linearGradient4852-7-29-2" /> + xlink:href="#linearGradient4844-4-9-7" /> + xlink:href="#linearGradient4852-7-2" /> - - - @@ -313,13 +224,11 @@ image/svg+xml - + @@ -335,20 +244,15 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="rect4043-2-7-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/import_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/import_obj.svg index 6047857704..e09c37fe42 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/import_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/import_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -93,7 +87,6 @@ id="stop10754-8-48" /> + xlink:href="#linearGradient10448-9-7-0-5-9" /> - - - @@ -247,13 +207,11 @@ image/svg+xml - + @@ -275,7 +233,6 @@ id="rect10007-0-74-2-7-6" style="fill:url(#linearGradient4464);fill-opacity:1;stroke:none;display:inline" /> @@ -301,28 +258,22 @@ id="rect3123" style="fill:url(#linearGradient4090-5);fill-opacity:1;stroke:url(#linearGradient4092-7);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> + id="path4466" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - + id="path4919" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient3859" /> - - - @@ -377,13 +71,11 @@ image/svg+xml - + @@ -398,19 +90,15 @@ + id="path3089" /> + id="path5046" /> + id="path5068" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/merge.svg b/icons/org.eclipse.egit.ui/icons/obj16/merge.svg index 7a05f7a261..ca13be0123 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/merge.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/merge.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -88,9 +56,7 @@ + id="path2989" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/mergetool.svg b/icons/org.eclipse.egit.ui/icons/obj16/mergetool.svg index 14fd18c118..a0d486d329 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/mergetool.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/mergetool.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4309"> - - - @@ -183,13 +141,11 @@ image/svg+xml - + @@ -214,14 +170,7 @@ y="259.83359" x="548.55072" id="image4247" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUVJREFU -OI2dkr1KA0EUhb9ZN7E1iAn4MhJBsQpY+g5CQBIhqEgKC03QRrCzFYMgRDAQQeJjxMYuoCCW/mTx -WMzsZvO3qBeGu8w58+3MvddIIh73BzkBLO88G0ZikuaNGvKV7ui5ochXuhEIwA8/2tWsVvYeAQgC -cVfNSsZgwhsaQANIu5rV6v6LMZK43V3Q2naTyGlkswQmlhFoQGodFTBhDa7L8yps1QG4OSk5r3Es -65Eg9DSPS6zXXg2SonVZzCjonatRnFN8P1yNSM9EuhntwsVmRgAbp29jXZikjQH+Gj5Ap3X4b4oP -EHx7LC6VJxp6D7XpWqduAZ/9FAC5WWyHXKcM8JSkBb4FfDiThzPEcrKWtoD3fhqAmbjJVSVZSznA -lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUVJREFU OI2dkr1KA0EUhb9ZN7E1iAn4MhJBsQpY+g5CQBIhqEgKC03QRrCzFYMgRDAQQeJjxMYuoCCW/mTx WMzsZvO3qBeGu8w58+3MvddIIh73BzkBLO88G0ZikuaNGvKV7ui5ochXuhEIwA8/2tWsVvYeAQgC cVfNSsZgwhsaQANIu5rV6v6LMZK43V3Q2naTyGlkswQmlhFoQGodFTBhDa7L8yps1QG4OSk5r3Es 65Eg9DSPS6zXXg2SonVZzCjonatRnFN8P1yNSM9EuhntwsVmRgAbp29jXZikjQH+Gj5Ap3X4b4oP EHx7LC6VJxp6D7XpWqduAZ/9FAC5WWyHXKcM8JSkBb4FfDiThzPEcrKWtoD3fhqAmbjJVSVZSznA lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= " style="image-rendering:optimizeSpeed" preserveAspectRatio="none" height="57.340881" @@ -229,15 +178,11 @@ lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= + id="rect3968" /> + id="rect3968-6" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -94,13 +63,11 @@ image/svg+xml - + @@ -109,16 +76,12 @@ + id="path3091" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg b/icons/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg index b3299162ad..d4bbd19ba4 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - @@ -261,13 +207,11 @@ image/svg+xml - + @@ -307,14 +251,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> @@ -414,8 +354,6 @@ id="g3969" transform="matrix(3.5838051,0,0,3.5838051,596.74509,-3425.9255)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg b/icons/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg index a9ddd7b1d9..21b83600d0 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - @@ -128,17 +48,13 @@ + id="path3873" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -76,7 +67,6 @@ id="stop4898-5-0" /> - - - @@ -151,13 +111,11 @@ image/svg+xml - + @@ -187,9 +145,7 @@ + id="path4884-7" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/open-commit.svg b/icons/org.eclipse.egit.ui/icons/obj16/open-commit.svg index cc9f3d511a..fb630aad28 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/open-commit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/open-commit.svg @@ -2,25 +2,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3973"> + id="linearGradient3967"> + x="-0.33426729" + width="1.6685346" + y="-0.42999801" + height="1.859996"> + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="path7826-6" /> + id="path7828-7" /> + x="-0.34675294" + width="1.6935059" + y="-0.34675294" + height="1.6935059"> - - - @@ -416,13 +347,11 @@ image/svg+xml - + @@ -445,14 +374,11 @@ + id="rect13693" /> + id="path13797" /> @@ -474,19 +395,14 @@ id="g3657" transform="translate(-3.5838077,0)"> @@ -546,20 +462,14 @@ id="g3232" transform="matrix(0.50000003,0,0,0.5,291.20492,170.97584)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/pull.svg b/icons/org.eclipse.egit.ui/icons/obj16/pull.svg index 1cd131cd9a..4ad657f7de 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/pull.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/pull.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg b/icons/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg index f4b6fd173b..28e2abe318 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,32 +88,25 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> + d="m 8.532401,1042.3622 -1.488,0 c 0,0 -0.01538,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 l 0.25,-0.2265 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.363716,0.01 -0.564257,0.194 -0.206443,0.1907 -0.171121,0.7023 -0.171121,0.7023 l -1.027773,0 c 0,0 0.0033,-0.8705 0.230561,-1.2142 0.209451,-0.3168 0.686234,-0.5818 0.946652,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.08181,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/push.svg b/icons/org.eclipse.egit.ui/icons/obj16/push.svg index 9a0a5254e0..84483741ad 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/push.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/push.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/rebase.svg b/icons/org.eclipse.egit.ui/icons/obj16/rebase.svg index d26b3d8e91..196965716a 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/rebase.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/rebase.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - @@ -164,33 +63,25 @@ image/svg+xml - + + id="path3873" /> + id="path3868" /> + id="path3098" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg b/icons/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg index b17f3d3788..2ec7bb4a7f 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -97,13 +63,11 @@ image/svg+xml - + @@ -111,20 +75,14 @@ id="g3116" transform="translate(-2,-2.5082885e-5)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/refresh.svg b/icons/org.eclipse.egit.ui/icons/obj16/refresh.svg index 8f95efcf9a..a433c11aa7 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/refresh.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/refresh.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,53 +105,35 @@ image/svg+xml - + + id="path7582" /> + id="path7602" /> + id="path7582-7" /> + id="path7602-2" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -117,13 +83,11 @@ image/svg+xml - + @@ -133,15 +97,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg b/icons/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg index b940820dd5..14125702d4 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -139,13 +104,11 @@ image/svg+xml - + @@ -155,15 +118,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -117,13 +83,11 @@ image/svg+xml - + @@ -133,15 +97,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/reset.svg b/icons/org.eclipse.egit.ui/icons/obj16/reset.svg index e12a69ffe4..e2cc5cea69 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/reset.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/reset.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -99,39 +63,29 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108-1-6" /> + id="path4108-1-8" /> + id="path4108-1-6-4" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/revert.svg b/icons/org.eclipse.egit.ui/icons/obj16/revert.svg index dc6cfe16a8..fb21a6796d 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/revert.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/revert.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> - - - @@ -205,13 +163,11 @@ image/svg+xml - + @@ -222,15 +178,11 @@ + id="rect4001-3-3" /> + id="rect4001-9" /> + id="path3887" /> + id="path3891" /> + id="path3115" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/reword.svg b/icons/org.eclipse.egit.ui/icons/obj16/reword.svg index 6620a0af31..08ad19fd11 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/reword.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/reword.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - + id="linearGradient4908-52-3-2-6"> + x="-0.098946937" + y="-0.10066635" + width="1.1978939" + height="1.2013327"> + stdDeviation="0.22207033" /> - - - - - - - - - - - - + x="-0.34970048" + width="1.6994131" + y="-0.35042816" + height="1.7008464"> - - - @@ -520,13 +339,11 @@ image/svg+xml - + @@ -539,20 +356,15 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path5226-6-14-1-5-9-9" /> + id="path5226-6-14-1-5-9" /> + id="path5424-7" /> + id="path5226-6-14-1-5-2-9" /> + id="path5226-6-14-1-5-2-7-1" /> + id="path5426-9" /> + id="path5006-1-8" /> + style="fill:#f5b9ac;fill-opacity:1;stroke:url(#linearGradient3133);stroke-width:0.2935867;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/search-commit.svg b/icons/org.eclipse.egit.ui/icons/obj16/search-commit.svg index c54a34874c..947ff79b03 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/search-commit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/search-commit.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + xlink:href="#linearGradient5141-4" /> - - - @@ -382,13 +329,11 @@ image/svg+xml - + @@ -403,60 +348,43 @@ id="g5359" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,730.34515,280.80707)"> + style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.0003444;stroke-linejoin:round;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -487,20 +415,14 @@ id="g3232" transform="matrix(0.14926692,0,0,0.14926692,-53.85862,981.77854)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/settings.svg b/icons/org.eclipse.egit.ui/icons/obj16/settings.svg index 12b29c2150..12f05729aa 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/settings.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/settings.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -128,8 +91,6 @@ @@ -138,7 +99,6 @@ + id="path4250" /> + id="path4252" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/sign-commit.svg b/icons/org.eclipse.egit.ui/icons/obj16/sign-commit.svg index fd19ae8d8d..90395e7200 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/sign-commit.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/sign-commit.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878" /> + id="filter5152" + x="-0.11338032" + y="-0.15654873" + width="1.2267606" + height="1.3130975"> - - - @@ -209,22 +168,17 @@ + id="rect4838-1" /> + id="path4994" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.34969947" + width="1.6994111" + y="-0.35042714" + height="1.7008444"> @@ -166,8 +158,7 @@ + id="path3953" /> @@ -181,7 +172,6 @@ id="stop4034-48" /> - - - @@ -284,13 +243,11 @@ image/svg+xml - + @@ -298,8 +255,6 @@ id="g7581" mask="url(#mask7584)"> @@ -309,47 +264,37 @@ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,726.06628,283.93164)"> + id="path4028" /> + id="path4028-8" /> + id="path4028-4" /> + id="path4028-3" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/squash-down.svg b/icons/org.eclipse.egit.ui/icons/obj16/squash-down.svg index d3c3c761e5..abaa91eae9 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/squash-down.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/squash-down.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> - - - - - - - - - @@ -268,26 +163,21 @@ image/svg+xml - + @@ -295,25 +185,18 @@ + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/squash-up.svg b/icons/org.eclipse.egit.ui/icons/obj16/squash-up.svg index 5fd8a03f66..7aa3209121 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/squash-up.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/squash-up.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + xlink:href="#linearGradient5141-4" /> @@ -183,34 +166,6 @@ y="1045.3622" /> - - - @@ -219,13 +174,11 @@ image/svg+xml - + @@ -234,13 +187,10 @@ transform="translate(0,-7)" clip-path="url(#clipPath3070)"> @@ -248,27 +198,20 @@ + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/stash-apply.svg b/icons/org.eclipse.egit.ui/icons/obj16/stash-apply.svg index 13717a1cfe..309c04c1ae 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/stash-apply.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/stash-apply.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - + xlink:href="#linearGradient3865" /> - - - @@ -293,13 +161,11 @@ image/svg+xml - + @@ -309,122 +175,61 @@ width="11.25" height="3" x="0.5" - y="1046.2372" - inkscape:export-filename="/Users/thomas/bin/oomph/egit-master/git/egit/icons/org.eclipse.egit.ui/icons/obj16/stash.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45" /> + y="1046.2372" /> + id="path3854" /> + id="path3856" /> + id="path3858" /> + id="path3894" /> + id="path3896" /> + id="path3908" /> + id="path3918" /> + id="path3920" /> + y="1047.3622" /> + id="path4135" /> + id="path4235" /> + id="path4235-1" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/stash-create.svg b/icons/org.eclipse.egit.ui/icons/obj16/stash-create.svg index 4871b26bde..5dd949b47e 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/stash-create.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/stash-create.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - + xlink:href="#linearGradient3865" /> - - - @@ -293,13 +161,11 @@ image/svg+xml - + @@ -309,122 +175,61 @@ width="11.25" height="3" x="4.25" - y="1046.2372" - inkscape:export-filename="/Users/thomas/bin/oomph/egit-master/git/egit/icons/org.eclipse.egit.ui/icons/obj16/stash.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45" /> + y="1046.2372" /> + id="path3854" /> + id="path3856" /> + id="path3858" /> + id="path3894" /> + id="path3896" /> + id="path3908" /> + id="path3918" /> + id="path3920" /> + y="1047.3622" /> + id="path4135" /> + id="path4235" /> + id="path4235-1" /> + id="path3873" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/stash.svg b/icons/org.eclipse.egit.ui/icons/obj16/stash.svg index d9e48af591..384f73c377 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/stash.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/stash.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - @@ -347,13 +163,11 @@ image/svg+xml - + @@ -361,9 +175,6 @@ id="g4355" transform="matrix(0.5,0,0,0.5,32.5,512.6811)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg b/icons/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg index ca94fc91cc..e16c466a17 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -101,9 +69,7 @@ + id="path3986" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3973"> + id="linearGradient3967"> + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> + id="linearGradient4721-1"> + id="linearGradient4721-1-5"> - - - @@ -332,13 +288,11 @@ image/svg+xml - + @@ -355,13 +309,10 @@ id="rect13693-3" style="fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient4146);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> @@ -373,15 +324,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3868-1-5" /> + id="path3868-1-4-5" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865-9" /> - - - @@ -144,33 +108,26 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> + id="path3873-0" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - - - - - - - - - + id="linearGradient3967-01"> - - + id="linearGradient3967-0-2"> - - - - - - - - - - - - - - - - - - - @@ -634,13 +312,11 @@ image/svg+xml - + @@ -684,15 +360,11 @@ + id="rect13693-8" /> + id="path13797" /> @@ -726,15 +398,11 @@ + id="rect13693-8-4" /> + id="path13797-6" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/track.svg b/icons/org.eclipse.egit.ui/icons/obj16/track.svg index ef453620ba..1f4f28fd26 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/track.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/track.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - + xlink:href="#linearGradient8164" /> + xlink:href="#linearGradient8180" /> - - - @@ -172,13 +116,11 @@ image/svg+xml - + @@ -190,51 +132,33 @@ id="g3142" transform="translate(0,-1.9751903)"> + style="fill:url(#linearGradient3149);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:url(#linearGradient3151);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg b/icons/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg index 2279a704ef..03955e725b 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4"> + id="linearGradient4994-4-1"> - - - @@ -184,13 +143,11 @@ image/svg+xml - + @@ -198,19 +155,14 @@ id="g4084" transform="translate(-26,-20.000055)"> @@ -226,19 +178,14 @@ id="g3892" transform="matrix(0.45459079,0,0,0.45457615,-5.0464066,568.84683)"> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/unstage.svg b/icons/org.eclipse.egit.ui/icons/obj16/unstage.svg index a3af75382b..da31ade4eb 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/unstage.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/unstage.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -114,13 +61,11 @@ image/svg+xml - + diff --git a/icons/org.eclipse.egit.ui/icons/obj16/untrack.svg b/icons/org.eclipse.egit.ui/icons/obj16/untrack.svg index f9c6572211..e0043c1d95 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/untrack.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/untrack.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -506,13 +161,11 @@ image/svg+xml - + @@ -524,43 +177,27 @@ id="g3142" transform="translate(0,-1.9751903)"> + style="fill:url(#linearGradient3149);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:url(#linearGradient3151);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -228,38 +83,29 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + d="m 8.532401,1046.3622 -1.488,0 c 0,0 -0.01538,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 l 0.25,-0.2265 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.363716,0.01 -0.564257,0.194 -0.206443,0.1907 -0.171121,0.7023 -0.171121,0.7023 l -1.027773,0 c 0,0 0.0033,-0.8705 0.230561,-1.2142 0.209451,-0.3168 0.686234,-0.5818 0.946652,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.08181,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/obj16/version_rep.svg b/icons/org.eclipse.egit.ui/icons/obj16/version_rep.svg index d622456e28..2b780e631b 100644 --- a/icons/org.eclipse.egit.ui/icons/obj16/version_rep.svg +++ b/icons/org.eclipse.egit.ui/icons/obj16/version_rep.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - @@ -240,13 +187,11 @@ image/svg+xml - + @@ -286,14 +231,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg b/icons/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg index 13471289c7..efea583431 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg @@ -1,80 +1,20 @@ + + + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - + id="defs4" /> @@ -83,22 +23,18 @@ image/svg+xml - + + id="path4242" /> + id="path4240" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg b/icons/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg index 17a474c26b..395cc1e8c5 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4191"> - - - @@ -122,13 +84,11 @@ image/svg+xml - + + id="path4205" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -107,27 +69,21 @@ image/svg+xml - + + id="path4334-6" /> + id="path4334" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/delete_modify.svg b/icons/org.eclipse.egit.ui/icons/ovr/delete_modify.svg index 570a966e06..749f6bda66 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/delete_modify.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/delete_modify.svg @@ -4,24 +4,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4844-4-9-7" /> - - - @@ -134,28 +94,20 @@ + id="path4334-6" /> + id="path4334" /> + id="rect4043-2-7-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/dirty.svg b/icons/org.eclipse.egit.ui/icons/ovr/dirty.svg index b38aec294c..e02c3edc35 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/dirty.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/dirty.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -86,13 +52,11 @@ image/svg+xml - + + id="path4199" /> + id="path4199-4" /> + id="path4199-4-7" /> + id="path4199-4-7-3" /> + id="path4199-4-7-9" /> + id="path4199-4-7-0" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/error.svg b/icons/org.eclipse.egit.ui/icons/ovr/error.svg index 200dfaef40..0384a754c2 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/error.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/error.svg @@ -1,32 +1,21 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - + xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1" /> + xlink:href="#linearGradient4879" /> - - - @@ -121,8 +72,6 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4852-7-2" /> - - - @@ -134,28 +94,20 @@ + id="path4334-6" /> + id="path4334" /> + id="rect4043-2-7-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/staged.svg b/icons/org.eclipse.egit.ui/icons/ovr/staged.svg index 33bd0c3255..e3a4263ff6 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/staged.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/staged.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -87,13 +52,11 @@ image/svg+xml - + + id="path4199" /> + id="path4199-4" /> + id="path4199-4-7" /> + id="path4199-4-7-3" /> + id="path4199-4-7-9" /> + id="path4199-4-7-0" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/staged_added.svg b/icons/org.eclipse.egit.ui/icons/ovr/staged_added.svg index e7d1f226e0..f28633bf9b 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/staged_added.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/staged_added.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -97,21 +63,17 @@ image/svg+xml - + + id="path5581" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/staged_removed.svg b/icons/org.eclipse.egit.ui/icons/ovr/staged_removed.svg index 7850f78bac..ea9f9ec7a5 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/staged_removed.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/staged_removed.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4852-7-29-2" /> + xlink:href="#linearGradient4844-4-9-7" /> - - - @@ -126,8 +89,6 @@ @@ -143,8 +104,6 @@ + id="rect4043-2-7-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg b/icons/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg index 9dc2db89b8..6b466d0857 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg @@ -2,64 +2,18 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -236,13 +43,11 @@ image/svg+xml - + @@ -250,8 +55,6 @@ id="g3979" transform="translate(19.972259,2.0319218)"> @@ -261,9 +64,7 @@ + id="path7602-5" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg b/icons/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg index 176dc0f092..927fbc393d 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -79,8 +50,6 @@ @@ -105,9 +74,7 @@ + id="path4183" /> diff --git a/icons/org.eclipse.egit.ui/icons/ovr/untracked.svg b/icons/org.eclipse.egit.ui/icons/ovr/untracked.svg index 2d1f6780dc..048889e2f4 100644 --- a/icons/org.eclipse.egit.ui/icons/ovr/untracked.svg +++ b/icons/org.eclipse.egit.ui/icons/ovr/untracked.svg @@ -4,50 +4,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -56,13 +23,11 @@ image/svg+xml - + + d="m 4.488,1049.3622 -1.488,0 c 0,0 -0.015379,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 L 4,1047.7762 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.3637164,0.01 -0.5642576,0.194 -0.206443,0.1907 -0.1711209,0.7023 -0.1711209,0.7023 l -1.0277727,0 c 0,0 0.00334,-0.8705 0.2305607,-1.2142 0.2094513,-0.3168 0.6862345,-0.5818 0.9466525,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.081805,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg index f153b77bcb..f9008fb1de 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4894"> @@ -189,83 +172,27 @@ id="stop4460" /> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> - - - - - - - - - - - - + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -442,40 +357,8 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - @@ -484,25 +367,18 @@ image/svg+xml - + + style="display:inline"> @@ -515,15 +391,11 @@ id="g13408-8-2" /> @@ -531,10 +403,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606);font-family:Sans" d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z" id="rect10961-8-3-6-1" - inkscape:connector-curvature="0" - transform="matrix(0.76852909,0,0.05870911,0.23426091,-77.090255,785.86486)" - inkscape:transform-center-x="4.4580006" - inkscape:transform-center-y="0.53407962" /> + transform="matrix(0.76852909,0,0.05870911,0.23426091,-77.090255,785.86486)" /> @@ -545,8 +414,6 @@ id="g5348" transform="translate(0,986.3622)"> @@ -560,10 +427,6 @@ id="rect4876" style="fill:url(#linearGradient4045);fill-opacity:1;stroke:url(#linearGradient4047);stroke-width:1.5625;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + transform="matrix(0.76852909,0,0.05870911,0.23426091,-33.378717,784.41165)" /> @@ -608,40 +465,19 @@ id="path3868" style="fill:none;stroke:#c99d19;stroke-width:0.27287647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m 26.128192,1044.4362 c 0,0.5523 -1.119287,1 -2.499999,1 -1.380712,0 -2.5,-0.4477 -2.5,-1 0,-0.5523 1.119288,-1.0001 2.5,-1.0001 1.380712,0 2.499999,0.4478 2.499999,1.0001 z" - sodipodi:cx="23.628193" - sodipodi:cy="1044.4362" - sodipodi:rx="2.4999995" - sodipodi:ry="1.0000277" transform="matrix(4.0053658,0,0,3.3529387,-31.118177,-2494.8691)" /> + id="path3873" /> + transform="matrix(-1.368628,2.4568462,-2.1273332,-1.7531504,2279.2634,2822.827)" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg index cfa459e623..7b1b998cbb 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4902"> + id="linearGradient4994"> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4994-0"> + id="linearGradient4902-8"> + xlink:href="#linearGradient4578" /> - - - - - - - - - - - @@ -500,25 +353,18 @@ image/svg+xml - + + style="display:inline"> @@ -531,15 +377,11 @@ id="g13408-8-2" /> @@ -547,141 +389,104 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4233);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606);font-family:Sans" d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z" id="rect10961-8-3-6-1" - inkscape:connector-curvature="0" - transform="matrix(1.1726491,0,0.08958045,0.36603268,-118.93918,664.84958)" - inkscape:transform-center-x="4.3534013" - inkscape:transform-center-y="0.53407962" /> + transform="matrix(1.1726491,0,0.08958045,0.36603268,-118.93918,664.84958)" /> + style="fill:url(#linearGradient3142);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> + id="path4696-0" /> + id="path4696-9" /> + id="path4696-0-2" /> + id="path4696-0-3" /> + id="path4696-0-8" /> + id="path4696-9-9" /> + id="path4696-9-8" /> + transform="matrix(1.1726491,0,0.08958045,0.36603268,-80.919182,664.84958)" /> + id="path4696-0-5" /> + id="path4696-9-91" /> + id="path4696-0-2-1" /> + id="path4696-0-3-4" /> + id="path4696-0-8-4" /> + id="path4696-9-9-2" /> + id="path4696-9-8-6" /> + style="fill:url(#linearGradient3115);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> + id="path4696-9-91-6" /> + id="path4522" /> + id="path4522-3" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg index 4ef8e1be74..499691ebd2 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865-6" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - @@ -362,25 +307,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +331,11 @@ id="g13408-8-2" /> @@ -409,26 +343,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -547,13 +449,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865-6" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - - - @@ -362,25 +286,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +310,11 @@ id="g13408-8-2" /> @@ -409,26 +322,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/import_wiz.svg b/icons/org.eclipse.egit.ui/icons/wizban/import_wiz.svg index fbd0f065ee..1a5af76d7f 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/import_wiz.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/import_wiz.svg @@ -2,35 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - + x="-0.078955413" + width="1.1579108" + y="-0.12997642" + height="1.2599528"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient4496"> - + height="1.0954513" + y="-0.047725668" + width="1.0967932" + x="-0.048396592" + id="filter4285-9-8-1"> + stdDeviation="0.10000000000000001" /> - - - @@ -795,25 +365,18 @@ image/svg+xml - + + style="display:inline"> @@ -826,15 +389,11 @@ id="g13408-8-2" /> @@ -842,11 +401,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4235);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 53.125738,1012.9043 -20.282159,28.4583 27.324925,0 19.523134,-28.4583 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(1.8444698,0,0.14090187,0.56222619,-202.61205,452.11525)" - inkscape:transform-center-x="10.699205" - inkscape:transform-center-y="1.2818017" - sodipodi:nodetypes="ccccc" /> + transform="matrix(1.8444698,0,0.14090187,0.56222619,-202.61205,452.11525)" /> @@ -861,17 +416,14 @@ transform="translate(-1.378906,0)" id="g4070"> @@ -918,25 +470,11 @@ + id="path4478" /> + transform="matrix(-0.68431401,1.2284231,-1.0636666,-0.87657521,1168.2883,1942.6519)" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg index e5c184be94..a33929984c 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.078955413" + width="1.1579108" + y="-0.12997642" + height="1.2599528"> @@ -238,7 +226,6 @@ id="stop10452-22-7-8-4-3-4" /> - - - - - - - - - - + height="1.0954513" + y="-0.047725668" + width="1.0967932" + x="-0.048396592" + id="filter4285-9-8-1"> + stdDeviation="0.10000000000000001" /> - - - - - @@ -422,25 +317,18 @@ image/svg+xml - + + style="display:inline"> @@ -453,15 +341,11 @@ id="g13408-8-2" /> @@ -469,11 +353,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4235);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 53.125738,1012.9043 -20.282159,28.4583 27.324925,0 19.523134,-28.4583 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(1.8444698,0,0.14090187,0.56222619,-194.61205,452.11525)" - inkscape:transform-center-x="10.699205" - inkscape:transform-center-y="1.2818017" - sodipodi:nodetypes="ccccc" /> + transform="matrix(1.8444698,0,0.14090187,0.56222619,-194.61205,452.11525)" /> @@ -488,17 +368,14 @@ transform="translate(-1.378906,0)" id="g4070"> @@ -543,22 +420,9 @@ ry="0" /> + transform="matrix(-0.07087313,1.404381,-1.3415721,-0.31615686,1429.7583,1358.116)" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg index 65767c568a..c80a0d0b2b 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient3865-6" /> - - + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4894"> + y="-0.68799998" + height="2.376"> - - - @@ -517,25 +346,18 @@ image/svg+xml - + + style="display:inline"> @@ -548,41 +370,30 @@ id="g13408-8-2" /> + id="path3873" /> @@ -592,10 +403,7 @@ style="display:inline" id="g3083"> @@ -611,9 +419,7 @@ + id="path5250" /> + d="m 31.191999,8.3080006 c 0,2.4852814 -3.357864,4.5000004 -7.5,4.5000004 -4.142135,0 -7.5,-2.014719 -7.5,-4.5000004 0,-2.4852814 3.357865,-4.5 7.5,-4.5 4.142136,0 7.5,2.0147186 7.5,4.5 z" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - @@ -372,25 +307,18 @@ image/svg+xml - + + style="display:inline"> @@ -403,15 +331,11 @@ id="g13408-8-2" /> @@ -419,26 +343,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -557,13 +449,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - - - @@ -362,25 +286,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +310,11 @@ id="g13408-8-2" /> @@ -409,26 +322,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> diff --git a/icons/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg b/icons/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg index 31211c3cf7..756198d6ca 100644 --- a/icons/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg +++ b/icons/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> - + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +168,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - @@ -401,25 +306,18 @@ image/svg+xml - + + style="display:inline"> @@ -432,15 +330,11 @@ id="g13408-8-2" /> @@ -448,26 +342,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -523,14 +387,10 @@ + id="path3873" /> + id="path3873-3" /> diff --git a/org.eclipse.egit.doc/help/images/topiclabel/egit.svg b/org.eclipse.egit.doc/help/images/topiclabel/egit.svg index 4212f68944..bde7ddd13e 100644 --- a/org.eclipse.egit.doc/help/images/topiclabel/egit.svg +++ b/org.eclipse.egit.doc/help/images/topiclabel/egit.svg @@ -2,14 +2,6 @@ image/svg+xml \ No newline at end of file + style="fill:#ffffff;fill-opacity:1" /> diff --git a/org.eclipse.egit.doc/images/topiclabel/egit.svg b/org.eclipse.egit.doc/images/topiclabel/egit.svg index 4212f68944..bde7ddd13e 100644 --- a/org.eclipse.egit.doc/images/topiclabel/egit.svg +++ b/org.eclipse.egit.doc/images/topiclabel/egit.svg @@ -2,14 +2,6 @@ image/svg+xml \ No newline at end of file + style="fill:#ffffff;fill-opacity:1" /> diff --git a/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg b/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg index 7117b77a84..4803ade517 100644 --- a/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg +++ b/org.eclipse.egit.gitflow.ui/icons/obj16/gitflow.svg @@ -2,114 +2,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - + id="defs4" /> @@ -118,20 +21,17 @@ image/svg+xml - + + id="path3123" /> diff --git a/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg b/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg index 572ceb92ff..5b530b17be 100644 --- a/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg +++ b/org.eclipse.egit.gitflow.ui/icons/ovr/git-flow.svg @@ -2,50 +2,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -54,20 +21,17 @@ image/svg+xml - + + id="path3123" /> diff --git a/org.eclipse.egit.ui/icons/egit.svg b/org.eclipse.egit.ui/icons/egit.svg index 8109972aad..b27c03b66a 100644 --- a/org.eclipse.egit.ui/icons/egit.svg +++ b/org.eclipse.egit.ui/icons/egit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -88,24 +54,17 @@ image/svg+xml - + + style="fill:#2c2255;fill-opacity:1;stroke:none" /> + style="fill:url(#linearGradient4028);fill-opacity:1;stroke:none" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/add.svg b/org.eclipse.egit.ui/icons/elcl16/add.svg index a3c88ae0df..553ad064a0 100644 --- a/org.eclipse.egit.ui/icons/elcl16/add.svg +++ b/org.eclipse.egit.ui/icons/elcl16/add.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -99,16 +70,12 @@ + id="path5581" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/add_all.svg b/org.eclipse.egit.ui/icons/elcl16/add_all.svg index 90b3c3f9b9..e73d0eecda 100644 --- a/org.eclipse.egit.ui/icons/elcl16/add_all.svg +++ b/org.eclipse.egit.ui/icons/elcl16/add_all.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -133,25 +81,19 @@ image/svg+xml - + + id="path3770" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/author.svg b/org.eclipse.egit.ui/icons/elcl16/author.svg index ee21508f45..d0b51de953 100644 --- a/org.eclipse.egit.ui/icons/elcl16/author.svg +++ b/org.eclipse.egit.ui/icons/elcl16/author.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> + xlink:href="#linearGradient4877-7" /> - - - @@ -345,28 +288,21 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path4207" /> + id="rect4875-2-1-8" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/clear_co.svg b/org.eclipse.egit.ui/icons/elcl16/clear_co.svg index e099328ed0..2203195169 100644 --- a/org.eclipse.egit.ui/icons/elcl16/clear_co.svg +++ b/org.eclipse.egit.ui/icons/elcl16/clear_co.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147"> + id="linearGradient5141"> + id="linearGradient5135"> + id="linearGradient4877"> + id="linearGradient4852-7-8"> + xlink:href="#linearGradient4852-7-8" /> + xlink:href="#linearGradient4844-4-1" /> + id="path6206" /> + x="-0.39259929" + width="1.7850301" + y="-0.39254203" + height="1.7850802"> - - - - - - - - - - - - - - - - - - - - - - - @@ -384,28 +248,21 @@ + id="rect4001-3" /> + id="path4884" /> + id="rect4001" /> + id="rect4043" /> + id="rect3911" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/collapseall.svg b/org.eclipse.egit.ui/icons/elcl16/collapseall.svg index 291b259680..d5647e2b58 100644 --- a/org.eclipse.egit.ui/icons/elcl16/collapseall.svg +++ b/org.eclipse.egit.ui/icons/elcl16/collapseall.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - + + xlink:href="#blue_gradient_left" /> - - + id="blue_gradient_top"> - + xlink:href="#minus_shadow_gradient" /> - - - - @@ -151,67 +112,45 @@ + id="front_background-5" /> + id="back_rect" /> + id="back_left_shadow" /> + id="back_top_shadow" /> + id="front_rect" /> + id="front_background" /> + id="minus_sign_shadow" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#blue_gradient_left" /> + id="blue_gradient_top"> - - - @@ -96,63 +63,45 @@ image/svg+xml - + + id="front_rect" /> + id="front_background" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + id="path10612" /> + id="path11386" /> + id="path11386-3" /> + id="path11386-0" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/commit.svg b/org.eclipse.egit.ui/icons/elcl16/commit.svg index 8b98322d03..c766c50c40 100644 --- a/org.eclipse.egit.ui/icons/elcl16/commit.svg +++ b/org.eclipse.egit.ui/icons/elcl16/commit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#blue_gradient_left" /> + id="blue_gradient_top"> - - - @@ -143,46 +108,33 @@ image/svg+xml - + + id="front_background" /> + id="left_top_shadow" /> + id="front_top_shadow" /> + id="path3063" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/committer.svg b/org.eclipse.egit.ui/icons/elcl16/committer.svg index ca096cef64..0e486a5e28 100644 --- a/org.eclipse.egit.ui/icons/elcl16/committer.svg +++ b/org.eclipse.egit.ui/icons/elcl16/committer.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + xlink:href="#linearGradient4721-1" /> + xlink:href="#linearGradient4877-7" /> - - - @@ -232,8 +188,6 @@ @@ -244,15 +198,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> @@ -282,8 +227,6 @@ rx="1.5" ry="1.4999999" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg b/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg index b7dcc77375..cbfc19817e 100644 --- a/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg +++ b/org.eclipse.egit.ui/icons/elcl16/compactLayout.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - + xlink:href="#linearGradient11290" /> + xlink:href="#linearGradient11290" /> + id="linearGradient3967-5"> + id="linearGradient3973-6"> - + xlink:href="#linearGradient3955-1" /> - - - @@ -305,20 +188,17 @@ image/svg+xml - + + id="layer1-2"> + id="rect13693-39" /> + id="path13797-3" /> @@ -407,14 +275,11 @@ fFsQD9RW9BVzqfUb15L9P37RxEJK6gr8JT4B/yLqHka74fYAAAAASUVORK5CYII= + id="rect13693" /> + id="path13797" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/compare_view.svg b/org.eclipse.egit.ui/icons/elcl16/compare_view.svg index 4233c8963d..c10d134895 100644 --- a/org.eclipse.egit.ui/icons/elcl16/compare_view.svg +++ b/org.eclipse.egit.ui/icons/elcl16/compare_view.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -199,33 +154,23 @@ image/svg+xml - + + d="m 1,1043.3872 0,-1.0072 3.0258837,0 0,1.0072 z m 1.0562135,-3.0084 0,-1.0072 5.9633832,0 0,1.0072 z m 3.9468134,-2.0166 1.0072572,0 0,3.0259 -1.0072572,0 z m -3.999973,1.0312 1.0072023,0 0,4.938 -1.0072023,0 z" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + x="-0.42731049" + width="1.854621" + y="-0.15071173" + height="1.3014235"> + x="-0.42731049" + width="1.854621" + y="-0.15071173" + height="1.3014235"> - - - @@ -373,20 +285,17 @@ image/svg+xml - + + id="path8117" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/delete.svg b/org.eclipse.egit.ui/icons/elcl16/delete.svg index 6f325d2108..7640f72568 100644 --- a/org.eclipse.egit.ui/icons/elcl16/delete.svg +++ b/org.eclipse.egit.ui/icons/elcl16/delete.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -102,17 +70,13 @@ + id="x"> x diff --git a/org.eclipse.egit.ui/icons/elcl16/expandall.svg b/org.eclipse.egit.ui/icons/elcl16/expandall.svg index cbf10848a6..bb7d780e8e 100644 --- a/org.eclipse.egit.ui/icons/elcl16/expandall.svg +++ b/org.eclipse.egit.ui/icons/elcl16/expandall.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4-7"> + xlink:href="#linearGradient4910-4-4" /> + xlink:href="#linearGradient4910-4-4-2" /> + id="linearGradient4994-4-7-4"> + xlink:href="#linearGradient4989" /> + xlink:href="#linearGradient4989-1" /> - - - @@ -244,75 +198,49 @@ + id="rect3997-9-1" /> + id="rect3997-9-1-1" /> + id="rect4853-82-7" /> + id="rect4853-82-0" /> + id="rect3997-9-1-2" /> + id="rect3997-9-1-1-2" /> + id="rect4853-82-0-6-8" /> + id="rect4853-82-7-1" /> + id="rect4853-82-0-6" /> + id="rect4853-82-0-6-8-41" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient3967"> + id="linearGradient3973"> + id="linearGradient4807-2-8"> - - - @@ -470,29 +398,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> @@ -594,13 +491,10 @@ id="rect13693-3" style="display:inline;fill:#fdf7eb;fill-opacity:0.90588236;stroke:url(#linearGradient3251);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg index f87bcafe33..d2c1b2ef4d 100644 --- a/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg +++ b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> - - - @@ -334,34 +272,26 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg index 1a3adb3916..ad77b57abb 100644 --- a/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg +++ b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient3973"> + id="linearGradient3967"> - - - @@ -448,29 +378,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> @@ -572,13 +471,10 @@ id="rect13693-3" style="display:inline;fill:#fdf7eb;fill-opacity:0.90532547;stroke:url(#linearGradient3110);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg index 7e990f4ffa..d2c1b2ef4d 100644 --- a/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg +++ b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> - - - @@ -334,34 +272,26 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg index b12b30e85d..dfa8b9f27b 100644 --- a/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg +++ b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878-7" /> + xlink:href="#linearGradient4922-8" /> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4883-4"> + id="linearGradient4910-4-4"> + xlink:href="#linearGradient4883-4" /> + id="linearGradient4877-6"> + id="linearGradient5147-4"> - - - @@ -459,29 +386,21 @@ + id="path4108-1" /> + id="path4108" /> + id="path4108-9" /> + id="rect3997-9-1" /> + id="rect3997-9-1-1" /> + id="rect4853-82-7-6" /> + id="rect4853-82-0-1" /> + id="rect3997-9-1-2" /> + id="rect3997-9-1-1-2" /> + id="rect4853-82-0-6-8" /> + id="rect4853-82-7-1" /> + id="rect4853-82-0-6" /> + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> image/svg+xml \ No newline at end of file + id="path2" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg b/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg index 8d169aea0f..266db5f020 100644 --- a/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg +++ b/org.eclipse.egit.ui/icons/elcl16/flatLayout.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4980"> + id="linearGradient4974"> - - - @@ -213,32 +170,24 @@ + id="rect4035-1-1-5-2-2-6-5" /> + id="rect4035-1-1-5-2-2-6-5-2" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -252,15 +201,11 @@ + id="rect4035-1-7-1" /> + id="rect4035-1-7-4-5" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -286,15 +229,11 @@ + id="rect4035-1-7-1-5" /> + id="rect4035-1-7-4-5-1" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -320,22 +257,16 @@ + id="rect4035-1-7-1-5-2" /> + id="rect4035-1-7-4-5-1-3" /> + id="rect4035-1-1-5-2-2-6" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/goto_input.svg b/org.eclipse.egit.ui/icons/elcl16/goto_input.svg index 3d44978b3e..fbfdcd0da0 100644 --- a/org.eclipse.egit.ui/icons/elcl16/goto_input.svg +++ b/org.eclipse.egit.ui/icons/elcl16/goto_input.svg @@ -1,24 +1,20 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient16147" /> - - - @@ -170,88 +133,61 @@ + id="rect3997-9" /> + id="rect4816-1-1-4" /> + id="rect4816-1-1-4-8" /> + id="rect4816-1-1-4-8-5" /> + id="rect4816-1-1-4-8-5-5" /> + id="rect4816-1-1-4-8-5-5-4" /> + id="rect4816-1-1-4-8-5-5-4-1" /> + id="rect4816-1-1-4-8-5-5-4-1-6" /> + id="rect4816-1-1-4-8-2" /> + id="rect4816-1-1-4-8-5-3" /> + id="path4108-1-2" /> + id="path4108-1-6-4" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg b/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg index abf0becaf1..b912a8209e 100644 --- a/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg +++ b/org.eclipse.egit.ui/icons/elcl16/hide_untracked.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -123,8 +88,6 @@ @@ -132,36 +95,27 @@ id="g4180" transform="translate(-1,0)"> + id="path3109" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg b/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg index ec2eebd631..353ac83d81 100644 --- a/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg +++ b/org.eclipse.egit.ui/icons/elcl16/hierarchicalLayout.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4980"> + id="linearGradient4974"> - - - @@ -211,32 +168,24 @@ + id="rect4035-1-1-5-2-2-6-5" /> + id="rect4035-1-1-5-2-2-6-5-2" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -250,15 +199,11 @@ + id="rect4035-1-7-1" /> + id="rect4035-1-7-4-5" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -284,15 +227,11 @@ + id="rect4035-1-7-1-5" /> + id="rect4035-1-7-4-5-1" /> + style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" /> @@ -318,37 +255,28 @@ + id="rect4035-1-7-1-5-2" /> + id="rect4035-1-7-4-5-1-3" /> + id="rect4035-1-1-5-2" /> + id="rect4035-1-1-5-2-2" /> + id="rect4035-1-1-5-2-2-1" /> + id="rect4035-1-1-5-2-2-6" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg b/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg index 45d267e087..3d3b2fc057 100644 --- a/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg +++ b/org.eclipse.egit.ui/icons/elcl16/horizontal_view.svg @@ -2,25 +2,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4810"> + id="linearGradient5067"> + xlink:href="#linearGradient4962-2" /> + xlink:href="#linearGradient4910-4" /> + id="linearGradient4994-4"> + xlink:href="#linearGradient4810" /> + xlink:href="#linearGradient4962-2-2" /> + xlink:href="#linearGradient5057-7" /> + xlink:href="#linearGradient5057-4" /> + xlink:href="#linearGradient4962-2-2-7" /> + xlink:href="#linearGradient5057-7-4" /> + id="linearGradient4994-4-4"> + xlink:href="#linearGradient4910-4-7" /> + xlink:href="#linearGradient4962-2-7" /> + id="linearGradient4810-7"> + xlink:href="#linearGradient4810-7" /> + xlink:href="#linearGradient4828-8" /> + xlink:href="#linearGradient4818" /> + id="linearGradient4994-4-3"> + xlink:href="#linearGradient4910-4-8" /> + id="linearGradient4810-77"> + xlink:href="#linearGradient4810-77" /> - - - @@ -566,8 +491,6 @@ @@ -588,113 +511,68 @@ + id="rect4816-1-1-4" /> + id="rect4816-1-1-4-2" /> + id="rect4853-82-7" /> + id="rect4853-82-0" /> + id="rect4816-1-1-4-1" /> + id="rect4816-1-1-4-27" /> + id="rect4853-82-7-5" /> + id="rect4853-82-0-4" /> + id="rect4816-1-1-4-1-3" /> + id="rect4816-1-1-4-4" /> + id="rect4853-82-7-9" /> + id="rect4853-82-0-8" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/next_nav.svg b/org.eclipse.egit.ui/icons/elcl16/next_nav.svg index 80b0a7929a..0f2d7e3c3b 100644 --- a/org.eclipse.egit.ui/icons/elcl16/next_nav.svg +++ b/org.eclipse.egit.ui/icons/elcl16/next_nav.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -100,15 +70,12 @@ + id="rect3968" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg b/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg index e76c2fc983..bbad426201 100644 --- a/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg +++ b/org.eclipse.egit.ui/icons/elcl16/prev_nav.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -100,15 +70,12 @@ + id="rect3968" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/preview.svg b/org.eclipse.egit.ui/icons/elcl16/preview.svg index 128d5fb8fa..8363b08276 100644 --- a/org.eclipse.egit.ui/icons/elcl16/preview.svg +++ b/org.eclipse.egit.ui/icons/elcl16/preview.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147"> + id="linearGradient4877"> - - - @@ -231,23 +186,17 @@ + id="rect4001-3" /> + id="rect4001" /> + id="path4271" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg b/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg index d74866efc3..bf2b3edb72 100644 --- a/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg +++ b/org.eclipse.egit.ui/icons/elcl16/progress_stop.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(0.397748,0.19882835)" + xlink:href="#linearGradient4729" + id="linearGradient4735" + x1="7.5007138" + y1="1040.3939" + x2="7.5007138" + y2="1048.3102" + gradientUnits="userSpaceOnUse" /> + id="linearGradient4729"> + id="stop4731" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="stop-color:#f07878;stop-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient4760" /> - - - @@ -4537,8 +130,6 @@ diff --git a/org.eclipse.egit.ui/icons/elcl16/refresh.svg b/org.eclipse.egit.ui/icons/elcl16/refresh.svg index 8f95efcf9a..a433c11aa7 100644 --- a/org.eclipse.egit.ui/icons/elcl16/refresh.svg +++ b/org.eclipse.egit.ui/icons/elcl16/refresh.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,53 +105,35 @@ image/svg+xml - + + id="path7582" /> + id="path7602" /> + id="path7582-7" /> + id="path7602-2" /> + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - + id="defs4" /> @@ -96,45 +21,38 @@ image/svg+xml - + + id="tspan3003" + style="font-size:6px;line-height:1.25;font-family:sans-serif">  diff --git a/org.eclipse.egit.ui/icons/elcl16/skip.svg b/org.eclipse.egit.ui/icons/elcl16/skip.svg index 016bf8f889..b0a269a020 100644 --- a/org.eclipse.egit.ui/icons/elcl16/skip.svg +++ b/org.eclipse.egit.ui/icons/elcl16/skip.svg @@ -1,26 +1,23 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5275"> - - - @@ -144,27 +111,21 @@ + id="rect6259" /> + id="rect3968" /> + id="rect3968-7" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/start.svg b/org.eclipse.egit.ui/icons/elcl16/start.svg index 33348d9aa9..ca0a10b324 100644 --- a/org.eclipse.egit.ui/icons/elcl16/start.svg +++ b/org.eclipse.egit.ui/icons/elcl16/start.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient8190-8" /> + x="-0.36955386" + width="1.7391077" + y="-0.13034106" + height="1.2606821"> - - - @@ -226,15 +187,12 @@ + id="path8117" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5103-4" /> - - - @@ -149,34 +109,24 @@ + id="path4108-1" /> + id="path4108-1-6" /> + id="path4108-1-2" /> + id="path4108-1-6-4" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg b/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg index b44f6f0a99..f9588e69ca 100644 --- a/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg +++ b/org.eclipse.egit.ui/icons/elcl16/trash_flat.svg @@ -1,22 +1,19 @@ + + style="fill:#000000" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -25,14 +22,13 @@ image/svg+xml - + - - - + style="display:inline"> + d="m 30.026253,2.9209222 c 0,0 0,5.7561004 0,9.5900998 0,1.189 1.635185,1.9888 2.96101,1.9888 1.757376,4e-4 2.13047,0 3.093592,0 1.325826,0 2.96101,-0.7998 2.96101,-1.9887 0,-3.8339994 0,-9.5901998 0,-9.5901998" /> + style="fill:none;stroke:url(#linearGradient6198);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:url(#linearGradient6200);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="rect6322" /> + id="path5058" /> + id="path5058-1" /> diff --git a/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg b/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg index 6ca8a1679d..f9e082eb4e 100644 --- a/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg +++ b/org.eclipse.egit.ui/icons/elcl16/unstage_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -136,13 +81,11 @@ image/svg+xml - + diff --git a/org.eclipse.egit.ui/icons/etool16/annotate.svg b/org.eclipse.egit.ui/icons/etool16/annotate.svg index 379057016a..debfa4e64c 100644 --- a/org.eclipse.egit.ui/icons/etool16/annotate.svg +++ b/org.eclipse.egit.ui/icons/etool16/annotate.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -437,49 +83,37 @@ image/svg+xml - + + id="path3887" /> + id="path3876" /> + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path3874" /> diff --git a/org.eclipse.egit.ui/icons/etool16/createRepository.svg b/org.eclipse.egit.ui/icons/etool16/createRepository.svg index 40228a1189..d24f42d80a 100644 --- a/org.eclipse.egit.ui/icons/etool16/createRepository.svg +++ b/org.eclipse.egit.ui/icons/etool16/createRepository.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -160,13 +124,11 @@ image/svg+xml - + @@ -176,15 +138,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + transform="translate(0,1036.3622)" /> diff --git a/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg b/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg index 341efe91cc..a1996f7bfe 100644 --- a/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg +++ b/org.eclipse.egit.ui/icons/etool16/merge_ignore_left.svg @@ -4,25 +4,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4452"> + id="linearGradient4380"> + id="linearGradient4374"> + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -245,8 +197,6 @@ @@ -282,8 +232,6 @@ x="636.35394" y="301.04733" /> diff --git a/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg b/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg index 1e28b1e7c5..c0e642b709 100644 --- a/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg +++ b/org.eclipse.egit.ui/icons/etool16/merge_ignore_right.svg @@ -4,25 +4,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4452"> + id="linearGradient4380"> + id="linearGradient4374"> + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -245,8 +197,6 @@ @@ -282,8 +232,6 @@ x="636.35394" y="301.04733" /> diff --git a/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg index 9bf51b611b..d04d3302b1 100644 --- a/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg +++ b/org.eclipse.egit.ui/icons/etool16/newconnect_wiz.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + id="path4919" /> @@ -92,16 +75,6 @@ offset="1" id="stop10754-8-48" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -574,13 +228,11 @@ image/svg+xml - + @@ -602,7 +254,6 @@ id="rect10007-0-74-2-7-6" style="fill:url(#linearGradient3194);fill-opacity:1;stroke:none;display:inline" /> @@ -628,22 +279,17 @@ id="rect3123" style="fill:url(#linearGradient3196);fill-opacity:1;stroke:url(#linearGradient3198);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> + id="path3136" /> diff --git a/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg index 7787ab3601..2b83608b78 100644 --- a/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg +++ b/org.eclipse.egit.ui/icons/etool16/newgroup_wiz.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967-5"> + id="linearGradient3973-6"> + xlink:href="#linearGradient5068-6" /> + id="linearGradient5068-6"> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> + xlink:href="#linearGradient5068-6" /> - - - - - - - - - - + xlink:href="#linearGradient5068-6" /> - - - - - - - - - - + xlink:href="#linearGradient5068-6" /> - - - @@ -380,8 +246,6 @@ + id="rect13693" /> + id="path13797" /> + id="path5581-1-1" /> + id="path5581-1-1-8" /> + id="path5581-1-1-7" /> + id="path5581-1-1-6" /> + id="path5581-1-1-1" /> + id="path5581-1-1-89" /> + id="path5581-1-1-2" /> + id="path5581-1-1-79" /> diff --git a/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg b/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg index 9e8f6d4dcd..cc9940aa6b 100644 --- a/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg +++ b/org.eclipse.egit.ui/icons/etool16/newlocation_wiz.svg @@ -2,55 +2,18 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - + id="linearGradient4721-1"> - - - - + id="linearGradient3967"> - + id="linearGradient3973"> - - + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> - - - - - - - - - - - - - - - @@ -484,13 +215,11 @@ image/svg+xml - + @@ -509,14 +238,11 @@ + id="rect13693" /> + id="path13797" /> + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg b/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg index b17f3d3788..2ec7bb4a7f 100644 --- a/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg +++ b/org.eclipse.egit.ui/icons/eview16/rebase_interactive.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -97,13 +63,11 @@ image/svg+xml - + @@ -111,20 +75,14 @@ id="g3116" transform="translate(-2,-2.5082885e-5)"> diff --git a/org.eclipse.egit.ui/icons/eview16/reflog.svg b/org.eclipse.egit.ui/icons/eview16/reflog.svg index 5ca4994f8f..125dd7da0f 100644 --- a/org.eclipse.egit.ui/icons/eview16/reflog.svg +++ b/org.eclipse.egit.ui/icons/eview16/reflog.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -118,32 +83,25 @@ image/svg+xml - + @@ -153,18 +111,14 @@ style="display:inline" id="g4174"> diff --git a/org.eclipse.egit.ui/icons/eview16/repo_rep.svg b/org.eclipse.egit.ui/icons/eview16/repo_rep.svg index dba9ad2228..35484ef58d 100644 --- a/org.eclipse.egit.ui/icons/eview16/repo_rep.svg +++ b/org.eclipse.egit.ui/icons/eview16/repo_rep.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + id="linearGradient4721-1-2"> + xlink:href="#linearGradient4721-1-2" /> + id="linearGradient4721-1-2-6"> + xlink:href="#linearGradient4721-1-2-6" /> - - - @@ -285,13 +243,11 @@ image/svg+xml - + @@ -301,15 +257,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3868-1-1" /> + id="path3868-1-4-7" /> + id="path3868-1-1-4" /> + id="path3868-1-4-7-1" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> diff --git a/org.eclipse.egit.ui/icons/eview16/staging.svg b/org.eclipse.egit.ui/icons/eview16/staging.svg index f511d0382c..6bdc00dc55 100644 --- a/org.eclipse.egit.ui/icons/eview16/staging.svg +++ b/org.eclipse.egit.ui/icons/eview16/staging.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -117,26 +63,21 @@ image/svg+xml - + + id="path3873" /> + id="path3089" /> diff --git a/org.eclipse.egit.ui/icons/obj16/add.svg b/org.eclipse.egit.ui/icons/obj16/add.svg index a3c88ae0df..553ad064a0 100644 --- a/org.eclipse.egit.ui/icons/obj16/add.svg +++ b/org.eclipse.egit.ui/icons/obj16/add.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -99,16 +70,12 @@ + id="path5581" /> diff --git a/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg b/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg index 11ff90bcd6..97e89580d1 100644 --- a/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg +++ b/org.eclipse.egit.ui/icons/obj16/alphab_sort_co.svg @@ -1,35 +1,21 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - + xlink:href="#linearGradient4789-1" /> - - - @@ -150,28 +90,20 @@ + id="path4771" /> + id="path3986" /> + id="path4758" /> diff --git a/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg b/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg index 508c11163e..824c9a8041 100644 --- a/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg +++ b/org.eclipse.egit.ui/icons/obj16/annotated-tag.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> + width="1.5794848" + height="1.2146358" + x="-0.23393579" + y="-0.086642911"> - - - @@ -302,13 +255,11 @@ image/svg+xml - + @@ -348,14 +299,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> @@ -455,32 +402,21 @@ style="display:inline;filter:url(#filter4096)" id="g4004-6"> + style="fill:url(#linearGradient4000-5);fill-opacity:1;stroke:#ebb312;stroke-width:1.74999988;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> diff --git a/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg b/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg index 6580c94743..b52525c180 100644 --- a/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg +++ b/org.eclipse.egit.ui/icons/obj16/assume_unchanged.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,13 +43,11 @@ image/svg+xml - + @@ -96,8 +61,6 @@ + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/branch_obj.svg b/org.eclipse.egit.ui/icons/obj16/branch_obj.svg index b4d4032031..6189f6045f 100644 --- a/org.eclipse.egit.ui/icons/obj16/branch_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/branch_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -88,9 +56,7 @@ + id="path3091" /> diff --git a/org.eclipse.egit.ui/icons/obj16/branches_obj.svg b/org.eclipse.egit.ui/icons/obj16/branches_obj.svg index b71b88eda0..f35be7597a 100644 --- a/org.eclipse.egit.ui/icons/obj16/branches_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/branches_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -124,13 +71,11 @@ image/svg+xml - + @@ -139,12 +84,8 @@ + id="path3091" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - + id="linearGradient4877-6"> - - + id="linearGradient5147-4"> - + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - - @@ -374,33 +183,26 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> diff --git a/org.eclipse.egit.ui/icons/obj16/check_all.svg b/org.eclipse.egit.ui/icons/obj16/check_all.svg index 12193964d1..dfeff0f382 100644 --- a/org.eclipse.egit.ui/icons/obj16/check_all.svg +++ b/org.eclipse.egit.ui/icons/obj16/check_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4"> + id="linearGradient4994-4-1"> - - - @@ -189,8 +148,6 @@ @@ -198,19 +155,14 @@ id="g4084" transform="translate(-26,-20.000055)"> @@ -226,19 +178,14 @@ id="g3892" transform="matrix(0.45459079,0,0,0.45457615,-5.0464066,568.84683)"> @@ -253,7 +200,6 @@ + id="path4065" /> diff --git a/org.eclipse.egit.ui/icons/obj16/checkout.svg b/org.eclipse.egit.ui/icons/obj16/checkout.svg index 5ae02d478f..a8433fea00 100644 --- a/org.eclipse.egit.ui/icons/obj16/checkout.svg +++ b/org.eclipse.egit.ui/icons/obj16/checkout.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> + xlink:href="#linearGradient4721-1" /> - - - @@ -139,13 +103,11 @@ image/svg+xml - + @@ -156,15 +118,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg index 05286eee0b..0caf0f1568 100644 --- a/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg +++ b/org.eclipse.egit.ui/icons/obj16/cherry-pick.svg @@ -6,10 +6,6 @@ height="16" id="svg2" version="1.1" - inkscape:version="1.4.3 (0d15f750, 2025-12-25)" - sodipodi:docname="cherrypick.svg" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" @@ -30,7 +26,6 @@ id="stop3813" /> - - - @@ -96,8 +57,6 @@ @@ -120,14 +79,10 @@ d="m 10.961911,1049.9718 -1.9049442,-3.2301 0.02692,-0.016 v 0" id="path1-3-3-7-4-1" /> diff --git a/org.eclipse.egit.ui/icons/obj16/clean_obj.svg b/org.eclipse.egit.ui/icons/obj16/clean_obj.svg index c3e4a2e637..a3f3a4ff49 100644 --- a/org.eclipse.egit.ui/icons/obj16/clean_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/clean_obj.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient11290" /> + xlink:href="#linearGradient11290" /> + id="linearGradient3967-5"> + id="linearGradient3973-6"> - + xlink:href="#linearGradient3955-1" /> - - - - @@ -276,20 +211,17 @@ image/svg+xml - + + id="layer1-2"> + id="rect13693" /> + id="path13797" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,8 +108,6 @@ @@ -154,26 +116,21 @@ + id="line"> line + id="lightarea"> lightarea + id="darkarea"> darkarea + id="divider"> divider + id="eraser"> eraser diff --git a/org.eclipse.egit.ui/icons/obj16/cloneGit.svg b/org.eclipse.egit.ui/icons/obj16/cloneGit.svg index f85763e111..06bb660c4a 100644 --- a/org.eclipse.egit.ui/icons/obj16/cloneGit.svg +++ b/org.eclipse.egit.ui/icons/obj16/cloneGit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4029" /> + xlink:href="#linearGradient3950" /> + id="linearGradient4721-1-9"> + xlink:href="#linearGradient4721-1-9" /> - - - - - @@ -205,27 +148,22 @@ image/svg+xml - + + id="path4126" /> + id="path3125" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path7602" /> @@ -276,21 +202,15 @@ + id="path7602-2-3" /> diff --git a/org.eclipse.egit.ui/icons/obj16/commit.svg b/org.eclipse.egit.ui/icons/obj16/commit.svg index 3125fb13b5..046e8ffec4 100644 --- a/org.eclipse.egit.ui/icons/obj16/commit.svg +++ b/org.eclipse.egit.ui/icons/obj16/commit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - @@ -183,19 +103,15 @@ image/svg+xml - + @@ -207,22 +123,14 @@ id="path3868" style="fill:none;stroke:#c99d19;stroke-width:0.75741528999999985;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m 26.128192,1044.4362 c 0,0.5523 -1.119287,1 -2.499999,1 -1.380712,0 -2.5,-0.4477 -2.5,-1 0,-0.5523 1.119288,-1.0001 2.5,-1.0001 1.380712,0 2.499999,0.4478 2.499999,1.0001 z" - sodipodi:cx="23.628193" - sodipodi:cy="1044.4362" - sodipodi:rx="2.4999995" - sodipodi:ry="1.0000277" transform="matrix(1.3898503,0,0,1.3674896,-21.818685,-387.98391)" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/commit_amend.svg b/org.eclipse.egit.ui/icons/obj16/commit_amend.svg index f0a50d3ead..ca79c50b1f 100644 --- a/org.eclipse.egit.ui/icons/obj16/commit_amend.svg +++ b/org.eclipse.egit.ui/icons/obj16/commit_amend.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - @@ -249,33 +203,26 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> @@ -343,14 +286,10 @@ id="g3909" transform="translate(15.866796,-4.6488344)"> diff --git a/org.eclipse.egit.ui/icons/obj16/current_step.svg b/org.eclipse.egit.ui/icons/obj16/current_step.svg index dc89601eeb..db320181e6 100644 --- a/org.eclipse.egit.ui/icons/obj16/current_step.svg +++ b/org.eclipse.egit.ui/icons/obj16/current_step.svg @@ -4,24 +4,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -112,20 +80,17 @@ image/svg+xml - + diff --git a/org.eclipse.egit.ui/icons/obj16/delete_obj.svg b/org.eclipse.egit.ui/icons/obj16/delete_obj.svg index 9af37d524e..99b0ed5252 100644 --- a/org.eclipse.egit.ui/icons/obj16/delete_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/delete_obj.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -102,16 +70,12 @@ + id="rect4043" /> diff --git a/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg b/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg index b807bfd0fb..9c96294b19 100644 --- a/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg +++ b/org.eclipse.egit.ui/icons/obj16/disconnect_co.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4962-2-7" /> - - - @@ -100,52 +68,35 @@ + id="path4874-4" /> + id="path4894" /> + id="path4894-8" /> diff --git a/org.eclipse.egit.ui/icons/obj16/done_step.svg b/org.eclipse.egit.ui/icons/obj16/done_step.svg index 4ce9594d0f..06518b4b50 100644 --- a/org.eclipse.egit.ui/icons/obj16/done_step.svg +++ b/org.eclipse.egit.ui/icons/obj16/done_step.svg @@ -2,21 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4019"> - - - - @@ -124,13 +80,11 @@ image/svg+xml - + @@ -138,14 +92,10 @@ id="g4241" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,738.69742,301.29041)"> diff --git a/org.eclipse.egit.ui/icons/obj16/editconfig.svg b/org.eclipse.egit.ui/icons/obj16/editconfig.svg index 74eb4f9104..a7103587fb 100644 --- a/org.eclipse.egit.ui/icons/obj16/editconfig.svg +++ b/org.eclipse.egit.ui/icons/obj16/editconfig.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4-5"> + id="linearGradient4810-5"> + id="linearGradient4908-52-3-2-6"> + x="-0.098946937" + y="-0.10066635" + width="1.1978939" + height="1.2013327"> + stdDeviation="0.22207033" /> @@ -204,7 +195,6 @@ style="stop-color:#4d4d4d;stop-opacity:1" /> + x="-0.34969947" + width="1.6994111" + y="-0.35042714" + height="1.7008444"> - - - @@ -312,32 +269,22 @@ @@ -345,8 +292,6 @@ id="g7581" mask="url(#mask7584)"> @@ -356,75 +301,52 @@ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,726.06628,283.93164)"> + id="path5226-6-14-1-5-9" /> + id="path5424-7" /> + id="path5226-6-14-1-5-2-9" /> + id="path5226-6-14-1-5-2-7-1" /> + id="path5426-9" /> + id="path5006-1-8" /> + style="fill:#f5b9ac;fill-opacity:1;stroke:url(#linearGradient12300);stroke-width:0.2935867;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> diff --git a/org.eclipse.egit.ui/icons/obj16/fetch.svg b/org.eclipse.egit.ui/icons/obj16/fetch.svg index 4de2e90ed8..e9173523e1 100644 --- a/org.eclipse.egit.ui/icons/obj16/fetch.svg +++ b/org.eclipse.egit.ui/icons/obj16/fetch.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - @@ -133,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg b/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg index c7c439d263..0d264b9e72 100644 --- a/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg +++ b/org.eclipse.egit.ui/icons/obj16/first_parent_only.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - + xlink:href="#x-bg-3" /> + id="x-bg-3"> + xlink:href="#x-stroke-6" /> + id="x-stroke-6"> - - - @@ -128,13 +83,11 @@ image/svg+xml - + @@ -143,17 +96,12 @@ + id="path3091" /> diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-down.svg b/org.eclipse.egit.ui/icons/obj16/fixup-down.svg index 9811742d7a..a4a3ff1941 100644 --- a/org.eclipse.egit.ui/icons/obj16/fixup-down.svg +++ b/org.eclipse.egit.ui/icons/obj16/fixup-down.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,26 +43,21 @@ image/svg+xml - + @@ -103,8 +65,6 @@ + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-up.svg b/org.eclipse.egit.ui/icons/obj16/fixup-up.svg index da5364367b..f6d14f4fcf 100644 --- a/org.eclipse.egit.ui/icons/obj16/fixup-up.svg +++ b/org.eclipse.egit.ui/icons/obj16/fixup-up.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -76,13 +43,11 @@ image/svg+xml - + @@ -90,13 +55,10 @@ id="g4716" transform="translate(0,-7)"> @@ -104,8 +66,6 @@ + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg b/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg index fbde6bce41..cc53f46467 100644 --- a/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg +++ b/org.eclipse.egit.ui/icons/obj16/gerrit_fetch.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865-9" /> - - - @@ -144,21 +109,18 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg b/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg index e840ba7e40..3bed739c07 100644 --- a/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/gerrit_obj.svg @@ -2,23 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -54,7 +45,6 @@ id="stop3813-3" /> - - - @@ -111,13 +73,11 @@ image/svg+xml - + @@ -143,13 +103,8 @@ + style="fill:url(#radialGradient4090);fill-opacity:1;stroke:none;display:inline" /> @@ -209,13 +164,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -144,21 +109,18 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/gitrepository.svg b/org.eclipse.egit.ui/icons/obj16/gitrepository.svg index 812b204ffe..d9ddc44948 100644 --- a/org.eclipse.egit.ui/icons/obj16/gitrepository.svg +++ b/org.eclipse.egit.ui/icons/obj16/gitrepository.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -164,8 +128,6 @@ @@ -175,15 +137,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> diff --git a/org.eclipse.egit.ui/icons/obj16/history.svg b/org.eclipse.egit.ui/icons/obj16/history.svg index 4af96a4c61..fd8e156b50 100644 --- a/org.eclipse.egit.ui/icons/obj16/history.svg +++ b/org.eclipse.egit.ui/icons/obj16/history.svg @@ -1,26 +1,23 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4322"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -330,7 +159,6 @@ style="stop-color:#c99d19;stop-opacity:1" /> + id="linearGradient4721-1"> - - - @@ -410,13 +207,11 @@ image/svg+xml - + @@ -428,17 +223,7 @@ y="1034.9207" x="-1.5280007" id="image4319" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbxJREFU -OI2Nk09sTEEcxz/z3ttng9ImJKInJA44rzTphXATQQQHpCniIC4u6LVNhDYSvQhuSBxIozcHskfS -BD01cWi71UhaRRvdzu78eTMO1jbLm9TvNPObbz7z+33nN8J7Tyjevih5XZmGNMYZR31e0l7aQ9fJ -MfFHI0KA8tOdvnvXetheItp2kOznBOrHR/znKd7PGw6cnRIAUej2dDmDOIZMAaLlbPH1l+Y6CQEW -Z2O+ti3QsWWORJbR3z5RrUySjS+xuWPT2oDivtOwt4tlsZs464StH9gY3cInFZJX3/MBzx5daDFk -YWy0BXr40ClSbiOiVdk/FRw7/yC3opePL69uRACgbILLHFcHRlDaUasrpDI8v9eLcvndtmRrNsF4 -uHvzBAC+8UY2cyhVAKBanmFpNgRQKcbA9TsjaG1ZqRtqyvBksIeqSZs6ub8tH7Biimjr6b92/HcF -jby2HqlT3r2ZY8OOTs5cmhS5AKlSlHUMDI+itUM2PLjffw6pihy52CegL+yBtEVsBjeuHAUvmgOo -LEi7LsfCv1/BFLDW4wCEJ/IC12ikbgprA7RNGBp+mCsMDW3wN/5v/AJczcNxJFjGigAAAABJRU5E -rkJggg== -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbxJREFU OI2Nk09sTEEcxz/z3ttng9ImJKInJA44rzTphXATQQQHpCniIC4u6LVNhDYSvQhuSBxIozcHskfS BD01cWi71UhaRRvdzu78eTMO1jbLm9TvNPObbz7z+33nN8J7Tyjevih5XZmGNMYZR31e0l7aQ9fJ MfFHI0KA8tOdvnvXetheItp2kOznBOrHR/znKd7PGw6cnRIAUej2dDmDOIZMAaLlbPH1l+Y6CQEW Z2O+ti3QsWWORJbR3z5RrUySjS+xuWPT2oDivtOwt4tlsZs464StH9gY3cInFZJX3/MBzx5daDFk YWy0BXr40ClSbiOiVdk/FRw7/yC3opePL69uRACgbILLHFcHRlDaUasrpDI8v9eLcvndtmRrNsF4 uHvzBAC+8UY2cyhVAKBanmFpNgRQKcbA9TsjaG1ZqRtqyvBksIeqSZs6ub8tH7Biimjr6b92/HcF jby2HqlT3r2ZY8OOTs5cmhS5AKlSlHUMDI+itUM2PLjffw6pihy52CegL+yBtEVsBjeuHAUvmgOo LEi7LsfCv1/BFLDW4wCEJ/IC12ikbgprA7RNGBp+mCsMDW3wN/5v/AJczcNxJFjGigAAAABJRU5E rkJggg== " style="image-rendering:optimizeSpeed" preserveAspectRatio="none" height="17.118193" @@ -448,8 +233,6 @@ rkJggg== id="g4537" transform="matrix(1.4869828,0,0,1.3418433,-8.8456538,-364.69538)"> @@ -461,8 +244,6 @@ rkJggg== id="path3868" style="display:inline;fill:none;stroke:url(#linearGradient4800-4);stroke-width:0.75741529;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -471,30 +252,23 @@ rkJggg== style="display:inline;opacity:0.73999999;fill:url(#linearGradient4482-7);fill-opacity:1;stroke:none;stroke-width:1.06988704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2.5999999;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4389)" d="m 22.009514,1039.2002 6.419323,0 0,7.1505 -6.419323,0 z" id="rect4466-0" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccc" transform="matrix(0.99050735,0,0,1,0.20892857,0)" /> + id="rect4466" /> + id="path4484" /> + id="path4484-7" /> + id="path4484-75" /> diff --git a/org.eclipse.egit.ui/icons/obj16/ignore.svg b/org.eclipse.egit.ui/icons/obj16/ignore.svg index ccbe68116f..2d6fb94893 100644 --- a/org.eclipse.egit.ui/icons/obj16/ignore.svg +++ b/org.eclipse.egit.ui/icons/obj16/ignore.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - - - - - - - - - - + xlink:href="#linearGradient4852-7-29-2" /> + xlink:href="#linearGradient4844-4-9-7" /> + xlink:href="#linearGradient4852-7-2" /> - - - @@ -313,13 +224,11 @@ image/svg+xml - + @@ -335,20 +244,15 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="rect4043-2-7-1" /> diff --git a/org.eclipse.egit.ui/icons/obj16/import_obj.svg b/org.eclipse.egit.ui/icons/obj16/import_obj.svg index 6047857704..e09c37fe42 100644 --- a/org.eclipse.egit.ui/icons/obj16/import_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/import_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -93,7 +87,6 @@ id="stop10754-8-48" /> + xlink:href="#linearGradient10448-9-7-0-5-9" /> - - - @@ -247,13 +207,11 @@ image/svg+xml - + @@ -275,7 +233,6 @@ id="rect10007-0-74-2-7-6" style="fill:url(#linearGradient4464);fill-opacity:1;stroke:none;display:inline" /> @@ -301,28 +258,22 @@ id="rect3123" style="fill:url(#linearGradient4090-5);fill-opacity:1;stroke:url(#linearGradient4092-7);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="path3048" /> + id="path3050" /> + id="path3052" /> + id="path4466" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - + id="path4919" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient3859" /> - - - @@ -377,13 +71,11 @@ image/svg+xml - + @@ -398,19 +90,15 @@ + id="path3089" /> + id="path5046" /> + id="path5068" /> diff --git a/org.eclipse.egit.ui/icons/obj16/merge.svg b/org.eclipse.egit.ui/icons/obj16/merge.svg index 7a05f7a261..ca13be0123 100644 --- a/org.eclipse.egit.ui/icons/obj16/merge.svg +++ b/org.eclipse.egit.ui/icons/obj16/merge.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -88,9 +56,7 @@ + id="path2989" /> diff --git a/org.eclipse.egit.ui/icons/obj16/mergetool.svg b/org.eclipse.egit.ui/icons/obj16/mergetool.svg index 14fd18c118..a0d486d329 100644 --- a/org.eclipse.egit.ui/icons/obj16/mergetool.svg +++ b/org.eclipse.egit.ui/icons/obj16/mergetool.svg @@ -1,27 +1,23 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4309"> - - - @@ -183,13 +141,11 @@ image/svg+xml - + @@ -214,14 +170,7 @@ y="259.83359" x="548.55072" id="image4247" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUVJREFU -OI2dkr1KA0EUhb9ZN7E1iAn4MhJBsQpY+g5CQBIhqEgKC03QRrCzFYMgRDAQQeJjxMYuoCCW/mTx -WMzsZvO3qBeGu8w58+3MvddIIh73BzkBLO88G0ZikuaNGvKV7ui5ochXuhEIwA8/2tWsVvYeAQgC -cVfNSsZgwhsaQANIu5rV6v6LMZK43V3Q2naTyGlkswQmlhFoQGodFTBhDa7L8yps1QG4OSk5r3Es -65Eg9DSPS6zXXg2SonVZzCjonatRnFN8P1yNSM9EuhntwsVmRgAbp29jXZikjQH+Gj5Ap3X4b4oP -EHx7LC6VJxp6D7XpWqduAZ/9FAC5WWyHXKcM8JSkBb4FfDiThzPEcrKWtoD3fhqAmbjJVSVZSznA -lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUVJREFU OI2dkr1KA0EUhb9ZN7E1iAn4MhJBsQpY+g5CQBIhqEgKC03QRrCzFYMgRDAQQeJjxMYuoCCW/mTx WMzsZvO3qBeGu8w58+3MvddIIh73BzkBLO88G0ZikuaNGvKV7ui5ochXuhEIwA8/2tWsVvYeAQgC cVfNSsZgwhsaQANIu5rV6v6LMZK43V3Q2naTyGlkswQmlhFoQGodFTBhDa7L8yps1QG4OSk5r3Es 65Eg9DSPS6zXXg2SonVZzCjonatRnFN8P1yNSM9EuhntwsVmRgAbp29jXZikjQH+Gj5Ap3X4b4oP EHx7LC6VJxp6D7XpWqduAZ/9FAC5WWyHXKcM8JSkBb4FfDiThzPEcrKWtoD3fhqAmbjJVSVZSznA lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= " style="image-rendering:optimizeSpeed" preserveAspectRatio="none" height="57.340881" @@ -229,15 +178,11 @@ lzV5np0Z4QbwF5ofXiX+FzF4Z6IWpO0c1M+uQnZUp+GYrv0APjfG9pTo1OoAAAAASUVORK5CYII= + id="rect3968" /> + id="rect3968-6" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -94,13 +63,11 @@ image/svg+xml - + @@ -109,16 +76,12 @@ + id="path3091" /> diff --git a/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg b/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg index b3299162ad..d4bbd19ba4 100644 --- a/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg +++ b/org.eclipse.egit.ui/icons/obj16/new_tag_obj.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - @@ -261,13 +207,11 @@ image/svg+xml - + @@ -307,14 +251,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> @@ -414,8 +354,6 @@ id="g3969" transform="matrix(3.5838051,0,0,3.5838051,596.74509,-3425.9255)"> diff --git a/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg b/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg index a9ddd7b1d9..21b83600d0 100644 --- a/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg +++ b/org.eclipse.egit.ui/icons/obj16/no_assume_unchanged.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - @@ -128,17 +48,13 @@ + id="path3873" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="path4919" /> @@ -76,7 +67,6 @@ id="stop4898-5-0" /> - - - @@ -151,13 +111,11 @@ image/svg+xml - + @@ -187,9 +145,7 @@ + id="path4884-7" /> diff --git a/org.eclipse.egit.ui/icons/obj16/open-commit.svg b/org.eclipse.egit.ui/icons/obj16/open-commit.svg index cc9f3d511a..fb630aad28 100644 --- a/org.eclipse.egit.ui/icons/obj16/open-commit.svg +++ b/org.eclipse.egit.ui/icons/obj16/open-commit.svg @@ -2,25 +2,20 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3973"> + id="linearGradient3967"> + x="-0.33426729" + width="1.6685346" + y="-0.42999801" + height="1.859996"> + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="path7826-6" /> + id="path7828-7" /> + x="-0.34675294" + width="1.6935059" + y="-0.34675294" + height="1.6935059"> - - - @@ -416,13 +347,11 @@ image/svg+xml - + @@ -445,14 +374,11 @@ + id="rect13693" /> + id="path13797" /> @@ -474,19 +395,14 @@ id="g3657" transform="translate(-3.5838077,0)"> @@ -546,20 +462,14 @@ id="g3232" transform="matrix(0.50000003,0,0,0.5,291.20492,170.97584)"> diff --git a/org.eclipse.egit.ui/icons/obj16/pull.svg b/org.eclipse.egit.ui/icons/obj16/pull.svg index 1cd131cd9a..4ad657f7de 100644 --- a/org.eclipse.egit.ui/icons/obj16/pull.svg +++ b/org.eclipse.egit.ui/icons/obj16/pull.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg b/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg index f4b6fd173b..28e2abe318 100644 --- a/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg +++ b/org.eclipse.egit.ui/icons/obj16/pull_with_options.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,32 +88,25 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> + d="m 8.532401,1042.3622 -1.488,0 c 0,0 -0.01538,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 l 0.25,-0.2265 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.363716,0.01 -0.564257,0.194 -0.206443,0.1907 -0.171121,0.7023 -0.171121,0.7023 l -1.027773,0 c 0,0 0.0033,-0.8705 0.230561,-1.2142 0.209451,-0.3168 0.686234,-0.5818 0.946652,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.08181,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/org.eclipse.egit.ui/icons/obj16/push.svg b/org.eclipse.egit.ui/icons/obj16/push.svg index 9a0a5254e0..84483741ad 100644 --- a/org.eclipse.egit.ui/icons/obj16/push.svg +++ b/org.eclipse.egit.ui/icons/obj16/push.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865" /> - - - @@ -122,26 +88,21 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/rebase.svg b/org.eclipse.egit.ui/icons/obj16/rebase.svg index d26b3d8e91..196965716a 100644 --- a/org.eclipse.egit.ui/icons/obj16/rebase.svg +++ b/org.eclipse.egit.ui/icons/obj16/rebase.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - @@ -164,33 +63,25 @@ image/svg+xml - + + id="path3873" /> + id="path3868" /> + id="path3098" /> diff --git a/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg b/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg index b17f3d3788..2ec7bb4a7f 100644 --- a/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg +++ b/org.eclipse.egit.ui/icons/obj16/rebase_interactive.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -97,13 +63,11 @@ image/svg+xml - + @@ -111,20 +75,14 @@ id="g3116" transform="translate(-2,-2.5082885e-5)"> diff --git a/org.eclipse.egit.ui/icons/obj16/refresh.svg b/org.eclipse.egit.ui/icons/obj16/refresh.svg index 8f95efcf9a..a433c11aa7 100644 --- a/org.eclipse.egit.ui/icons/obj16/refresh.svg +++ b/org.eclipse.egit.ui/icons/obj16/refresh.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -144,53 +105,35 @@ image/svg+xml - + + id="path7582" /> + id="path7602" /> + id="path7582-7" /> + id="path7602-2" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -117,13 +83,11 @@ image/svg+xml - + @@ -133,15 +97,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg b/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg index b940820dd5..14125702d4 100644 --- a/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg +++ b/org.eclipse.egit.ui/icons/obj16/repository_gerrit.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -139,13 +104,11 @@ image/svg+xml - + @@ -155,15 +118,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4721-1"> - - - @@ -117,13 +83,11 @@ image/svg+xml - + @@ -133,15 +97,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> diff --git a/org.eclipse.egit.ui/icons/obj16/reset.svg b/org.eclipse.egit.ui/icons/obj16/reset.svg index e12a69ffe4..e2cc5cea69 100644 --- a/org.eclipse.egit.ui/icons/obj16/reset.svg +++ b/org.eclipse.egit.ui/icons/obj16/reset.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -99,39 +63,29 @@ image/svg+xml - + + id="path4108-1" /> + id="path4108-1-6" /> + id="path4108-1-8" /> + id="path4108-1-6-4" /> diff --git a/org.eclipse.egit.ui/icons/obj16/revert.svg b/org.eclipse.egit.ui/icons/obj16/revert.svg index dc6cfe16a8..fb21a6796d 100644 --- a/org.eclipse.egit.ui/icons/obj16/revert.svg +++ b/org.eclipse.egit.ui/icons/obj16/revert.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> - - - @@ -205,13 +163,11 @@ image/svg+xml - + @@ -222,15 +178,11 @@ + id="rect4001-3-3" /> + id="rect4001-9" /> + id="path3887" /> + id="path3891" /> + id="path3115" /> diff --git a/org.eclipse.egit.ui/icons/obj16/reword.svg b/org.eclipse.egit.ui/icons/obj16/reword.svg index 6620a0af31..08ad19fd11 100644 --- a/org.eclipse.egit.ui/icons/obj16/reword.svg +++ b/org.eclipse.egit.ui/icons/obj16/reword.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + id="linearGradient5135-7"> - + id="linearGradient4908-52-3-2-6"> + x="-0.098946937" + y="-0.10066635" + width="1.1978939" + height="1.2013327"> + stdDeviation="0.22207033" /> - - - - - - - - - - - - + x="-0.34970048" + width="1.6994131" + y="-0.35042816" + height="1.7008464"> - - - @@ -520,13 +339,11 @@ image/svg+xml - + @@ -539,20 +356,15 @@ + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + id="path5226-6-14-1-5-9-9" /> + id="path5226-6-14-1-5-9" /> + id="path5424-7" /> + id="path5226-6-14-1-5-2-9" /> + id="path5226-6-14-1-5-2-7-1" /> + id="path5426-9" /> + id="path5006-1-8" /> + style="fill:#f5b9ac;fill-opacity:1;stroke:url(#linearGradient3133);stroke-width:0.2935867;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> diff --git a/org.eclipse.egit.ui/icons/obj16/search-commit.svg b/org.eclipse.egit.ui/icons/obj16/search-commit.svg index c54a34874c..947ff79b03 100644 --- a/org.eclipse.egit.ui/icons/obj16/search-commit.svg +++ b/org.eclipse.egit.ui/icons/obj16/search-commit.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + xlink:href="#linearGradient5141-4" /> - - - @@ -382,13 +329,11 @@ image/svg+xml - + @@ -403,60 +348,43 @@ id="g5359" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,730.34515,280.80707)"> + style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.0003444;stroke-linejoin:round;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -487,20 +415,14 @@ id="g3232" transform="matrix(0.14926692,0,0,0.14926692,-53.85862,981.77854)"> diff --git a/org.eclipse.egit.ui/icons/obj16/settings.svg b/org.eclipse.egit.ui/icons/obj16/settings.svg index 12b29c2150..12f05729aa 100644 --- a/org.eclipse.egit.ui/icons/obj16/settings.svg +++ b/org.eclipse.egit.ui/icons/obj16/settings.svg @@ -2,26 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -128,8 +91,6 @@ @@ -138,7 +99,6 @@ + id="path4250" /> + id="path4252" /> diff --git a/org.eclipse.egit.ui/icons/obj16/sign-commit.svg b/org.eclipse.egit.ui/icons/obj16/sign-commit.svg index fd19ae8d8d..90395e7200 100644 --- a/org.eclipse.egit.ui/icons/obj16/sign-commit.svg +++ b/org.eclipse.egit.ui/icons/obj16/sign-commit.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4878" /> + id="filter5152" + x="-0.11338032" + y="-0.15654873" + width="1.2267606" + height="1.3130975"> - - - @@ -209,22 +168,17 @@ + id="rect4838-1" /> + id="path4994" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.34969947" + width="1.6994111" + y="-0.35042714" + height="1.7008444"> @@ -166,8 +158,7 @@ + id="path3953" /> @@ -181,7 +172,6 @@ id="stop4034-48" /> - - - @@ -284,13 +243,11 @@ image/svg+xml - + @@ -298,8 +255,6 @@ id="g7581" mask="url(#mask7584)"> @@ -309,47 +264,37 @@ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,726.06628,283.93164)"> + id="path4028" /> + id="path4028-8" /> + id="path4028-4" /> + id="path4028-3" /> diff --git a/org.eclipse.egit.ui/icons/obj16/squash-down.svg b/org.eclipse.egit.ui/icons/obj16/squash-down.svg index d3c3c761e5..abaa91eae9 100644 --- a/org.eclipse.egit.ui/icons/obj16/squash-down.svg +++ b/org.eclipse.egit.ui/icons/obj16/squash-down.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> - - - - - - - - - @@ -268,26 +163,21 @@ image/svg+xml - + @@ -295,25 +185,18 @@ + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/squash-up.svg b/org.eclipse.egit.ui/icons/obj16/squash-up.svg index 5fd8a03f66..7aa3209121 100644 --- a/org.eclipse.egit.ui/icons/obj16/squash-up.svg +++ b/org.eclipse.egit.ui/icons/obj16/squash-up.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4877-6"> + id="linearGradient5147-4"> + id="linearGradient5141-4"> + xlink:href="#linearGradient5141-4" /> @@ -183,34 +166,6 @@ y="1045.3622" /> - - - @@ -219,13 +174,11 @@ image/svg+xml - + @@ -234,13 +187,10 @@ transform="translate(0,-7)" clip-path="url(#clipPath3070)"> @@ -248,27 +198,20 @@ + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/stash-apply.svg b/org.eclipse.egit.ui/icons/obj16/stash-apply.svg index 13717a1cfe..309c04c1ae 100644 --- a/org.eclipse.egit.ui/icons/obj16/stash-apply.svg +++ b/org.eclipse.egit.ui/icons/obj16/stash-apply.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - + xlink:href="#linearGradient3865" /> - - - @@ -293,13 +161,11 @@ image/svg+xml - + @@ -309,122 +175,61 @@ width="11.25" height="3" x="0.5" - y="1046.2372" - inkscape:export-filename="/Users/thomas/bin/oomph/egit-master/git/egit/icons/org.eclipse.egit.ui/icons/obj16/stash.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45" /> + y="1046.2372" /> + id="path3854" /> + id="path3856" /> + id="path3858" /> + id="path3894" /> + id="path3896" /> + id="path3908" /> + id="path3918" /> + id="path3920" /> + y="1047.3622" /> + id="path4135" /> + id="path4235" /> + id="path4235-1" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/stash-create.svg b/org.eclipse.egit.ui/icons/obj16/stash-create.svg index 4871b26bde..5dd949b47e 100644 --- a/org.eclipse.egit.ui/icons/obj16/stash-create.svg +++ b/org.eclipse.egit.ui/icons/obj16/stash-create.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - + xlink:href="#linearGradient3865" /> - - - @@ -293,13 +161,11 @@ image/svg+xml - + @@ -309,122 +175,61 @@ width="11.25" height="3" x="4.25" - y="1046.2372" - inkscape:export-filename="/Users/thomas/bin/oomph/egit-master/git/egit/icons/org.eclipse.egit.ui/icons/obj16/stash.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45" /> + y="1046.2372" /> + id="path3854" /> + id="path3856" /> + id="path3858" /> + id="path3894" /> + id="path3896" /> + id="path3908" /> + id="path3918" /> + id="path3920" /> + y="1047.3622" /> + id="path4135" /> + id="path4235" /> + id="path4235-1" /> + id="path3873" /> diff --git a/org.eclipse.egit.ui/icons/obj16/stash.svg b/org.eclipse.egit.ui/icons/obj16/stash.svg index d9e48af591..384f73c377 100644 --- a/org.eclipse.egit.ui/icons/obj16/stash.svg +++ b/org.eclipse.egit.ui/icons/obj16/stash.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - @@ -347,13 +163,11 @@ image/svg+xml - + @@ -361,9 +175,6 @@ id="g4355" transform="matrix(0.5,0,0,0.5,32.5,512.6811)"> diff --git a/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg b/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg index ca94fc91cc..e16c466a17 100644 --- a/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg +++ b/org.eclipse.egit.ui/icons/obj16/state_sort_co.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -73,13 +43,11 @@ image/svg+xml - + @@ -101,9 +69,7 @@ + id="path3986" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3973"> + id="linearGradient3967"> + id="linearGradient3973-7-8"> + id="linearGradient4807-2"> + id="linearGradient4721-1"> + id="linearGradient4721-1-5"> - - - @@ -332,13 +288,11 @@ image/svg+xml - + @@ -355,13 +309,10 @@ id="rect13693-3" style="fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient4146);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> @@ -373,15 +324,9 @@ + id="path3868-1" /> + id="path3868-1-4" /> + id="path3868-1-5" /> + id="path3868-1-4-5" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient3865-9" /> - - - @@ -144,33 +108,26 @@ image/svg+xml - + + id="path4126" /> + id="path3873" /> + id="path3873-0" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - - - - - - - - - + id="linearGradient3967-01"> - - + id="linearGradient3967-0-2"> - - - - - - - - - - - - - - - - - - - @@ -634,13 +312,11 @@ image/svg+xml - + @@ -684,15 +360,11 @@ + id="rect13693-8" /> + id="path13797" /> @@ -726,15 +398,11 @@ + id="rect13693-8-4" /> + id="path13797-6" /> diff --git a/org.eclipse.egit.ui/icons/obj16/track.svg b/org.eclipse.egit.ui/icons/obj16/track.svg index ef453620ba..1f4f28fd26 100644 --- a/org.eclipse.egit.ui/icons/obj16/track.svg +++ b/org.eclipse.egit.ui/icons/obj16/track.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - + xlink:href="#linearGradient8164" /> + xlink:href="#linearGradient8180" /> - - - @@ -172,13 +116,11 @@ image/svg+xml - + @@ -190,51 +132,33 @@ id="g3142" transform="translate(0,-1.9751903)"> + style="fill:url(#linearGradient3149);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:url(#linearGradient3151);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> diff --git a/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg b/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg index 2279a704ef..03955e725b 100644 --- a/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg +++ b/org.eclipse.egit.ui/icons/obj16/uncheck_all.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4994-4"> + id="linearGradient4994-4-1"> - - - @@ -184,13 +143,11 @@ image/svg+xml - + @@ -198,19 +155,14 @@ id="g4084" transform="translate(-26,-20.000055)"> @@ -226,19 +178,14 @@ id="g3892" transform="matrix(0.45459079,0,0,0.45457615,-5.0464066,568.84683)"> diff --git a/org.eclipse.egit.ui/icons/obj16/unstage.svg b/org.eclipse.egit.ui/icons/obj16/unstage.svg index a3af75382b..da31ade4eb 100644 --- a/org.eclipse.egit.ui/icons/obj16/unstage.svg +++ b/org.eclipse.egit.ui/icons/obj16/unstage.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - @@ -114,13 +61,11 @@ image/svg+xml - + diff --git a/org.eclipse.egit.ui/icons/obj16/untrack.svg b/org.eclipse.egit.ui/icons/obj16/untrack.svg index f9c6572211..e0043c1d95 100644 --- a/org.eclipse.egit.ui/icons/obj16/untrack.svg +++ b/org.eclipse.egit.ui/icons/obj16/untrack.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -506,13 +161,11 @@ image/svg+xml - + @@ -524,43 +177,27 @@ id="g3142" transform="translate(0,-1.9751903)"> + style="fill:url(#linearGradient3149);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:url(#linearGradient3151);fill-opacity:1;stroke:#324e6e;stroke-width:1.11897111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -228,38 +83,29 @@ image/svg+xml - + + id="rect4001-3-3" /> + id="path4884-7" /> + id="rect4001-9" /> + d="m 8.532401,1046.3622 -1.488,0 c 0,0 -0.01538,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 l 0.25,-0.2265 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.363716,0.01 -0.564257,0.194 -0.206443,0.1907 -0.171121,0.7023 -0.171121,0.7023 l -1.027773,0 c 0,0 0.0033,-0.8705 0.230561,-1.2142 0.209451,-0.3168 0.686234,-0.5818 0.946652,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.08181,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/org.eclipse.egit.ui/icons/obj16/version_rep.svg b/org.eclipse.egit.ui/icons/obj16/version_rep.svg index d622456e28..2b780e631b 100644 --- a/org.eclipse.egit.ui/icons/obj16/version_rep.svg +++ b/org.eclipse.egit.ui/icons/obj16/version_rep.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient3967"> + id="path4919" /> + id="linearGradient3967-0"> - - - - @@ -240,13 +187,11 @@ image/svg+xml - + @@ -286,14 +231,10 @@ style="fill:url(#linearGradient4003);fill-opacity:1;stroke:url(#linearGradient4005);stroke-width:3.58380485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" transform="scale(1,-1)" /> diff --git a/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg b/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg index 13471289c7..efea583431 100644 --- a/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg +++ b/org.eclipse.egit.ui/icons/ovr/assume_unchanged.svg @@ -1,80 +1,20 @@ + + + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - + id="defs4" /> @@ -83,22 +23,18 @@ image/svg+xml - + + id="path4242" /> + id="path4240" /> diff --git a/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg b/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg index 17a474c26b..395cc1e8c5 100644 --- a/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg +++ b/org.eclipse.egit.ui/icons/ovr/checkedout_ov.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4191"> - - - @@ -122,13 +84,11 @@ image/svg+xml - + + id="path4205" /> + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -107,27 +69,21 @@ image/svg+xml - + + id="path4334-6" /> + id="path4334" /> diff --git a/org.eclipse.egit.ui/icons/ovr/delete_modify.svg b/org.eclipse.egit.ui/icons/ovr/delete_modify.svg index 570a966e06..749f6bda66 100644 --- a/org.eclipse.egit.ui/icons/ovr/delete_modify.svg +++ b/org.eclipse.egit.ui/icons/ovr/delete_modify.svg @@ -4,24 +4,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4844-4-9-7" /> - - - @@ -134,28 +94,20 @@ + id="path4334-6" /> + id="path4334" /> + id="rect4043-2-7-1" /> diff --git a/org.eclipse.egit.ui/icons/ovr/dirty.svg b/org.eclipse.egit.ui/icons/ovr/dirty.svg index b38aec294c..e02c3edc35 100644 --- a/org.eclipse.egit.ui/icons/ovr/dirty.svg +++ b/org.eclipse.egit.ui/icons/ovr/dirty.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -86,13 +52,11 @@ image/svg+xml - + + id="path4199" /> + id="path4199-4" /> + id="path4199-4-7" /> + id="path4199-4-7-3" /> + id="path4199-4-7-9" /> + id="path4199-4-7-0" /> diff --git a/org.eclipse.egit.ui/icons/ovr/error.svg b/org.eclipse.egit.ui/icons/ovr/error.svg index 200dfaef40..0384a754c2 100644 --- a/org.eclipse.egit.ui/icons/ovr/error.svg +++ b/org.eclipse.egit.ui/icons/ovr/error.svg @@ -1,32 +1,21 @@ + + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - + xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1" /> + xlink:href="#linearGradient4879" /> - - - @@ -121,8 +72,6 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4852-7-2" /> - - - @@ -134,28 +94,20 @@ + id="path4334-6" /> + id="path4334" /> + id="rect4043-2-7-1" /> diff --git a/org.eclipse.egit.ui/icons/ovr/staged.svg b/org.eclipse.egit.ui/icons/ovr/staged.svg index 33bd0c3255..e3a4263ff6 100644 --- a/org.eclipse.egit.ui/icons/ovr/staged.svg +++ b/org.eclipse.egit.ui/icons/ovr/staged.svg @@ -1,26 +1,22 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -87,13 +52,11 @@ image/svg+xml - + + id="path4199" /> + id="path4199-4" /> + id="path4199-4-7" /> + id="path4199-4-7-3" /> + id="path4199-4-7-9" /> + id="path4199-4-7-0" /> diff --git a/org.eclipse.egit.ui/icons/ovr/staged_added.svg b/org.eclipse.egit.ui/icons/ovr/staged_added.svg index e7d1f226e0..f28633bf9b 100644 --- a/org.eclipse.egit.ui/icons/ovr/staged_added.svg +++ b/org.eclipse.egit.ui/icons/ovr/staged_added.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient5591-4" /> + xlink:href="#linearGradient5583-2" /> - - - @@ -97,21 +63,17 @@ image/svg+xml - + + id="path5581" /> diff --git a/org.eclipse.egit.ui/icons/ovr/staged_removed.svg b/org.eclipse.egit.ui/icons/ovr/staged_removed.svg index 7850f78bac..ea9f9ec7a5 100644 --- a/org.eclipse.egit.ui/icons/ovr/staged_removed.svg +++ b/org.eclipse.egit.ui/icons/ovr/staged_removed.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + xlink:href="#linearGradient4852-7-29-2" /> + xlink:href="#linearGradient4844-4-9-7" /> - - - @@ -126,8 +89,6 @@ @@ -143,8 +104,6 @@ + id="rect4043-2-7-1" /> diff --git a/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg b/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg index 9dc2db89b8..6b466d0857 100644 --- a/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg +++ b/org.eclipse.egit.ui/icons/ovr/staged_renamed.svg @@ -2,64 +2,18 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -236,13 +43,11 @@ image/svg+xml - + @@ -250,8 +55,6 @@ id="g3979" transform="translate(19.972259,2.0319218)"> @@ -261,9 +64,7 @@ + id="path7602-5" /> diff --git a/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg b/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg index 176dc0f092..927fbc393d 100644 --- a/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg +++ b/org.eclipse.egit.ui/icons/ovr/symlink_ovr.svg @@ -1,22 +1,19 @@ + + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -79,8 +50,6 @@ @@ -105,9 +74,7 @@ + id="path4183" /> diff --git a/org.eclipse.egit.ui/icons/ovr/untracked.svg b/org.eclipse.egit.ui/icons/ovr/untracked.svg index 2d1f6780dc..048889e2f4 100644 --- a/org.eclipse.egit.ui/icons/ovr/untracked.svg +++ b/org.eclipse.egit.ui/icons/ovr/untracked.svg @@ -4,50 +4,17 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - @@ -56,13 +23,11 @@ image/svg+xml - + + d="m 4.488,1049.3622 -1.488,0 c 0,0 -0.015379,-0.3321 0.207031,-0.7267 0.08594,-0.1666 0.266925,-0.3776 0.542969,-0.6328 L 4,1047.7762 c 0.148435,-0.1354 0.256507,-0.263 0.324218,-0.3828 0.07031,-0.1198 0.105466,-0.2396 0.105469,-0.3594 -3e-6,-0.1823 -0.0625,-0.3242 -0.1875,-0.4258 -0.125002,-0.1042 -0.299481,-0.1562 -0.523437,-0.1562 -0.21094,0 -0.3637164,0.01 -0.5642576,0.194 -0.206443,0.1907 -0.1711209,0.7023 -0.1711209,0.7023 l -1.0277727,0 c 0,0 0.00334,-0.8705 0.2305607,-1.2142 0.2094513,-0.3168 0.6862345,-0.5818 0.9466525,-0.6339 0.260415,-0.052 0.511717,-0.078 0.753906,-0.078 0.635414,0 1.119789,0.1302 1.453125,0.3906 0.33333,0.2579 0.499996,0.6355 0.5,1.1328 -4e-6,0.2553 -0.05078,0.4844 -0.152343,0.6875 -0.101567,0.2006 -0.274744,0.4167 -0.519532,0.6485 l -0.25,0.2226 c -0.177086,0.1615 -0.292971,0.2917 -0.347656,0.3907 -0.05469,0.096 -0.081805,0.2031 -0.08203,0.3203 l -2.82e-4,0.147 m -1.488,1 1.488282,0 0,1 -1.488282,0 0,-1" /> diff --git a/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg b/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg index f153b77bcb..f9008fb1de 100644 --- a/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/commit_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="linearGradient4894"> @@ -189,83 +172,27 @@ id="stop4460" /> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> - - - - - - - - - - - - + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -442,40 +357,8 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - @@ -484,25 +367,18 @@ image/svg+xml - + + style="display:inline"> @@ -515,15 +391,11 @@ id="g13408-8-2" /> @@ -531,10 +403,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606);font-family:Sans" d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z" id="rect10961-8-3-6-1" - inkscape:connector-curvature="0" - transform="matrix(0.76852909,0,0.05870911,0.23426091,-77.090255,785.86486)" - inkscape:transform-center-x="4.4580006" - inkscape:transform-center-y="0.53407962" /> + transform="matrix(0.76852909,0,0.05870911,0.23426091,-77.090255,785.86486)" /> @@ -545,8 +414,6 @@ id="g5348" transform="translate(0,986.3622)"> @@ -560,10 +427,6 @@ id="rect4876" style="fill:url(#linearGradient4045);fill-opacity:1;stroke:url(#linearGradient4047);stroke-width:1.5625;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + transform="matrix(0.76852909,0,0.05870911,0.23426091,-33.378717,784.41165)" /> @@ -608,40 +465,19 @@ id="path3868" style="fill:none;stroke:#c99d19;stroke-width:0.27287647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m 26.128192,1044.4362 c 0,0.5523 -1.119287,1 -2.499999,1 -1.380712,0 -2.5,-0.4477 -2.5,-1 0,-0.5523 1.119288,-1.0001 2.5,-1.0001 1.380712,0 2.499999,0.4478 2.499999,1.0001 z" - sodipodi:cx="23.628193" - sodipodi:cy="1044.4362" - sodipodi:rx="2.4999995" - sodipodi:ry="1.0000277" transform="matrix(4.0053658,0,0,3.3529387,-31.118177,-2494.8691)" /> + id="path3873" /> + transform="matrix(-1.368628,2.4568462,-2.1273332,-1.7531504,2279.2634,2822.827)" /> diff --git a/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg b/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg index cfa459e623..7b1b998cbb 100644 --- a/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/createpatch_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4902"> + id="linearGradient4994"> + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4994-0"> + id="linearGradient4902-8"> + xlink:href="#linearGradient4578" /> - - - - - - - - - - - @@ -500,25 +353,18 @@ image/svg+xml - + + style="display:inline"> @@ -531,15 +377,11 @@ id="g13408-8-2" /> @@ -547,141 +389,104 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4233);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606);font-family:Sans" d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z" id="rect10961-8-3-6-1" - inkscape:connector-curvature="0" - transform="matrix(1.1726491,0,0.08958045,0.36603268,-118.93918,664.84958)" - inkscape:transform-center-x="4.3534013" - inkscape:transform-center-y="0.53407962" /> + transform="matrix(1.1726491,0,0.08958045,0.36603268,-118.93918,664.84958)" /> + style="fill:url(#linearGradient3142);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> + id="path4696-0" /> + id="path4696-9" /> + id="path4696-0-2" /> + id="path4696-0-3" /> + id="path4696-0-8" /> + id="path4696-9-9" /> + id="path4696-9-8" /> + transform="matrix(1.1726491,0,0.08958045,0.36603268,-80.919182,664.84958)" /> + id="path4696-0-5" /> + id="path4696-9-91" /> + id="path4696-0-2-1" /> + id="path4696-0-3-4" /> + id="path4696-0-8-4" /> + id="path4696-9-9-2" /> + id="path4696-9-8-6" /> + style="fill:url(#linearGradient3115);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> + id="path4696-9-91-6" /> + id="path4522" /> + id="path4522-3" /> diff --git a/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg b/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg index 4ef8e1be74..499691ebd2 100644 --- a/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/fetch_gerrit_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865-6" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - @@ -362,25 +307,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +331,11 @@ id="g13408-8-2" /> @@ -409,26 +343,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -547,13 +449,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865-6" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - - - @@ -362,25 +286,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +310,11 @@ id="g13408-8-2" /> @@ -409,26 +322,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> diff --git a/org.eclipse.egit.ui/icons/wizban/import_wiz.svg b/org.eclipse.egit.ui/icons/wizban/import_wiz.svg index fbd0f065ee..1a5af76d7f 100644 --- a/org.eclipse.egit.ui/icons/wizban/import_wiz.svg +++ b/org.eclipse.egit.ui/icons/wizban/import_wiz.svg @@ -2,35 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - + x="-0.078955413" + width="1.1579108" + y="-0.12997642" + height="1.2599528"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient4496"> - + height="1.0954513" + y="-0.047725668" + width="1.0967932" + x="-0.048396592" + id="filter4285-9-8-1"> + stdDeviation="0.10000000000000001" /> - - - @@ -795,25 +365,18 @@ image/svg+xml - + + style="display:inline"> @@ -826,15 +389,11 @@ id="g13408-8-2" /> @@ -842,11 +401,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4235);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 53.125738,1012.9043 -20.282159,28.4583 27.324925,0 19.523134,-28.4583 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(1.8444698,0,0.14090187,0.56222619,-202.61205,452.11525)" - inkscape:transform-center-x="10.699205" - inkscape:transform-center-y="1.2818017" - sodipodi:nodetypes="ccccc" /> + transform="matrix(1.8444698,0,0.14090187,0.56222619,-202.61205,452.11525)" /> @@ -861,17 +416,14 @@ transform="translate(-1.378906,0)" id="g4070"> @@ -918,25 +470,11 @@ + id="path4478" /> + transform="matrix(-0.68431401,1.2284231,-1.0636666,-0.87657521,1168.2883,1942.6519)" /> diff --git a/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg b/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg index e5c184be94..a33929984c 100644 --- a/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/newconnect_wizban.svg @@ -2,24 +2,19 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + x="-0.078955413" + width="1.1579108" + y="-0.12997642" + height="1.2599528"> @@ -238,7 +226,6 @@ id="stop10452-22-7-8-4-3-4" /> - - - - - - - - - - + height="1.0954513" + y="-0.047725668" + width="1.0967932" + x="-0.048396592" + id="filter4285-9-8-1"> + stdDeviation="0.10000000000000001" /> - - - - - @@ -422,25 +317,18 @@ image/svg+xml - + + style="display:inline"> @@ -453,15 +341,11 @@ id="g13408-8-2" /> @@ -469,11 +353,7 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4235);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 53.125738,1012.9043 -20.282159,28.4583 27.324925,0 19.523134,-28.4583 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(1.8444698,0,0.14090187,0.56222619,-194.61205,452.11525)" - inkscape:transform-center-x="10.699205" - inkscape:transform-center-y="1.2818017" - sodipodi:nodetypes="ccccc" /> + transform="matrix(1.8444698,0,0.14090187,0.56222619,-194.61205,452.11525)" /> @@ -488,17 +368,14 @@ transform="translate(-1.378906,0)" id="g4070"> @@ -543,22 +420,9 @@ ry="0" /> + transform="matrix(-0.07087313,1.404381,-1.3415721,-0.31615686,1429.7583,1358.116)" /> diff --git a/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg b/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg index 65767c568a..c80a0d0b2b 100644 --- a/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/pull_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient3865-6" /> - - + x="-0.062976157" + width="1.1259523" + y="-0.10879013" + height="1.2175803"> + id="linearGradient4894"> + y="-0.68799998" + height="2.376"> - - - @@ -517,25 +346,18 @@ image/svg+xml - + + style="display:inline"> @@ -548,41 +370,30 @@ id="g13408-8-2" /> + id="path3873" /> @@ -592,10 +403,7 @@ style="display:inline" id="g3083"> @@ -611,9 +419,7 @@ + id="path5250" /> + d="m 31.191999,8.3080006 c 0,2.4852814 -3.357864,4.5000004 -7.5,4.5000004 -4.142135,0 -7.5,-2.014719 -7.5,-4.5000004 0,-2.4852814 3.357865,-4.5 7.5,-4.5 4.142136,0 7.5,2.0147186 7.5,4.5 z" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - @@ -372,25 +307,18 @@ image/svg+xml - + + style="display:inline"> @@ -403,15 +331,11 @@ id="g13408-8-2" /> @@ -419,26 +343,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -557,13 +449,8 @@ + style="fill:url(#radialGradient4092);fill-opacity:1;stroke:none;display:inline" /> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> + xlink:href="#linearGradient3865" /> + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +177,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - - - @@ -362,25 +286,18 @@ image/svg+xml - + + style="display:inline"> @@ -393,15 +310,11 @@ id="g13408-8-2" /> @@ -409,26 +322,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + id="path3873" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> diff --git a/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg b/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg index 31211c3cf7..756198d6ca 100644 --- a/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg +++ b/org.eclipse.egit.ui/icons/wizban/synchronize_wizban.svg @@ -2,20 +2,16 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB"> + stdDeviation="0.10000000000000001" /> @@ -140,8 +128,7 @@ id="stop5975" /> + id="linearGradient4721-1"> - + x="-0.062126745" + width="1.1242535" + y="-0.078773594" + height="1.1575472"> @@ -193,8 +168,7 @@ gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" gradientUnits="userSpaceOnUse" id="linearGradient4097" - xlink:href="#linearGradient4456-3" - inkscape:collect="always" /> + xlink:href="#linearGradient4456-3" /> - - - - - - @@ -401,25 +306,18 @@ image/svg+xml - + + style="display:inline"> @@ -432,15 +330,11 @@ id="g13408-8-2" /> @@ -448,26 +342,16 @@ style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4097);fill-opacity:1;stroke:none;display:inline;filter:url(#filter4606-1);font-family:Sans" d="m 65.056746,994.40641 -32.213167,46.95619 27.324925,0 32.213167,-46.95619 z" id="rect10961-8-3-6-1-4" - inkscape:connector-curvature="0" - transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" - inkscape:transform-center-x="3.566402" - inkscape:transform-center-y="0.42726565" - sodipodi:nodetypes="ccccc" /> + transform="matrix(0.61482327,0,0.04696729,0.18740873,-39.902976,853.20176)" /> + id="path3868-1" /> + id="path3868-1-4" /> + transform="matrix(-1.0949024,1.965477,-1.7018666,-1.4025203,1809.0613,2484.0258)" /> @@ -523,14 +387,10 @@ + id="path3873" /> + id="path3873-3" /> diff --git a/org.eclipse.egit/egit.svg b/org.eclipse.egit/egit.svg index 22b029edb6..3c5023cdd2 100644 --- a/org.eclipse.egit/egit.svg +++ b/org.eclipse.egit/egit.svg @@ -2,14 +2,6 @@ image/svg+xml + id="path3841" /> From fbcf29911e9b387c1559aed2cf0bd3b3370de88c Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Mar 2026 14:53:41 +0100 Subject: [PATCH 146/160] Staging View: fix placeholder and tooltip for new find button Placeholder: s/Filter &Toolbar/Filter files/ Tooltip: it's not a "Filter Toolbar". Just say "Filter". Bug: egit-156 Change-Id: Iae4a9c3604b6e816580cdb54f63f135f1ef96b10 --- .../src/org/eclipse/egit/ui/internal/UIText.java | 5 ++++- .../org/eclipse/egit/ui/internal/staging/StagingView.java | 5 +++-- .../src/org/eclipse/egit/ui/internal/uitext.properties | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 6f937e2f9d..9f132de6c9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -6212,7 +6212,10 @@ public class UIText extends NLS { public static String StagingView_CompactTree; /** */ - public static String StagingView_Find; + public static String StagingView_Filter; + + /** */ + public static String StagingView_Filter_actionLabel; /** */ public static String StagingView_ShowFilterTooltip; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index a35ae37f1b..ee2a4f7985 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -2226,7 +2226,7 @@ protected Control createControl(Composite parent) { filterText = new Text(toolbarComposite, SWT.SEARCH | SWT.ICON_CANCEL | SWT.ICON_SEARCH); - filterText.setMessage(UIText.StagingView_Find); + filterText.setMessage(UIText.StagingView_Filter); GridData data = new GridData(SWT.LEFT, SWT.TOP, true, false); data.minimumWidth = 150; filterText.setLayoutData(data); @@ -2253,7 +2253,8 @@ protected Control createControl(Composite parent) { toolbar.add(filterContribution); - Action showFilterAction = new Action(UIText.StagingView_Find, + Action showFilterAction = new Action( + UIText.StagingView_Filter_actionLabel, IAction.AS_CHECK_BOX) { @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 817fa7f466..2c90517b9e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -2177,9 +2177,10 @@ StagingView_Presentation=Presentation StagingView_List=List StagingView_Tree=Tree StagingView_CompactTree=Compact Tree -StagingView_Find=Filter &Toolbar -StagingView_ShowFilterTooltip=Show Filter Toolbar -StagingView_HideFilterTooltip=Hide Filter Toolbar +StagingView_Filter=Filter files +StagingView_Filter_actionLabel=&Filter Toolbar +StagingView_ShowFilterTooltip=Show Filter +StagingView_HideFilterTooltip=Hide Filter StagingView_MergeTool=Merge Tool StagingView_AddJob=Adding files to index... StagingView_RemoveJob=Removing files from index... From 38cb1152f06d3f39355d39e6654522ea0352f023 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Mar 2026 18:24:24 +0100 Subject: [PATCH 147/160] Staging View: really toggle the filter Instead of just hiding or showing the filter text input also remember the text input state when hiding and restore it when re-showing the control. Note that toolbar.update(true) actually disposes the control of a ControlContribution that is not visible. It gets re-created from scratch when the ControlContribution is visible again. Bug: egit-158 Change-Id: I93efcc3cca7a0be56b2bee40f07aa8dd6f3c7d87 --- .../egit/ui/internal/staging/StagingView.java | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index ee2a4f7985..a7f85f11e1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -86,9 +86,9 @@ import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.commit.CommitContext; import org.eclipse.egit.ui.internal.ActionUtils; -import org.eclipse.egit.ui.internal.GitLabels; import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.CompareUtils; +import org.eclipse.egit.ui.internal.GitLabels; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.actions.ActionCommands; @@ -2213,6 +2213,10 @@ private void updateToolbar() { filterContribution = new ControlContribution( "StagingView.searchText") { //$NON-NLS-1$ + private String lastFilter; + + private Point lastFilterSelection; + @Override protected Control createControl(Composite parent) { Composite toolbarComposite = new Composite(parent, @@ -2237,8 +2241,30 @@ protected Control createControl(Composite parent) { filterText.getDisplay().timerExec(200, searchThread::start); }); + if (lastFilter != null && !lastFilter.isEmpty()) { + filterText.setText(lastFilter); + lastFilter = null; + if (lastFilterSelection != null) { + filterText.setSelection(lastFilterSelection); + lastFilterSelection = null; + } + } return toolbarComposite; } + + @Override + public void setVisible(boolean visible) { + boolean change = visible != isVisible(); + if (filterText != null && change && !visible) { + String current = filterText.getText(); + lastFilterSelection = filterText.getSelection(); + lastFilter = current; + if (current != null && !current.isEmpty()) { + filterText.setText(""); //$NON-NLS-1$ + } + } + super.setVisible(visible); + } }; boolean showFilter = getPreferenceStore() .getBoolean(UIPreferences.STAGING_VIEW_SHOW_FILTER); @@ -2263,11 +2289,6 @@ public void run() { getPreferenceStore().setValue( UIPreferences.STAGING_VIEW_SHOW_FILTER, checked); filterContribution.setVisible(checked); - if (!checked && filterText != null - && !filterText.isDisposed() - && !filterText.getText().isEmpty()) { - filterText.setText(""); //$NON-NLS-1$ - } toolbar.update(true); if (checked && filterText != null && !filterText.isDisposed()) { filterText.setFocus(); From cd26beb7dc81d4c50b646685fbe0d5fc3ceb9f21 Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Mon, 30 Mar 2026 16:08:52 +0200 Subject: [PATCH 148/160] [version.sh] Don't use the pager for the git diff command Human interaction is bad for automation scripts. Change-Id: I32cbb1658676a1865942f2ca20469fd11484a0fd --- tools/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/version.sh b/tools/version.sh index 6c38c9646c..613e863864 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -187,4 +187,4 @@ perl -pi~ -e ' ' $(git ls-files | grep pom.xml) find . -name '*~' | xargs rm -f -git diff +git --no-pager diff From eab66cfa8150567052255859e51dcbd8906db6a1 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 29 Mar 2026 10:00:19 +0200 Subject: [PATCH 149/160] Staging View: use the filter icon for the filter toggle action The search icon was semantically wrong. The action is not about searching but about filtering. Also remove SWT.ICON_SEARCH from the text input field; it was equally wrong and moreover had no functionality behind. Bug: egit-159 Change-Id: Ic207d09e6ae6cba5f471357f1993ddb63b3fd49d --- .../org/eclipse/egit/ui/internal/staging/StagingView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index a7f85f11e1..ac556491f1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -2228,8 +2228,8 @@ protected Control createControl(Composite parent) { headLayout.marginWidth = 0; toolbarComposite.setLayout(headLayout); - filterText = new Text(toolbarComposite, SWT.SEARCH - | SWT.ICON_CANCEL | SWT.ICON_SEARCH); + filterText = new Text(toolbarComposite, + SWT.SEARCH | SWT.ICON_CANCEL); filterText.setMessage(UIText.StagingView_Filter); GridData data = new GridData(SWT.LEFT, SWT.TOP, true, false); data.minimumWidth = 150; @@ -2309,7 +2309,7 @@ public void setChecked(boolean checked) { }; showFilterAction.setActionDefinitionId( IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE); - showFilterAction.setImageDescriptor(UIIcons.ELCL16_FIND); + showFilterAction.setImageDescriptor(UIIcons.ELCL16_FILTER); showFilterAction.setChecked(showFilter); toolbar.add(showFilterAction); actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), From b2d4909657e28bc1127b1f64b4fc15207667d4ee Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 30 Mar 2026 20:07:02 +0200 Subject: [PATCH 150/160] Repositories View: use filter icon for "Filter Tags" It's visible in the repositories view's context menu when a "Tags" node is selected. The find icon previously used was semantically incorrect. Change-Id: Ifd163c2bd86806a7f150bb38bbe391692c975c87 --- org.eclipse.egit.ui/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 58544e4a85..0c1831c4ee 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -4622,7 +4622,7 @@ From a48d2e69d22e139e8bf81dc295c86d906b5cec95 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Thu, 2 Apr 2026 12:18:14 +0200 Subject: [PATCH 151/160] Use notification API for stash apply Introduce a non-blocking notification for successful stash apply operations, similar to the fetch notification. The notification shows the short commit ID of the applied stash and the repository name. Users can enable or disable this notification in the Git > Dialogs preference page. Fixes: https://github.com/eclipse-egit/egit/issues/161 Change-Id: If2cff07b880a6ff840c7052c851e6b04af15fbc4 --- .../egit/ui/PluginPreferenceInitializer.java | 1 + .../org/eclipse/egit/ui/UIPreferences.java | 2 + .../org/eclipse/egit/ui/internal/UIText.java | 15 +++++ .../commit/command/StashApplyHandler.java | 12 ++++ .../preferences/DialogsPreferencePage.java | 2 + .../stash/StashApplyResultNotification.java | 61 +++++++++++++++++++ .../egit/ui/internal/stash/StashCreateUI.java | 32 ++++++++++ .../egit/ui/internal/uitext.properties | 5 ++ 8 files changed, 130 insertions(+) create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashApplyResultNotification.java diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java index 82c5925155..8a7ff5aae2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java @@ -120,6 +120,7 @@ public void initializeDefaultPreferences() { store.setDefault(UIPreferences.SHOW_INITIAL_CONFIG_DIALOG, true); store.setDefault(UIPreferences.SHOW_FETCH_POPUP_SUCCESS, true); store.setDefault(UIPreferences.FETCH_SHOW_NOTIFICATION, false); + store.setDefault(UIPreferences.STASH_APPLY_SHOW_NOTIFICATION, true); store.setDefault(UIPreferences.SHOW_PUSH_POPUP_SUCCESS, true); store.setDefault(UIPreferences.SHOW_HOME_DIR_WARNING, true); store.setDefault(UIPreferences.LFS_AUTO_CONFIGURATION, false); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java index 99daa5d328..167192b3b8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java @@ -230,6 +230,8 @@ private UIPreferences() { /** */ public static final String FETCH_SHOW_NOTIFICATION = "fetch_show_notification"; //$NON-NLS-1$ /** */ + public static final String STASH_APPLY_SHOW_NOTIFICATION = "stash_apply_show_notification"; //$NON-NLS-1$ + /** */ public static final String SHOW_HOME_DIR_WARNING = "show_home_drive_warning"; //$NON-NLS-1$ /** */ public static final String LFS_AUTO_CONFIGURATION = "auto_lfs_config"; //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 9f132de6c9..2c504c9280 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -3321,6 +3321,18 @@ public class UIText extends NLS { /** */ public static String FetchResultNotification_Details; + /** */ + public static String StashApplyResultNotification_Title; + + /** */ + public static String StashApplyResultNotification_Message; + + /** */ + public static String StashCreateResultNotification_Title; + + /** */ + public static String StashCreateResultNotification_Message; + /** */ public static String FetchResultTable_addingChildren; @@ -4235,6 +4247,9 @@ public class UIText extends NLS { /** */ public static String DialogsPreferencePage_FetchShowNotification; + /** */ + public static String DialogsPreferencePage_StashApplyShowNotification; + /** */ public static String DialogsPreferencePage_ShowPushInfoDialog; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/StashApplyHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/StashApplyHandler.java index a91f127a84..a1000fd99a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/StashApplyHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/StashApplyHandler.java @@ -24,8 +24,12 @@ import org.eclipse.egit.core.op.StashApplyOperation; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.JobFamilies; +import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.handler.SelectionHandler; +import org.eclipse.egit.ui.internal.stash.StashApplyResultNotification; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -60,6 +64,14 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { Utils.getShortObjectId(commit), e.getLocalizedMessage()), e); } + if (Activator.getDefault().getPreferenceStore() + .getBoolean(UIPreferences.STASH_APPLY_SHOW_NOTIFICATION)) { + PlatformUI.getWorkbench().getDisplay().asyncExec(() -> { + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + StashApplyResultNotification.open(shell, repo, commit); + }); + } return Status.OK_STATUS; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java index 0a8e48134e..5e420f018f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java @@ -109,6 +109,8 @@ protected void createFieldEditors() { .setToolTipText(UIText.DialogsPreferencePage_ShowTooltip); addField(new BooleanFieldEditor(UIPreferences.FETCH_SHOW_NOTIFICATION, UIText.DialogsPreferencePage_FetchShowNotification, infoGroup)); + addField(new BooleanFieldEditor(UIPreferences.STASH_APPLY_SHOW_NOTIFICATION, + UIText.DialogsPreferencePage_StashApplyShowNotification, infoGroup)); editor = new BooleanFieldEditor(UIPreferences.SHOW_PUSH_POPUP_SUCCESS, UIText.DialogsPreferencePage_ShowPushInfoDialog, infoGroup); addField(editor); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashApplyResultNotification.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashApplyResultNotification.java new file mode 100644 index 0000000000..f1294b6e4c --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashApplyResultNotification.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (C) 2026 vogella GmbH and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.stash; + +import org.eclipse.egit.core.RepositoryUtil; +import org.eclipse.egit.core.internal.Utils; +import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.notifications.NotificationPopup; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; + +/** + * A non-blocking, auto-dismissing notification shown after a successful stash + * apply operation. + */ +public class StashApplyResultNotification { + + /** + * Opens a notification popup for a successful stash apply. + * + * @param shell + * the parent shell + * @param repository + * the repository + * @param commit + * the stashed commit that was applied + */ + public static void open(Shell shell, Repository repository, + RevCommit commit) { + NotificationPopup.forShell(shell) + .title(UIText.StashApplyResultNotification_Title, true) + .content(parent -> { + GridLayoutFactory.fillDefaults().margins(4, 0) + .applyTo(parent); + Label body = new Label(parent, SWT.WRAP); + body.setText(NLS.bind( + UIText.StashApplyResultNotification_Message, + Utils.getShortObjectId(commit), + RepositoryUtil.INSTANCE + .getRepositoryName(repository))); + GridDataFactory.fillDefaults().grab(true, false) + .hint(280, SWT.DEFAULT).applyTo(body); + return parent; + }) + .open(); + } +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashCreateUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashCreateUI.java index 829d35f516..5aac5fbcf6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashCreateUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/stash/StashCreateUI.java @@ -19,6 +19,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.egit.core.RepositoryUtil; +import org.eclipse.egit.core.internal.Utils; import org.eclipse.egit.core.op.StashCreateOperation; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.JobFamilies; @@ -28,8 +30,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.notifications.NotificationPopup; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.window.Window; +import org.eclipse.osgi.util.NLS; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.swt.SWT; @@ -83,6 +89,32 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { RevCommit commit = op.getCommit(); if (commit == null) { showNoChangesToStash(); + } else if (Activator.getDefault().getPreferenceStore() + .getBoolean(UIPreferences.STASH_APPLY_SHOW_NOTIFICATION)) { + PlatformUI.getWorkbench().getDisplay().asyncExec(() -> { + Shell activeShell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + NotificationPopup.forShell(activeShell) + .title(UIText.StashCreateResultNotification_Title, + true) + .content(parent -> { + GridLayoutFactory.fillDefaults() + .margins(4, 0).applyTo(parent); + Label body = new Label(parent, SWT.WRAP); + body.setText(NLS.bind( + UIText.StashCreateResultNotification_Message, + Utils.getShortObjectId(commit), + RepositoryUtil.INSTANCE + .getRepositoryName( + repo))); + GridDataFactory.fillDefaults() + .grab(true, false) + .hint(280, SWT.DEFAULT) + .applyTo(body); + return parent; + }) + .open(); + }); } } catch (CoreException e) { Activator diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 2c90517b9e..6a367eeb5e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1129,6 +1129,10 @@ FetchResultNotification_Title=Fetched from {0} FetchResultNotification_UpToDate=Everything up to date. FetchResultNotification_RefsUpdated={0} ref(s) updated. FetchResultNotification_Details=Details... +StashApplyResultNotification_Title=Stash Applied +StashApplyResultNotification_Message=Stash {0} was successfully applied to {1}. +StashCreateResultNotification_Title=Stash Created +StashCreateResultNotification_Message=Changes in {1} were stashed as {0}. FetchResultTable_addingChildren=Adding Children FetchResultTable_counterCommits=\ ({0}) @@ -1503,6 +1507,7 @@ DialogsPreferencePage_ShowDeleteRepoGroup=Deletion of non-empty repository group DialogsPreferencePage_ShowInfoGroupHeader=Show result dialogs after git remote operations DialogsPreferencePage_ShowFetchInfoDialog=&Fetch Result Dialog DialogsPreferencePage_FetchShowNotification=Use ¬ification instead of dialog for fetch result +DialogsPreferencePage_StashApplyShowNotification=Show ¬ification after successful stash apply DialogsPreferencePage_ShowPushInfoDialog=&Push Result Dialog DialogsPreferencePage_ShowTooltip=If unchecked, the result dialog will not be shown automatically. It will still be available via the progress view. DialogsPreferencePage_HideWarningGroupHeader=Log warnings From 59c725e3d7581787a824aedec9df116285634eea Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 4 Mar 2026 11:59:36 +0100 Subject: [PATCH 152/160] Add push result notification as alternative to result dialog Add a non-blocking, auto-dismissing PushResultNotification popup as an alternative to the blocking PushResultDialog, mirroring the fetch notification introduced in the previous commits. A new preference PUSH_SHOW_NOTIFICATION (default: false) controls whether ShowPushResultAction shows the notification or the traditional dialog. The notification displays a summary (up-to-date, N ref(s) pushed, or push rejected) and a "Details..." link that opens PushResultDialog on demand. The notification correctly reports push rejections (non-fast-forward, remote changed, etc.) instead of showing "Everything up to date". The preference checkbox appears on the Dialogs preference page below the existing "Push Result Dialog" checkbox. Bug: egit-144 Change-Id: I82149d07eea414f84366371a547d5a63e8e5c44a --- .../egit/ui/PluginPreferenceInitializer.java | 1 + .../org/eclipse/egit/ui/UIPreferences.java | 2 + .../org/eclipse/egit/ui/internal/UIText.java | 16 ++ .../preferences/DialogsPreferencePage.java | 2 + .../internal/push/PushResultNotification.java | 153 ++++++++++++++++++ .../internal/push/ShowPushResultAction.java | 16 +- .../egit/ui/internal/uitext.properties | 6 + 7 files changed, 192 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultNotification.java diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java index 8a7ff5aae2..4ce8230d9f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/PluginPreferenceInitializer.java @@ -122,6 +122,7 @@ public void initializeDefaultPreferences() { store.setDefault(UIPreferences.FETCH_SHOW_NOTIFICATION, false); store.setDefault(UIPreferences.STASH_APPLY_SHOW_NOTIFICATION, true); store.setDefault(UIPreferences.SHOW_PUSH_POPUP_SUCCESS, true); + store.setDefault(UIPreferences.PUSH_SHOW_NOTIFICATION, false); store.setDefault(UIPreferences.SHOW_HOME_DIR_WARNING, true); store.setDefault(UIPreferences.LFS_AUTO_CONFIGURATION, false); store.setDefault(UIPreferences.SHOW_DETACHED_HEAD_WARNING, true); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java index 167192b3b8..271a8f5931 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIPreferences.java @@ -232,6 +232,8 @@ private UIPreferences() { /** */ public static final String STASH_APPLY_SHOW_NOTIFICATION = "stash_apply_show_notification"; //$NON-NLS-1$ /** */ + public static final String PUSH_SHOW_NOTIFICATION = "push_show_notification"; //$NON-NLS-1$ + /** */ public static final String SHOW_HOME_DIR_WARNING = "show_home_drive_warning"; //$NON-NLS-1$ /** */ public static final String LFS_AUTO_CONFIGURATION = "auto_lfs_config"; //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 2c504c9280..bb271647ff 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -3021,6 +3021,19 @@ public class UIText extends NLS { /** */ public static String PushResultDialog_title; + /** */ + public static String PushResultNotification_Title; + + /** */ + public static String PushResultNotification_UpToDate; + + /** */ + public static String PushResultNotification_RefsUpdated; + /** */ + public static String PushResultNotification_PushRejected; + /** */ + public static String PushResultNotification_Details; + /** */ public static String PushResultTable_MessageText; @@ -4253,6 +4266,9 @@ public class UIText extends NLS { /** */ public static String DialogsPreferencePage_ShowPushInfoDialog; + /** */ + public static String DialogsPreferencePage_PushShowNotification; + /** */ public static String DialogsPreferencePage_ShowTooltip; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java index 5e420f018f..7e1972f522 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DialogsPreferencePage.java @@ -116,6 +116,8 @@ protected void createFieldEditors() { addField(editor); editor.getDescriptionControl(infoGroup) .setToolTipText(UIText.DialogsPreferencePage_ShowTooltip); + addField(new BooleanFieldEditor(UIPreferences.PUSH_SHOW_NOTIFICATION, + UIText.DialogsPreferencePage_PushShowNotification, infoGroup)); updateMargins(infoGroup); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultNotification.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultNotification.java new file mode 100644 index 0000000000..b2aee31d51 --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultNotification.java @@ -0,0 +1,153 @@ +/******************************************************************************* + * Copyright (C) 2026 vogella GmbH and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.push; + +import org.eclipse.egit.core.op.PushOperationResult; +import org.eclipse.egit.ui.internal.UIText; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.notifications.AbstractNotificationPopup; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.transport.RemoteRefUpdate; +import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import org.eclipse.jgit.transport.URIish; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; + +/** + * A non-blocking, auto-dismissing notification shown after a successful push + * operation when the user has enabled the notification preference. Uses + * Eclipse's {@link AbstractNotificationPopup} for proper fade animation and + * positioning. + */ +public class PushResultNotification extends AbstractNotificationPopup { + + private static final long DELAY_CLOSE_MS = 5000; + + private final Repository repository; + + private final PushOperationResult result; + + private final String destination; + + private final boolean showConfigure; + + private final @NonNull PushMode pushMode; + + /** + * @param parent + * the parent shell (used to obtain the Display) + * @param repository + * the repository that was pushed + * @param result + * the push result + * @param destination + * display string identifying the remote destination + * @param showConfigure + * whether to show the configure button in the detail dialog + * @param pushMode + * the push mode used + */ + public PushResultNotification(Shell parent, Repository repository, + PushOperationResult result, String destination, + boolean showConfigure, @NonNull PushMode pushMode) { + super(parent.getDisplay()); + setParentShell(parent); + this.repository = repository; + this.result = result; + this.destination = destination; + this.showConfigure = showConfigure; + this.pushMode = pushMode; + setDelayClose(DELAY_CLOSE_MS); + setFadingEnabled(true); + } + + @Override + protected String getPopupShellTitle() { + return NLS.bind(UIText.PushResultNotification_Title, destination); + } + + @Override + protected void createContentArea(Composite parent) { + GridLayoutFactory.fillDefaults().margins(4, 0).applyTo(parent); + + Label body = new Label(parent, SWT.WRAP); + int updated = 0; + int rejected = 0; + boolean upToDate = true; + boolean hasErrors = false; + + for (URIish uri : result.getURIs()) { + String errorMessage = result.getErrorMessage(uri); + if (errorMessage != null && !errorMessage.isEmpty()) { + hasErrors = true; + continue; + } + for (RemoteRefUpdate update : result.getPushResult(uri) + .getRemoteUpdates()) { + Status status = update.getStatus(); + if (status == Status.OK) { + updated++; + upToDate = false; + } else if (isRejected(status)) { + rejected++; + upToDate = false; + } else if (status != Status.UP_TO_DATE) { + upToDate = false; + } + } + } + + if (rejected > 0 || hasErrors) { + body.setText(UIText.PushResultNotification_PushRejected); + } else if (upToDate) { + body.setText(UIText.PushResultNotification_UpToDate); + } else { + body.setText(NLS.bind(UIText.PushResultNotification_RefsUpdated, + Integer.valueOf(updated))); + } + + GridDataFactory.fillDefaults().grab(true, false).hint(280, SWT.DEFAULT) + .applyTo(body); + + Link details = new Link(parent, SWT.NONE); + details.setText( + "" + UIText.PushResultNotification_Details + ""); //$NON-NLS-1$ //$NON-NLS-2$ + details.addListener(SWT.Selection, e -> { + close(); + Shell activeShell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + PushResultDialog dialog = new PushResultDialog(activeShell, + repository, result, destination, false, pushMode); + dialog.showConfigureButton(showConfigure); + dialog.open(); + }); + GridDataFactory.fillDefaults().applyTo(details); + } + + private boolean isRejected(Status status) { + switch (status) { + case REJECTED_NODELETE: + case REJECTED_NONFASTFORWARD: + case REJECTED_OTHER_REASON: + case REJECTED_REMOTE_CHANGED: + return true; + default: + return false; + } + } +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ShowPushResultAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ShowPushResultAction.java index 31da2ec91b..6b7dd03905 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ShowPushResultAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/ShowPushResultAction.java @@ -11,6 +11,8 @@ package org.eclipse.egit.ui.internal.push; import org.eclipse.egit.core.op.PushOperationResult; +import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.jobs.RepositoryJobResultAction; import org.eclipse.jgit.annotations.NonNull; @@ -67,9 +69,15 @@ private boolean isModal(Shell shell) { protected void showResult(@NonNull Repository repository) { Shell shell = PlatformUI.getWorkbench().getModalDialogShellProvider() .getShell(); - PushResultDialog dialog = new PushResultDialog(shell, repository, - operationResult, destination, isModal(shell), pushMode); - dialog.showConfigureButton(showConfigure); - dialog.open(); + if (Activator.getDefault().getPreferenceStore() + .getBoolean(UIPreferences.PUSH_SHOW_NOTIFICATION)) { + new PushResultNotification(shell, repository, operationResult, + destination, showConfigure, pushMode).open(); + } else { + PushResultDialog dialog = new PushResultDialog(shell, repository, + operationResult, destination, isModal(shell), pushMode); + dialog.showConfigureButton(showConfigure); + dialog.open(); + } } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 6a367eeb5e..875ed61058 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1021,6 +1021,11 @@ CreateRepositoryPage_ReadDefaultBranchFailed=Reading git configuration "init.def PushResultDialog_title=Push Results: {0} PushResultDialog_label=Pushed to {0} PushResultDialog_label_failed=Failed pushing to {0} +PushResultNotification_Title=Pushed to {0} +PushResultNotification_UpToDate=Everything up to date. +PushResultNotification_RefsUpdated={0} ref(s) pushed. +PushResultNotification_PushRejected=Push rejected. +PushResultNotification_Details=Details... PushResultDialog_ConfigureButton=C&onfigure... PushResultTable_MessageText=Message Details PushResultTable_PrePushHookOutput=Output from the ''pre-push'' hook:\n{0}{1}--------\n @@ -1509,6 +1514,7 @@ DialogsPreferencePage_ShowFetchInfoDialog=&Fetch Result Dialog DialogsPreferencePage_FetchShowNotification=Use ¬ification instead of dialog for fetch result DialogsPreferencePage_StashApplyShowNotification=Show ¬ification after successful stash apply DialogsPreferencePage_ShowPushInfoDialog=&Push Result Dialog +DialogsPreferencePage_PushShowNotification=Use notificatio&n instead of dialog for push result DialogsPreferencePage_ShowTooltip=If unchecked, the result dialog will not be shown automatically. It will still be available via the progress view. DialogsPreferencePage_HideWarningGroupHeader=Log warnings DialogsPreferencePage_HomeDirWarning=&Home directory warning (Windows only) From 6a0ed4761bfca36ed6b265095ce34c92a5814410 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 12:36:19 +0200 Subject: [PATCH 153/160] Add a missing copyright header in a test class Change-Id: I5077d65d82e1b07751912f4cc67fc833b53c9a65 --- .../commit/DiffEditorOutlinePageSortingTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePageSortingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePageSortingTest.java index 2958a553ad..af22e26d92 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePageSortingTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePageSortingTest.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2021 Thomas Wolf and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ package org.eclipse.egit.ui.internal.commit; import static org.junit.Assert.assertArrayEquals; From f431e15c6530bc0a74f73e4478ff87e2c68a7697 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 11:50:33 +0200 Subject: [PATCH 154/160] DiffEditorOutlinePage: fix typos in comments Change-Id: I6da49589348d54f48b42348c41722c1b30c9b6d0 --- .../egit/ui/internal/commit/DiffEditorOutlinePage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java index b083c991f9..cfbe323708 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java @@ -181,7 +181,7 @@ private TreeViewer getTreeViewerChecked() { * if an identical listener is already registered. * * @param listener - * to add to the page'sviewer + * to add to the page's viewer */ public void addOpenListener(IOpenListener listener) { openListeners.addIfAbsent(listener); @@ -192,7 +192,7 @@ public void addOpenListener(IOpenListener listener) { * the listener is not registered. * * @param listener - * to remove from this page's viewer. + * to remove from this page's viewer */ public void removeOpenListener(IOpenListener listener) { openListeners.remove(listener); @@ -527,7 +527,7 @@ public void dispose() { } /** - * Opens a quick outline analgous to the outline page with tree filter + * Opens a quick outline analogous to the outline page with tree filter * capability. * * @param document From 25683061343bcd2922b4f480ccd641c75cfd15d0 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 11:50:33 +0200 Subject: [PATCH 155/160] DiffEditorOutlinePage: fix quick outline not appearing The quick outline in the DiffEditor (read-only diff page in the commit viewer), bound to Cmd/Ctrl-O in the editor, was broken since commit 0e458fca7. That commit changed the context menu to use command contributions instead of hard-coded Actions and registered the context menu with the view site. But there is no view site when the control is created via the QuickOutlinePopup, and getSite() returns null. An NPE got logged and the popup never appeared. So instead of creating the menu and then later remove it again don't create the menu at all in the first place. Change-Id: I2c10de5953693d4c715c9cca59cee4f91da5bbc9 --- .../egit/ui/test/commit/CommitEditorTest.java | 40 ++++++++++++++++++- .../commit/DiffEditorOutlinePage.java | 7 +++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java index 87484b9df9..36c31a2e6f 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011, 2013 GitHub Inc and others. + * Copyright (c) 2011, 2026 GitHub Inc and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ *****************************************************************************/ package org.eclipse.egit.ui.test.commit; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -24,6 +25,7 @@ import org.eclipse.egit.core.RepositoryCache; import org.eclipse.egit.ui.JobFamilies; import org.eclipse.egit.ui.common.LocalRepositoryTestCase; +import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.commit.CommitEditor; import org.eclipse.egit.ui.internal.commit.RepositoryCommit; import org.eclipse.egit.ui.test.ContextMenuHelper; @@ -32,8 +34,11 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.swt.custom.StyledText; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotMultiPageEditor; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -98,6 +103,39 @@ public void run() { botEditor.close(); } + @Test + public void quickOutlineShows() throws Exception { + final AtomicReference editorRef = new AtomicReference<>(); + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + RepositoryCommit repoCommit = new RepositoryCommit(repository, + commit); + editorRef.set(CommitEditor.openQuiet(repoCommit)); + } + }); + assertNotNull(editorRef.get()); + IEditorPart editor = editorRef.get(); + assertTrue(editor instanceof CommitEditor); + IEditorInput input = editor.getEditorInput(); + assertNotNull(input); + SWTBotMultiPageEditor botEditor = bot + .multipageEditorByTitle(input.getName()); + assertNotNull(botEditor); + assertTrue(botEditor.getPageCount() > 1); + botEditor.activatePage(UIText.DiffEditor_Title); + SWTBotStyledText botText = new SWTBotStyledText( + botEditor.bot().widget(widgetOfType(StyledText.class), 1)); + ContextMenuHelper.clickContextMenu(botText, + UIText.DiffEditor_QuickOutlineAction); + SWTBotShell botShell = bot.activeShell(); + assertNotNull(botShell.bot() + .label(UIText.DiffEditor_QuickOutlineFilterDescription)); + botShell.close(); + botEditor.close(); + } + @Test public void showAnnotations() throws Exception { final AtomicReference editorRef = new AtomicReference<>(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java index cfbe323708..46822c1c44 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2016, Thomas Wolf + * Copyright (C) 2016, 2026 Thomas Wolf * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -225,6 +225,10 @@ public void run() { } private void createContextMenu(TreeViewer viewer) { + if (getSite() == null) { + // We've been opened via the QuickOutlinePopup: no context menu. + return; + } MenuManager contextMenu = new MenuManager(); contextMenu.setRemoveAllWhenShown(true); contextMenu.addMenuListener(menuManager -> { @@ -700,7 +704,6 @@ public void widgetDefaultSelected(SelectionEvent e) { } } }); - tree.setMenu(null); return delegate.getTreeViewer().getControl(); } From 2df1556d64fe83e6ff1fc82cff5ea4422a4ae199 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 13:45:14 +0200 Subject: [PATCH 156/160] DiffEditor quick outline: fix info text s/Close/close/ . No capitalization after semicolon. Change-Id: I7cd44d264f669b33804265d3d1982a3f639615bf --- .../src/org/eclipse/egit/ui/internal/uitext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 875ed61058..ae992ca7dc 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1533,7 +1533,7 @@ DiffEditor_OutlineShowCompactTreeTooltip=Show nested folders DiffEditor_OutlineTreeToggle=Toggle Presentation DiffEditor_QuickOutlineAction=&Quick Outline DiffEditor_QuickOutlineFilterHint=Filter... -DiffEditor_QuickOutlineFilterDescription=Filter by entering search string; Close with ESC +DiffEditor_QuickOutlineFilterDescription=Filter by entering search string; close with ESC DiffEditorInput_Title1=Diff {0} ({1}) DiffEditorInput_Title2=Diff {0}..{1} ({2}) DiffEditorInput_Tooltip1=Changes of commit {0} in git repository ''{1}'' From ee0f14ae531bcad922b483c45f9a930b52bb6531 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 11:56:21 +0200 Subject: [PATCH 157/160] DiffEditorOutlinePage: don't store dialog settings Storing dialog settings would remember the position of the popup. This is not good: the dialog should always open vertically centered on the DiffEditor. Remove getDialogSettings(). Previously, when opened on a large diff with many files, the popup dialog would be very large and its top left corner be near or even at the top of the screen. If the dialog was then opened on some other diff with very few files, the dialog would still appear at the top of the screen instead of centered over the DiffEditor. Change-Id: Ieee2bdcbd3e365f0c510ad82f19b1d18e300a4bd --- .../internal/commit/DiffEditorOutlinePage.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java index 46822c1c44..1203c67df2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java @@ -33,7 +33,6 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.commands.ActionHandler; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.preference.IPreferenceStore; @@ -563,7 +562,7 @@ public QuickOutlinePopup(IDocument document, public QuickOutlinePopup(Shell parent, IDocument document, ISelectionProvider selectionProvider) { - super(parent, SWT.RESIZE, true, false, true, true, true, + super(parent, SWT.RESIZE, true, false, false, true, false, UIText.DiffEditor_QuickOutlineAction, UIText.DiffEditor_QuickOutlineFilterDescription); delegate = new DiffEditorOutlinePage(); @@ -721,20 +720,6 @@ public boolean close() { return super.close(); } - @Override - protected IDialogSettings getDialogSettings() { - String sectionName = "diffEditor.quickoutline"; //$NON-NLS-1$ - - IDialogSettings settings = Activator.getDefault() - .getDialogSettings().getSection(sectionName); - if (settings == null) { - settings = Activator.getDefault().getDialogSettings() - .addNewSection(sectionName); - } - - return settings; - } - @Override protected Point getDefaultLocation(Point initialSize) { IEditorPart editor = PlatformUI.getWorkbench() From 052b448303309f79509c193e744070de6070a317 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 12:07:15 +0200 Subject: [PATCH 158/160] DiffEditor: let the TextEditor handle preference changes The TextEditor already handles JFace or EditorUI preference changes, so our own viewer doesn't need to do so. Override the two methods that implement this editor functionality in the viewer with empty methods. Change-Id: I07eaec8858e14bb27b6e7ff6c2dac8d3f1c39afa --- .../egit/ui/internal/commit/DiffEditor.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditor.java index 10770ef1fc..de5ad9772c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditor.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2020 GitHub Inc. and others. + * Copyright (c) 2011, 2026 GitHub Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -9,7 +9,7 @@ * * Contributors: * Kevin Sawicki (GitHub Inc.) - initial API and implementation - * Thomas Wolf - turn it into a real text editor + * Thomas Wolf - turn it into a real text editor *******************************************************************************/ package org.eclipse.egit.ui.internal.commit; @@ -71,6 +71,7 @@ import org.eclipse.jface.text.source.projection.ProjectionSupport; import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; @@ -258,10 +259,23 @@ protected ISourceViewer createSourceViewer(Composite parent, DiffViewer viewer = new DiffViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles, getSite().getService(IContextService.class)) { + @Override protected void setFont(Font font) { // Don't do anything; AbstractTextEditor handles this. } + + @Override + protected void handleEditorPreferencesChange( + PropertyChangeEvent event) { + // Don't do anything; AbstractTextEditor handles this. + } + + @Override + protected void handleJFacePreferencesChange( + PropertyChangeEvent event) { + // Don't do anything; AbstractTextEditor handles this. + } }; getSourceViewerDecorationSupport(viewer); ProjectionSupport projector = new ProjectionSupport(viewer, From 2388d64f206f118f56d296c01063a2dc7c84745c Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 3 Apr 2026 15:04:37 +0200 Subject: [PATCH 159/160] CreateTagDialog: fix layout of tag message text input Same issue as in the the "Reword Commit Message" dialog (see commit 889aa104). It's still unknown why this occurs on Mac OS. The same work-around works: re-layout the widgets the first time the text input is to be drawn. However, this time requestLayout() is not sufficient. We really have to force a layout via layout(true, true). Bug: egit-162 Change-Id: I1d951eedcd5d43683a4e9060d8400216023b819f --- .../egit/ui/internal/dialogs/CreateTagDialog.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java index 7bcef4f824..04a168d1f5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2010, 2013 Dariusz Luksza and others. + * Copyright (C) 2010, 2026 Dariusz Luksza and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -82,6 +82,7 @@ import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; @@ -144,6 +145,9 @@ public class CreateTagDialog extends TitleAreaDialog { private SpellcheckableMessageArea tagMessageText; + // XXX: Work-around for https://github.com/eclipse-egit/egit/issues/162 + private PaintListener layoutBugWorkaround; + private Button overwriteButton; private Button signButton; @@ -578,6 +582,13 @@ public void modifyText(ModifyEvent e) { } }); + layoutBugWorkaround = event -> { + tagMessageText.removePaintListener(layoutBugWorkaround); + layoutBugWorkaround = null; + left.layout(true, true); + }; + tagMessageText.addPaintListener(layoutBugWorkaround); + overwriteButton = new Button(left, SWT.CHECK); overwriteButton.setEnabled(false); overwriteButton.setText(UIText.CreateTagDialog_overwriteTag); From b8a74bc498864484c80f9ad9da7a391889b8468c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 Apr 2026 15:51:50 +0200 Subject: [PATCH 160/160] Update dependencies jgit - bytebuddy to 1.18.8 - jetty to 12.1.8 orbit - aQute.libg to 7.2.3.202603250810 - bndtools.api to 7.2.3.202603250810 - com.ibm.icu to 78.3.0 - org.commonmark to 0.28.0 - org.commonmark.ext-gfm-tables to 0.28.0 Change-Id: I33d9b0ee8a4efcef4e065ad3d254e914e3742457 --- org.eclipse.egit.target/egit-4.36.target | 22 ++++++------ org.eclipse.egit.target/egit-4.37.target | 22 ++++++------ org.eclipse.egit.target/egit-4.38.target | 22 ++++++------ org.eclipse.egit.target/egit-4.39.target | 22 ++++++------ org.eclipse.egit.target/egit-4.40.target | 34 +++++++++---------- .../maven/dependencies.tpd | 20 +++++------ org.eclipse.egit.target/orbit/orbit-4.40.tpd | 10 +++--- 7 files changed, 76 insertions(+), 76 deletions(-) diff --git a/org.eclipse.egit.target/egit-4.36.target b/org.eclipse.egit.target/egit-4.36.target index b4e95b0412..3f56d32658 100644 --- a/org.eclipse.egit.target/egit-4.36.target +++ b/org.eclipse.egit.target/egit-4.36.target @@ -1,7 +1,7 @@ - + @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.egit.target/egit-4.37.target b/org.eclipse.egit.target/egit-4.37.target index d3e79af789..4da3e81f18 100644 --- a/org.eclipse.egit.target/egit-4.37.target +++ b/org.eclipse.egit.target/egit-4.37.target @@ -1,7 +1,7 @@ - + @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.egit.target/egit-4.38.target b/org.eclipse.egit.target/egit-4.38.target index c4880aa06b..6aa881d743 100644 --- a/org.eclipse.egit.target/egit-4.38.target +++ b/org.eclipse.egit.target/egit-4.38.target @@ -1,7 +1,7 @@ - + @@ -234,49 +234,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar @@ -312,13 +312,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.egit.target/egit-4.39.target b/org.eclipse.egit.target/egit-4.39.target index fee565955a..966b3c8d70 100644 --- a/org.eclipse.egit.target/egit-4.39.target +++ b/org.eclipse.egit.target/egit-4.39.target @@ -1,7 +1,7 @@ - + @@ -254,49 +254,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar @@ -332,13 +332,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.egit.target/egit-4.40.target b/org.eclipse.egit.target/egit-4.40.target index 79575ac522..73e9055c17 100644 --- a/org.eclipse.egit.target/egit-4.40.target +++ b/org.eclipse.egit.target/egit-4.40.target @@ -1,7 +1,7 @@ - + @@ -15,9 +15,9 @@ - - - + + + @@ -64,8 +64,8 @@ - - + + @@ -105,7 +105,7 @@ - + @@ -253,49 +253,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar @@ -331,13 +331,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd index 09da340743..2d01beb848 100644 --- a/org.eclipse.egit.target/maven/dependencies.tpd +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -96,12 +96,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.7" + version = "1.18.8" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.7" + version = "1.18.8" } } @@ -140,42 +140,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "jakarta.servlet" diff --git a/org.eclipse.egit.target/orbit/orbit-4.40.tpd b/org.eclipse.egit.target/orbit/orbit-4.40.tpd index f965a2f8ce..998813ab0a 100644 --- a/org.eclipse.egit.target/orbit/orbit-4.40.tpd +++ b/org.eclipse.egit.target/orbit/orbit-4.40.tpd @@ -3,9 +3,9 @@ target "orbit-4.40" with source configurePhase // when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-06" { - aQute.libg [7.2.1.202601121903,7.2.1.202601121903] - bndtools.api [7.2.1.202601121903,7.2.1.202601121903] - com.ibm.icu [78.2.0,78.2.0] + aQute.libg [7.2.3.202603250810,7.2.3.202603250810] + bndtools.api [7.2.3.202603250810,7.2.3.202603250810] + com.ibm.icu [78.3.0,78.3.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] @@ -52,8 +52,8 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.apache.lucene.analysis-common [10.4.0.v20260226-1000,10.4.0.v20260226-1000] org.apache.lucene.analysis-smartcn [10.4.0.v20260226-1000,10.4.0.v20260226-1000] org.apache.lucene.core [10.4.0.v20260226-1000,10.4.0.v20260226-1000] - org.commonmark [0.27.1,0.27.1] - org.commonmark.ext-gfm-tables [0.27.1,0.27.1] + org.commonmark [0.28.0,0.28.0] + org.commonmark.ext-gfm-tables [0.28.0,0.28.0] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [3.0.0,3.0.0] org.hamcrest.source [3.0.0,3.0.0]