From 7f37ec7cb9729db5ef8db83fdb2cf684c3155dcb Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Sep 2018 09:58:45 +0200 Subject: Don't auto-refresh projects with missing .project file Doing so results in a ResourceException. Auto-closing such projects doesn't seem to be right; it would remain closed after the .project file re-appeared due to some other git operation. Not refreshing appears to be the best bet in this case. Bug: 538846 Change-Id: Icf01ec0f467bbcc5f7b13ab3b5914779c16b8a2a Signed-off-by: Thomas Wolf Signed-off-by: Matthias Sohn --- org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java index d618df5a95..fa0404ca92 100755 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java @@ -35,6 +35,7 @@ import java.util.stream.Stream; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRunnable; @@ -653,7 +654,11 @@ public class Activator extends AbstractUIPlugin implements DebugOptionsListener if (project.isAccessible()) { IPath path = project.getLocation(); if (path != null) { - result.put(path, project); + IPath projectFilePath = path.append( + IProjectDescription.DESCRIPTION_FILE_NAME); + if (projectFilePath.toFile().exists()) { + result.put(path, project); + } } } } -- cgit v1.2.3 From 1ed88470943a5b05033f0b4a9c42ab4ba11814ab Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Sep 2018 12:36:25 +0200 Subject: [releng] Fix unstable HistoryViewTest.testOpenOfDeletedFile() The file diff viewer newly computes its content asynchronously. Give that background job a job family, and join on it in the test to ensure that the expected content is actually there. Change-Id: I80335bb7540ca8395a1bf10262d9de21bbd944ac Signed-off-by: Thomas Wolf --- .../org/eclipse/egit/ui/test/history/HistoryViewTest.java | 14 ++++++++++++-- .../egit/ui/internal/history/FileDiffContentProvider.java | 7 +++++++ 2 files changed, 19 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 4f637578a0..911f913139 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 @@ -50,6 +50,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.team.ui.history.IHistoryView; +import org.eclipse.ui.PlatformUI; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -265,6 +266,16 @@ public class HistoryViewTest extends LocalRepositoryTestCase { return getHistoryViewBot().table(); } + private SWTBotTable getFileDiffTable() throws Exception { + Job.getJobManager().join(JobFamilies.HISTORY_DIFF, null); + // Wait a little bit to give the UiJob triggered a chance to run + Thread.sleep(100); + // Then join the UI update + PlatformUI.getWorkbench().getDisplay().asyncExec(() -> { + /* empty */ }); + return getHistoryViewBot().table(1); + } + private SWTBot getHistoryViewBot() { return TestUtil.showHistoryView().bot(); } @@ -384,8 +395,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase { assertEquals(commitCount + 1, commitsTable.rowCount()); commitsTable.select(0); - SWTBot viewBot = getHistoryViewBot(); - SWTBotTable fileDiffTable = viewBot.table(1); + SWTBotTable fileDiffTable = getFileDiffTable(); assertEquals(1, fileDiffTable.rowCount()); fileDiffTable.select(0); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java index 9c7c26ed2b..e00c7554b2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.JobFamilies; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.StructuredSelection; @@ -170,6 +171,12 @@ public class FileDiffContentProvider implements IStructuredContentProvider { public FileDiff[] getDiffs() { return diffs; } + + @Override + public boolean belongsTo(Object family) { + return family == JobFamilies.HISTORY_DIFF + || super.belongsTo(family); + } } private class UpdateJob extends UIJob { -- cgit v1.2.3 From 81c42e3003c978cd66a4f2dbd9a95839f7e9efd5 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Sep 2018 11:41:22 +0200 Subject: Don't log an error on save in comparisons if resource out of sync CompareEditorInput.saveChanges() also only displays a dialog if something goes wrong with saving. We cannot just let the exception propagate because this is also reachable via other code paths that do not appear to check for InvocationTargetException. So we need to handle it somehow. Do not log the error; just present an error to the user via the StatusManager. Bug: 538855 Change-Id: I03f0699f4641a9ba99815aad0869c0ef1d4c2a66 Signed-off-by: Thomas Wolf --- .../egit/ui/internal/revision/ResourceEditableRevision.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/ResourceEditableRevision.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/ResourceEditableRevision.java index d07adccdb4..a1846775ee 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/ResourceEditableRevision.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/ResourceEditableRevision.java @@ -80,8 +80,13 @@ public class ResourceEditableRevision extends EditableRevision { } }); } catch (InvocationTargetException e) { - Activator.handleError(e.getTargetException().getMessage(), - e.getTargetException(), true); + if (e.getCause() instanceof CoreException) { + Activator.showErrorStatus(e.getCause().getLocalizedMessage(), + ((CoreException) e.getCause()).getStatus()); + } else { + Activator.showError(e.getCause().getLocalizedMessage(), + e.getCause()); + } } catch (InterruptedException e) { // ignore here } -- cgit v1.2.3 From ca3a1f9318e33a95dcf3079f71de2fafe2687393 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 11 Sep 2018 18:23:54 +0200 Subject: Update documentation for 5.1.0 Change-Id: I25fd79dc01cf81e6411122e6e32c05492c8a13ee Signed-off-by: Matthias Sohn --- org.eclipse.egit.doc/build-help.xml | 4 +- .../help/EGit/Contributor_Guide/Builds.html | 13 +- .../help/EGit/New_and_Noteworthy/5.0/5.0.html | 184 -------------- .../EGit/New_and_Noteworthy/5.0/Contributors.html | 64 ----- .../5.0/Updating-This-Document.html | 55 ----- .../help/EGit/New_and_Noteworthy/5.1/5.1.html | 275 +++++++++++++++++++++ .../EGit/New_and_Noteworthy/5.1/Contributors.html | 66 +++++ .../5.1/Updating-This-Document.html | 55 +++++ .../help/EGit/User_Guide/Tasks.html | 2 +- .../help/JGit/New_and_Noteworthy/5.0/5.0.html | 160 ------------ .../5.0/Updating-This-Document.html | 55 ----- .../help/JGit/New_and_Noteworthy/5.1/5.1.html | 201 +++++++++++++++ .../5.1/Updating-This-Document.html | 55 +++++ org.eclipse.egit.doc/help/toc.xml | 36 ++- 14 files changed, 683 insertions(+), 542 deletions(-) delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html delete mode 100644 org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html delete mode 100644 org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html create mode 100644 org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html create mode 100644 org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 282f380c67..5544e6fc09 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -44,8 +44,8 @@ > - - + + diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html index c5f9a14dad..f67ccdf170 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html @@ -79,7 +79,7 @@
  • Due to a limitation of Tycho it is not possible to mix pom-first and manifest-first builds in the same reactor build hence the pom-first JGit build has to run separately before the build for the manifest-first JGit packaging project.
  • -
  • The 3 builds must share the same local Maven repository otherwise dependencies between these builds cannot be resolved.
  • +
  • The local maven builds must share the same local Maven repository otherwise dependencies between these builds cannot be resolved.
  • To run the build behind a firewall follow http://maven.apache.org/guides/mini/guide-proxies.html
  • @@ -98,11 +98,20 @@ [~/src/egit] $ mvn clean install [INFO] Scanning for projects... ... + +[~/src/jgit] $ cd ../egit-github + +[~/src/egit-github] $ mvn clean install +[INFO] Scanning for projects... +...

    The EGit build uses the JGit p2 repository to resolve jgit dependencies. For local builds the build assumes that egit and jgit source trees are located under a common parent folder. If this is not the case the path to the jgit p2 repository has to be injected via system property:

    -
    [~/src/egit] $ mvn clean install -Djgit-site=file:/path/to/org.eclipse.jgit.updatesite/target/site
    +		
    [~/src/egit] $ mvn clean install -Djgit-site=file:/path/to/jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository
    +
    +

    in the same way you can configure a custom path for the build of egit-github to the egit p2 repository

    +
    [~/src/egit-github] $ mvn clean install -Degit-site=file:/path/to/egit/org.eclipse.egit.repository/target/repository
     

    The hudson build on build.eclipse.org uses (for SNAPSHOT builds):

    [~/src/egit] $ mvn clean install -Djgit-site=https://repo.eclipse.org/content/unzip/snapshots.unzip/
    diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html
    deleted file mode 100644
    index 8b2bc27a9c..0000000000
    --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html
    +++ /dev/null
    @@ -1,184 +0,0 @@
    -
    -
    -	
    -		
    -		EGit 5.0 New and Noteworthy
    -		
    -	
    -	
    -		
    -			
    -				
    -			
    -			
    -				
    -				
    -				
    -			
    -			
    -				
    -				
    -				
    -			
    -		
    -		

    EGit

    -

    Features

    -
      -
    • Built-in EGit integration for LFS -
        -
      • Register builtin LFS on startup. When EGit starts and the lfs bundle (org.eclipse.jgit.lfs) is available register the LFS implementation and check configuration.
      • -
      • Allow install (enablement) of LFS support in Preferences (global) and on the repository (local).
      • -
      • Apply smudge/clean filters where applicable and required.
      • -
      • LFS integration using built-in JGit lfs filters fully works when using Gerrit with lfs plugin using ssh protocol.
      • -
      • Authentication when transporting lfs objects over http still missing, this is tracked in JGit - bug 535814 -
      • -
      -
    • -
    • - bug 534604 Enable resource selection for launch variables -
    • -
    • - bug 533344 Allow cherry-picking a Gerrit change -
    • -
    • - bug 531953 Allow cherry-picking merge commits -
    • -
    • - bug 529255 Github API: Support diff/patch generation via the Github API -
    • -
    -

    Usability

    -
      -
    • Add tracing of low-level JSch log messages
    • -
    • Natural sort for refs in FetchResultTable
    • -
    • Allow shortcuts for Gitflow commands
    • -
    • - bug 534404 Suggest complete repository path in NewRepositoryWizard -
    • -
    • - bug 529449 Natural sort for tags in CreateTagDialog -
    • -
    • - bug 478159 Show affected projects when deleting repository -
    • -
    • - bug 510132 Add support for the "*" as wildcard character in the staging view filter -
    • -
    • - bug 511628 Select repositories via double-click in RepositorySearchDialog -
    • -
    • - bug 533019 Update staging view on repository config changes -
    • -
    • - bug 532458 Remove some margins in staging view -
    • -
    -

    Performance Improvements

    -
      -
    • - bug 535516 Use hash lookup for TreeViewers -
    • -
    • Ignore IndexChangedEvent if it originates from the same JGit process
    • -
    • - bug 500106 Improve asynchronous Eclipse workspace refreshes done by EGit -
    • -
    • Speed up the RepositoriesViewContentProvider
    • -
    • Use PathFilterGroup instead of PathFilter if possible. TreeWalks looking for a single path can use PathFilterGroup instead of PathFilter. This should be a little bit faster.
    • -
    • In EGit use mmap to map git packfiles into memory. Avoids allocating JGit buffer cache on the Java heap.
    • -
    -

    Bug Fixes

    -

    - 21 Bugs and 8 enhancement requests were closed -

    -
      -
    • - bug 529141 Fix AssumeUnchangedOperation not working on directory/project -
    • -
    • - bug 525769 Don't try to store incomplete credentials in secure store -
    • -
    • - bug 470452 Improve check for uncommitted changes before cherry-pick -
    • -
    • - bug 520693 Respect gitattributes in the compare editor -
    • -
    • - bug 533230 Fix Repositories view blocking Eclipse on startup -
    • -
    • - bug 533198 improve branch name validation performance which was bad for big repositories -
    • -
    • - bug 533477 Fix substring matches in filter in branch selection dialogs -
    • -
    • - bug 358206 Handle Gerrit Change-Ids for merge commits -
    • -
    • - bug 533336 Keep Gerrit Change-Id for conflicting cherry-pick -
    • -
    • - bug 531171 Remove problem characters from task related branch name suggestion -
    • -
    • - bug 533019 Fix invalid thread access in staging view when config changes -
    • -
    • - bug 525769 Don't try to store incomplete credentials in secure store -
    • -
    • - bug 534440 Github API: Fix Repository.getWatchers(); add Repository.getStars() -
    • -
    -

    Removal of deprecated methods

    -
      -
    • Remove deprecated UIUtils#applyHyperlinkDetectorStyleRanges and #getHyperlinkDetectorStyleRanges.
    • -
    • Remove deprecated InitOperation constructor. Use InitOperation#InitOperation(Repository, InitParameters) instead.
    • -
    • Remove deprecated GitFlowOperation#fetch(IProgressMonitor). Use GitFlowOperation#fetch(IProgressMonitor, int) instead.
    • -
    • Remove deprecated FeatureTrackOperation constructor. Use FeatureTrackOperation#FeatureTrackOperation(GitFlowRepository, Ref, int) instead.
    • -
    • Remove deprecated GitSynchronizeData#getSrcRemoteName
    • -
    • Remove deprecated GitSynchronizeData#getSrcMerge
    • -
    • Remove deprecated RepositoryMapping#getSubmoduleRepository. Use #getMapping(IResource) and then #getRepository()} on the returned mapping instead; it will return a submodule repository if the resource is in one.
    • -
    • Remove deprecated RemoveFromIndexOperation(Repository, IResource[]). Use #RemoveFromIndexOperation(Collection) instead.
    • -
    • Remove deprecated IgnoreOperation#IgnoreOperation(IResource[]). Use #IgnoreOperation(Collection) instead.
    • -
    • Github API: Remove deprecated WatcherService. Use StargazerService instead.
    • -
    • Github API: Remove deprecated User#getGravatarId and #setGravatarId
    • -
    • Github API: Remove deprecated Repository#getMasterBranch and #setMasterBranch
    • -
    • Github API: Remove deprecated Gist#setUser and #getUser methods
    • -
    -

    Build and Release Engineering

    -
      -
    • Update to latest Photon Orbit R20180606145124
    • -
    • - bug 530393 Update EGit license to EPL-2.0 -
    • -
    • Update target platform to use Orbit R20180531190352
    • -
    • - bug 532272 Update API baseline in Oomph setup -
    • -
    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html deleted file mode 100644 index 699d46abf5..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - EGit 5.0 New and Noteworthy - Contributors - - - - - - - - - - - - - - - - - - -

    Contributors

    -

    The following 5 developers worked on this release:

    -

    Christian Barcenas, - Markus Duft, - Matthias Sohn, - Michael Keppler, - Thomas Wolf

    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html deleted file mode 100644 index b5d2cea12a..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - EGit 5.0 New and Noteworthy - Updating This Document - - - - - - - - - - - - - - - - - - -

    Updating This Document

    -

    This document is maintained in a collaborative wiki. If you wish to - update or modify this document please visit - - http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.0 -

    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html new file mode 100644 index 0000000000..c4bd443acd --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html @@ -0,0 +1,275 @@ + + + + + EGit 5.1 New and Noteworthy + + + + + + + + + + + + + + + + + + +

    EGit

    +

    Features

    +
      +
    • + bug 339796 History table: let the user define which columns are shown +
    • +
    • + bug 529850 Github client: Get user's teams across GitHub organizations +
    • +
    +

    Usability

    +
      +
    • + bug 538322 Allow horizontal space in file:// URIishs in GitUrlChecker +
    • +
    • + bug 536205 Restrict visibility of Gitflow menu items +
    • +
    • + bug 538505 Focus file list in commit editor +
    • +
    • + bug 537931 Commit editor: Abbreviate parent SHA-1 with 7 characters +
    • +
    • Reorder reflog view context menu
    • +
    • + bug 538490 Icon for "Stash Changes..." menu +
    • +
    • + bug 538502 Have ellipsis at "Create patch" menu +
    • +
    • + bug 538488 Sort upstream branch configuration case insensitive +
    • +
    • Focus default button in PullResultDialog
    • +
    • Radio button style configuration selection of repository properties
    • +
    • + bug 537200 [staging] use icons for author and committer +
    • +
    • + bug 537690 Sort branches before tags in pull result dialog +
    • +
    • + bug 537482 Use multi-line text fields for merge and rebase result dialogs +
    • +
    • + bug 537672 Commit Editor: use proper create branch and create tag icons +
    • +
    • + bug 536324 Handle cancellation of rename detection +
    • +
    • + bug 537181 History table: adapt column widths when view size changes +
    • +
    • + bug 536863 - No feedback on "Import changed projects" +
    • +
    • Add 2 missing icons for cherry-pick and rename branch entrie in reflog
    • +
    • + bug 536799 Disable "Compare with previous" for deletions +
    • +
    • Mark more jobs as system or user
    • +
    • + bug 463906 Better default editor opening for file revisions +
    • +
    • + bug 536360 Sort decoration variables alphabetically +
    • +
    • + bug 535577 Normalize tag name when typing +
    • +
    • + bug 536236 Move clean menu item before garbage collect menu item +
    • +
    • + bug 536097 Set RepositoryPropertyPage zero pixel margin +
    • +
    • + bug 535678 Improve share wizard window title +
    • +
    • + bug 536204 Sort gerrit remote refs naturally +
    • +
    • + bug 535742 History view: Activate compare mode by default +
    • +
    • + bug 535160 Reveal newly created entry in configuration editor +
    • +
    • + bug 533596 Do not display "[NO-HEAD]" for empty repository +
        +
      • Complete the hovers in the history view
      • +
      • On the commit ID column, display the full SHA1 and the short commit message.
      • +
      +
    • +
    • On the message column, display the short message if not over a ref.
    • +
    • + bug 535171 FetchGerritChangePage: automatic content-assist on paste +
    • +
    • + bug 537469 Add missing blank in github wizard labels +
    • +
    +

    Performance Improvements

    +
      +
    • Avoid more UI freezes in ReflogView: redraw once only
    • +
    • Avoid UI blocks in ReflogView
    • +
    • + bug 536814 Use an asynchronous lightweight decorator in the repositories view +
    • +
    • + bug 485743 Avoid that loading the history blocks updating the commit table +
    • +
    • + bug 440588, + bug 485743 Git history page: move expensive operations in the background +
    • +
    • Computing the file diffs
    • +
    • Preparing to load the history
    • +
    • + bug 535950 Batch resource refreshes +
    • +
    • + bug 535856 Speed up staging view tree viewer management +
    • +
    • Reload commit info in history only if selection really changed
    • +
    +

    Bug Fixes

    +
      +
    • + bug 538855 Don't log an error on save in comparisons if resource out of sync +
    • +
    • + bug 538846 Don't auto-refresh projects with missing .project file +
    • +
    • Gitflow: Fix that EGit allowed starting features with diverging develop branches
    • +
    • Fix Findbugs RV_NEGATING_RESULT_OF_COMPARETO
    • +
    • + bug 538492 Fix NPE in git model synchronization +
    • +
    • + bug 537959 Fix layout and title in CommitSelectionDialog +
    • +
    • + bug 537937 Replace PlotWalk usage by RevWalk +
    • +
    • Fix comparison of SWTCommit to detect changed selection
    • +
    • + bug 537813 Avoid refresh on up-to-date pull operation +
    • +
    • + bug 537900 Remove "Change-Id" line properly on CR-LF operating systems +
    • +
    • + bug 537492 Fix filter in reflog view +
    • +
    • + bug 537790 Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss +
    • +
    • + bug 537331 Hide $GIT_DIR and friends from JGit +
    • +
    • Fix wrapping label in DateFormatPreferencePage
    • +
    • + bug 536880 Ensure IProjects are not refreshed via IFile handles +
    • +
    • + bug 536799 Fix "Compare with Previous" in history view and commit editor outline +
    • +
    • + bug 536471 Fix error marker updates in staging view +
    • +
    • + bug 533019 Staging view: update author/committer on config changes +
    • +
    • + bug 536472 Do not refresh projects that use a PessimisticResourceRuleFactory +
    • +
    • + bug 536357 Fix history preference page field editor layout +
    • +
    • + bug 533005 Disable commit buttons immediately on committing +
    • +
    • + bug 536356 Fix DatePreferencePage which did not wrap explanation label +
    • +
    • + bug 536240 Fix sort order in Staging view +
    • +
    • + bug 535749 Fix StagingView which wrongly sorted by state initially +
    • +
    • + bug 532940 History search: use CSS for text field background color +
    • +
    • + bug 535796 Fix CommitUI.getSelectedFiles() +
    • +
    • + bug 531489 Add version tag prefix for closing gitflow hotfix +
    • +
    +

    Build and Release Engineering

    +
      +
    • Fixed: GitFlow test launch config: Added missing dependencies
    • +
    • Update Orbit 2018-09 to R20180905201904
    • +
    • + bug 538414 Use new TPD update site +
    • +
    • Update Photon orbit repository to R20180606145124
    • +
    • Update to spotbugs 3.1.6
    • +
    • Organize OSGi manifests
    • +
    • Update Jetty to 9.4.11.v20180605
    • +
    • Update org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525
    • +
    • Update org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525
    • +
    • Fix validation errors for all target platforms
    • +
    • [releng] Update Oomph API baseline
    • +
    • Update Maven plugins +
        +
      • eclipse-jarsigner-plugin 1.1.5
      • +
      • jboss repository-utils 1.1.0
      • +
      • maven-pmd-plugin 3.10.0
      • +
      • maven-resources-plugin 3.1.0
      • +
      • spotbugs-maven-plugin 3.1.3.1
      • +
      +
    • +
    • Upgrade Tycho to 1.2.0
    • +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html new file mode 100644 index 0000000000..03c3e38112 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html @@ -0,0 +1,66 @@ + + + + + EGit 5.1 New and Noteworthy - Contributors + + + + + + + + + + + + + + + + + + +

    Contributors

    +

    The following 7 developers worked on this release:

    +

    David Pursehouse, + Luís Copetti, + Mat Booth, + Matthias Sohn, + Max Hohenegger, + Michael Keppler, + Thomas Wolf

    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html new file mode 100644 index 0000000000..e5b7ea8010 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html @@ -0,0 +1,55 @@ + + + + + EGit 5.1 New and Noteworthy - Updating This Document + + + + + + + + + + + + + + + + + + +

    Updating This Document

    +

    This document is maintained in a collaborative wiki. If you wish to + update or modify this document please visit + + http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.1 +

    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html index c49bfc1887..b55bd5884d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -715,7 +715,7 @@

    The Change field is also automatically filled in (and content assist is triggered) if the clipboard contains a web URL pointing to a Gerrit change, or the change number part of such a URL (numbers separated by "/"), or a plain change number.

    Working with Gitflow

    If you are using Gitflow ( - http://nvie.com/posts/a-successful-git-branching-model/), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches. + http://nvie.com/posts/a-successful-git-branching-model/), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches. Install the feature "Git integration for Eclipse - Gitflow support" in order to install EGit's Gitflow integration.

    Enabling Gitflow for a repository

    Gitflow operations will not appear unless the selected repository is configured for Gitflow. To do that, open the context menu on a repository in the Git Repositories view and select diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html deleted file mode 100644 index 0b6c43c149..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - - JGit 5.0 New and Noteworthy - - - - - - - - - - - - - - - - - -

    -

    JGit

    -

    Features

    -
      -
    • Fetch: Basic support for protocol v2 of the fetch-pack/upload-pack protocol. This protocol is described in the Git project in - "Documentation/technical/protocol-v2.txt". Notes: -
        -
      • - bug 534847 AdvertiseRefsHook is not executed for v2, to be replaced by an appropriate hook -
      • -
      • - change 120007 support for shallow fetch using protocol v2 is not complete -
      • -
      -
    • -
    • Add protocol v2 support in jgit daemon. With this patch, a server spawned by jgit daemon can be accessed using protocol v2 from a Git client that supports it (for example, "git" with the appropriate patches, to be released with git 2.18). This is only activated if the repository's config has "protocol.version" be 2.
    • -
    • Store in IndexChangedEvent if it was caused by JGit itself. This allows to differentiate if index was changed by an external git command or by JGit itself.
    • -
    • - bug 358206 Handle Gerrit Change-Ids for merge commits -
    • -
    • UploadPack: basic support for filtering by blob size. This is incomplete in that the filter-by-sparse-specification feature also supported by Git is not included yet.
    • -
    • Implement --force option in FetchCommand and CLI fetch command
    • -
    -

    Performance Improvements

    -
      -
    • - bug 388582 Skip ignored directories in FileTreeIterator -
    • -
    • - bug 532300 Significantly speed up FileTreeIterator on Windows -
    • -
    • Configure WindowCache settings to use in JGit CLI. Set the same defaults as in EGit. Use mmap to map git packfiles into memory. Avoids allocating JGit buffer cache on the Java heap.
    • -
    -

    Fixes

    -

    - 0 enhancement requests and 6 bugs were closed -

    -
      -
    • - bug 423206 Make JGit describe behaves same as c-git for lightweight tags -
    • -
    • - bug 535672 Ensure Jsch checks all configured algorithms -
    • -
    • - bug 535655 Validate branch names on branch creation -
    • -
    • - bug 533549 Don't prune symbolic refs when fetch.prune = true -
    • -
    • Use a secure random generator to seed nonce for digest authentication
    • -
    • Retry stale NFS file handles on .git/config file ( - https://git.eclipse.org/r/#/c/120973/) -
    • -
    • - bug 529463 ssh: Kill the external process when we're done instead of waiting forever -
    • -
    • Allow '@' as last character of ref. Previously @ was allowed e.g. in branch names, but not as the last character.
    • -
    • Don't throw an exception if a pre-push hook is ignored.
    • -
    • LFS: Fix potential NPE in LfsPrePushHook
    • -
    • FS#runProcess: Fix OutputStream left unclosed after IOException
    • -
    -

    Incompatible Changes

    -
      -
    • Remove deprecated Repository#notifyIndexChanged. Implementors should now override Repository#notifyIndexChanged(boolean)
    • -
    • Remove deprecated LfsProtocolServlet#getLargeFileRepository. Use LfsProtocolServlet##getLargeFileRepository(LfsRequest, String, String) instead.
    • -
    • Remove deprecated Lfs#Lfs(Path). Use Lfs#Lfs(Repository) instead.
    • -
    • Remove deprecated StreamCopyThread#flush
    • -
    • Remove deprecated SafeBufferedOutputStream. Use Java 8 BufferedOutputStream instead.
    • -
    • Remove deprecated EolCanonicalizingInputStream. Use AutoLFInputStream instead.
    • -
    • Remove deprecated FileUtils#relativize(String, String). Use the more-clearly-named FileUtils#relativizeNativePath(String, String) instead, or directly call FileUtils#relativizePath(String, String, String, boolean).
    • -
    • Remove deprecated FileUtil using Java 7 NIO
    • -
    • Remove deprecated TreeWalk#getEolStreamType. Use TreeWalk#getEolStreamType(OperationType) instead.
    • -
    • Remove deprecated FileTreeIterator(WorkingTreeIterator, File, FS). Use FileTreeIterator#FileTreeIterator(FileTreeIterator, File, FS) instead.
    • -
    • Remove deprecated TransportHttp#httpOpen(String, URL). Use TransportHttp#httpOpen(String, URL, AcceptEncoding) instead.
    • -
    • Remove deprecated ResolveMerger#processEntry method
    • -
    • Remove deprecated Repository#getRef. Use Repository#exactRef(String) or Repository#findRef(String) instead.
    • -
    • Remove deprecated BitmapBuilder#add. Use BitmapBuilder#or or BitmapBuilder#addObject instead.
    • -
    • Remove deprecated LockFile(File, FS) constructor. Use org.eclipse.jgit.internal.storage.file.LockFile#LockFile(File) instead.
    • -
    • Remove deprecated IgnoreNode#isIgnored method. Parameter negateFirstMatch is not honored anymore
    • -
    • Remove deprecated Statistics, UploadPackLogger, UploadPackLoggerChain. Use PackStatistics and PostUploadHook and PostUploadHookChain instead.
    • -
    • Remove UploadPack#getPackStatistics. Use #getStatistics instead
    • -
    • Remove UploadPack#getLogger and UploadPack#setLogger
    • -
    • Remove deprecated StoredObjectRepresentationnotAvailableException constructor. Use #StoredObjectRepresentationNotAvailableException(ObjectToPack, Throwable) instead.
    • -
    • Remove deprecated ArchiveCommand#putEntry method. Use #putEntry(Closeable, ObjectId, String, FileMode, ObjectLoader)} instead.
    • -
    • Fix misspelled class name: EmtpyCommitException -> EmptyCommitException
    • -
    • RemoteAddCommand#setName(String) and #setUri(URIish): return RemoteAddCommand to allow chaining.
    • -
    -

    Build and Release Engineering

    -
      -
    • Update to latest Photon Orbit R20180606145124
    • -
    • Update maven plugins to fix Zip Slip vulnerability
    • -
    • Bazel: Add a target to build jgit commandline tool
    • -
    • Use eclipse compiler in Maven build. Define profiles "ecj" for using Eclipse compiler and "javac" for using javac including errorprone. By default ecj will be used.
    • -
    • Upgrade error_prone_core to 2.3.1
    • -
    • Update SUA to current version.
    • -
    -

    Contributors

    -

    The following 17 contributors worked on this release:

    -

    Carsten Pfeiffer, - Christian Halstrick, - Dave Borowitz, - David Pursehouse, - David Turner, - Han-Wen Nienhuys, - Jonathan Nieder, - Jonathan Tan, - Marcel Trautwein, - Markus Duft, - Masaya Suzuki, - Matthias Sohn, - Michael Keppler, - Mincong HUANG, - Minh Thai, - Nasser Grainawi, - Thomas Wolf

    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html deleted file mode 100644 index be622d5c57..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - JGit 5.0 New and Noteworthy - Updating This Document - - - - - - - - - - - - - - - - - - -

    Updating This Document

    -

    This document is maintained in a collaborative wiki. If you wish to - update or modify this document please visit - - http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.0 -

    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html new file mode 100644 index 0000000000..96fcbfcecc --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html @@ -0,0 +1,201 @@ + + + + + JGit 5.1 New and Noteworthy + + + + + + + + + + + + + + + + + + +

    JGit

    +

    Features

    +
      +
    • + bug 434085 Use the same default diff.renameLimit = 400 like native git +
    • +
    • Parse signature of GPG-signed commits
    • +
    • Replace fetch.useminimalnegotation flag with fetch.maxhaves flag
    • +
    • Protocol V2 +
        +
      • FetchV2Request: Rename shallowSince to deepenSince
      • +
      • Add fetch support to ProtocolV2Hook
      • +
      • + bug 534847 Introduce ProtocolV2Hook +
      • +
      • Fetch protocol v2: Respond with shallow-info before wanted-refs
      • +
      • Support protocol v2 want-ref in UploadPack
      • +
      +
    • +
    • Allow overriding DfsPackDescription comparator for scanning packs
    • +
    • Make DfsConfig public
    • +
    • Add ls-files CLI command
    • +
    • RepoCommand: Support remove-project node in the manifest parser
    • +
    • RepoCommand: record remote branch, group, shallow bit by default
    • +
    • SubmoduleAddCommand: Add API to specify the submodule name
    • +
    +

    Performance Improvements

    +
      +
    • Seek references by prefix in reftable
    • +
    • Fix a GC scalability issue when selecting commit bitmaps
    • +
    • + bug 485743 Avoid expensive getAllRefsByPeeledObjectId() in PlotWalk constructor +
    • +
    +

    Bug Fixes

    +
      +
    • + bug 536318 Fix replacement quoting for replaceAll in filter command +
    • +
    • + bug 537969 Fix atomic lock file creation on NFS configured via option core.supportsAtomicCreateNewFile +
    • +
    • GC: Avoid logging errors when deleting non-empty folders
    • +
    • + bug 538286 Fix NoSuchFileException in GC.deleteTempPacksIdx() +
    • +
    • + bug 538285 Fix NoSuchFileException during directory cleanup in RefDirectory +
    • +
    • + bug 529400 Fix fetching with duplicate ref updates +
    • +
    • + bug 529314 Fetch(Process): should tolerate duplicate refspecs +
    • +
    • + bug 538068 SubmoduleDeinitTest fails on Windows +
    • +
    • + bug 538068 FilterCommandsTest fails on Windows +
    • +
    • + bug 538068 ReceivePackAdvertiseRefsHookTest.testSuccess() fails on Windows +
    • +
    • + bug 537969 Fix wrong warning message in case of lock failures +
    • +
    • Fix GC run in foreground to not use executor
    • +
    • Fix unpredictable ordering of entries in .gitmodules.
    • +
    • + bug 537410 Fix ResolveMerger: rebase with autocrlf=true, direct checkout +
    • +
    • + bug 537790 Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss +
    • +
    • + bug 536324 Abort rename detection in a timely manner if cancelled +
    • +
    • RepoCommand: Use project names instead of paths for the submodule name
    • +
    • Send only 1 flush pkt at the end of v2 fetch
    • +
    • + bug 499543 Fix NPE in BlameGenerator.getSourceStart() +
    • +
    • + bug 537166 HttpClientConnection.getHeaderFields should support multiple values for same header +
    • +
    • Always send refs' objects despite "filter" in pack
    • +
    • + bug 536880 ResolveMerger: don't try needlessly to delete directories +
    • +
    • + bug 526111 Ensure RacyGitTests don't raise false negatives +
    • +
    • GC: Trim more EWAHCompressedBitmaps to free unused memory
    • +
    • Make Reftable seek* and has* method names more consistent
    • +
    • Add progress monitor step to first phase of GC commit selection
    • +
    • + bug 536541 Add response message, if any, on HTTP status 404 +
    • +
    • Correctly handle initialization of shallow commits
    • +
    • CleanCommand: don't fire WorkingTreeModifiedEvent on dry run
    • +
    • DfsPackDescription: Disallow null PackSource
    • +
    +

    Build and Release Engineering

    +
      +
    • Update Orbit 2018-09 to R20180905201904
    • +
    • Update Photon orbit repository to R20180606145124
    • +
    • Bazel: Use hyphen instead of underscore in external repository names
    • +
    • Update bazel dependencies to match maven dependencies
    • +
    • Update Jetty to 9.4.11.v20180605
    • +
    • Update org.apache.commons.codec to 1.10.0.v20180409-1845
    • +
    • Update org.apache.commons.logging to 1.2.0.v20180409-1502
    • +
    • Update org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525
    • +
    • Update org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525
    • +
    • Update Maven plugins +
        +
      • build-helper-maven-plugin 3.0.0
      • +
      • eclipse-jarsigner-plugin 1.1.5
      • +
      • jacoco-maven-plugin 0.8.1
      • +
      • maven-clean-plugin 3.1.0
      • +
      • maven-compiler-plugin 3.8.0
      • +
      • maven-jar-plugin 3.1.2
      • +
      • maven-pmd-plugin 3.10.0
      • +
      • maven-resources-plugin 3.1.0
      • +
      • maven-shade-plugin 3.1.1
      • +
      • maven-site-plugin 3.7.1
      • +
      • maven-surefire-plugin 2.21.0
      • +
      • maven-surefire-report-plugin 2.21.0
      • +
      • plexus-compiler-javac 2.8.4
      • +
      • spotbugs-maven-plugin 3.1.6
      • +
      • wagon-ssh 3.1.0
      • +
      +
    • +
    • Upgrade Tycho to 1.2.0
    • +
    +

    Contributors

    +

    The following 19 contributors worked on this release:

    +

    Andrey Loskutov, + Christian Halstrick, + Dave Borowitz, + David Pursehouse, + David Turner, + Gabriel Couto, + Gunnar Wagenknecht, + Han-Wen Nienhuys, + Ivan Frade, + Jonathan Nieder, + Jonathan Tan, + Markus Duft, + Masaya Suzuki, + Matthias Sohn, + Michael Keppler, + Minh Thai, + René Scheibe, + Terry Parker, + Thomas Wolf

    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html new file mode 100644 index 0000000000..8764aa8a2a --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html @@ -0,0 +1,55 @@ + + + + + JGit 5.1 New and Noteworthy - Updating This Document + + + + + + + + + + + + + + + + + + +

    Updating This Document

    +

    This document is maintained in a collaborative wiki. If you wish to + update or modify this document please visit + + http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.1 +

    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index d4cfd5ad45..714f2f6c8e 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -446,28 +446,26 @@ - - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + - + -- cgit v1.2.3 From 915618ea59f72a5be4a7a8a9fdf77c306002e86e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 11 Sep 2018 21:28:29 +0200 Subject: EGit v5.1.0.201809111528-r Change-Id: Id5ef97610f6fcd5c7104b6ae7a72d4c559621b33 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/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.mylyn-feature/feature.xml | 2 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.importer.tests/pom.xml | 2 +- org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.smartimport/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 ++-- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a0c267df17..a9abb8d8d4 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index e52e26f35a..61825b881a 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.core.test Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true Fragment-Host: org.eclipse.egit.core -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 50d3391e79..d2fb702d2b 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 c660bed634..adbe54bc48 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.core Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index b8c5fa0130..e4b308b7d6 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 20766db50e..d1064ac1a3 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-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 5cce103ea1..f1957a49b3 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.doc diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 1af7a9861b..9e5d0578ed 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 c68c944eca..747b50f553 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: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 44908bab8a..faa117b253 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 fb014d5065..b601b9b8ab 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.gitflow.ui Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 068dee69e8..f8ca19e51a 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 9a9c44ec58..32dfbed7b7 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Vendor: %provider_name Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 7c89d65330..57d0601925 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 4302a8c9af..72397fd163 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index 6a6277d20d..5fbb9dbfe9 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse.org diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index 52da2daaa5..5a96bc1620 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index d7789024bb..a435129771 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.mylyn.ui Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.jface, diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index e50ec0f97d..e55797a738 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 9d45b82a31..fdfcaa341c 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index fb8c3258e1..3ebc4a3975 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index 0b060599df..e53221e35c 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 29e451d8c5..b8e50414ae 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r diff --git a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF index 3c22251e69..15cced2dfc 100644 --- a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.egit.ui.importer.tests Bundle-SymbolicName: org.eclipse.egit.ui.importer.tests -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui.importer.tests/pom.xml b/org.eclipse.egit.ui.importer.tests/pom.xml index 068ddf1a0b..c7e1cc913a 100644 --- a/org.eclipse.egit.ui.importer.tests/pom.xml +++ b/org.eclipse.egit.ui.importer.tests/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.egit - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r egit-parent org.eclipse.egit.ui.importer.tests diff --git a/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF index ee16c83af7..472f548161 100644 --- a/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragment_name Automatic-Module-Name: org.eclipse.egit.ui.smartimport Bundle-SymbolicName: org.eclipse.egit.ui.smartimport;singleton:=true Fragment-Host: org.eclipse.egit.ui;bundle-version="[5.1.0,5.2.0)" -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Vendor: %provider_name Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide;bundle-version="3.12.0" diff --git a/org.eclipse.egit.ui.smartimport/pom.xml b/org.eclipse.egit.ui.smartimport/pom.xml index c8c0b3bc95..6c8b123354 100644 --- a/org.eclipse.egit.ui.smartimport/pom.xml +++ b/org.eclipse.egit.ui.smartimport/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.egit - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r egit-parent org.eclipse.egit.ui.smartimport diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index ffd1b2774b..30d156624d 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.ui.test Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index bb9b53c58c..d5ce56d52b 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-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 23f71b1d19..e5b0deda30 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.ui Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 37e2012e4b..0e948c25a6 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 4457057bfc..dfab95a232 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit;singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.1.0.201809111528-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 304eda7aee..eb4abcc314 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r org.eclipse.egit diff --git a/pom.xml b/pom.xml index 6724ce12df..8d8d3a09b8 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r pom EGit Parent @@ -60,7 +60,7 @@ - 5.1.0-SNAPSHOT + 5.1.0.201809111528-r 1.2.0 ${tycho-version} 1.1.0 -- cgit v1.2.3 From 19894528b7810c062aa2e3b50995c7e616781cee Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 11 Sep 2018 23:25:54 +0200 Subject: Prepare 5.1.1-SNAPSHOT builds Change-Id: Ie1dc5eccaa9b66fbe80f42b543c7b82fe865a5ce Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 4 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 24 +-- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 76 ++++----- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.gitflow-feature/feature.xml | 8 +- org.eclipse.egit.gitflow-feature/pom.xml | 2 +- org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.egit.gitflow.test/pom.xml | 2 +- org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF | 64 ++++---- org.eclipse.egit.gitflow.ui/pom.xml | 2 +- org.eclipse.egit.gitflow/META-INF/MANIFEST.MF | 26 +-- org.eclipse.egit.gitflow/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 4 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 26 +-- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.importer.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 +- org.eclipse.egit.ui.smartimport/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 | 178 ++++++++++----------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 38 files changed, 256 insertions(+), 256 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index a9abb8d8d4..4a736f0206 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ - + org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 61825b881a..facd7ce7c5 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.core.test Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true Fragment-Host: org.eclipse.egit.core -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", @@ -14,18 +14,18 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.junit;bundle-version="[4.3.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.op;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.project;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.0,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util;version="[5.1.0,5.2.0)", +Import-Package: org.eclipse.egit.core;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.op;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.project;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.1,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util;version="[5.1.1,5.2.0)", org.mockito;version="[1.8.0,1.10.0)", org.mockito.runners;version="[1.8.0,1.10.0)", org.mockito.stubbing;version="[1.8.0,1.10.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.egit.core.test;version="5.1.0" +Export-Package: org.eclipse.egit.core.test;version="5.1.1" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index d2fb702d2b..2bc01e1c54 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 adbe54bc48..455e5d4587 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.core Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)" -Export-Package: org.eclipse.egit.core;version="5.1.0"; +Export-Package: org.eclipse.egit.core;version="5.1.1"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, org.eclipse.egit.mylyn.ui, @@ -22,16 +22,16 @@ Export-Package: org.eclipse.egit.core;version="5.1.0"; org.eclipse.egit.gitflow.ui, org.eclipse.mylyn.github.ui, org.eclipse.mylyn.github.core", - org.eclipse.egit.core.attributes;version="5.1.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.internal.gerrit;version="5.1.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.job;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="5.1.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="5.1.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="5.1.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="5.1.0"; + org.eclipse.egit.core.attributes;version="5.1.1";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.internal.gerrit;version="5.1.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.job;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="5.1.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="5.1.1";x-internal:=true, + org.eclipse.egit.core.internal.util;version="5.1.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="5.1.1"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, @@ -39,39 +39,39 @@ Export-Package: org.eclipse.egit.core;version="5.1.0"; org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, org.eclipse.mylyn.github.ui", - org.eclipse.egit.core.project;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.securestorage;version="5.1.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.storage;version="5.1.0"; + org.eclipse.egit.core.project;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.securestorage;version="5.1.1";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.storage;version="5.1.1"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="5.1.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="5.1.0";x-friends:="org.eclipse.egit.ui" + org.eclipse.egit.core.synchronize;version="5.1.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="5.1.1";x-friends:="org.eclipse.egit.ui" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.0,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.0,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.0,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.events;version="[5.1.0,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.0,5.2.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.0,5.2.0)", - org.eclipse.jgit.submodule;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.0,5.2.0)", + org.eclipse.jgit.annotations;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.1,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.1,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.1,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.events;version="[5.1.1,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.1,5.2.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.1,5.2.0)", + org.eclipse.jgit.submodule;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.1,5.2.0)", org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)" Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index e4b308b7d6..dcaacfaad6 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 d1064ac1a3..a85eb94a8a 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.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 f1957a49b3..e78b92a5b6 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 9e5d0578ed..f39367850d 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ - - - + + + org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 747b50f553..e392edc43f 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: GitFlow Test Automatic-Module-Name: org.eclipse.egit.gitflow.test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.test;version="[5.1.0,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.0,5.2.0)", +Import-Package: org.eclipse.egit.core;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.test;version="[5.1.1,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.1,5.2.0)", org.hamcrest;version="[1.1.0,1.2.0)", org.junit.rules;version="[4.12.0,4.13.0)", org.junit;version="[4.3.0,5.0.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index faa117b253..493d2bddb4 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 b601b9b8ab..e24ed8b85e 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,34 +3,34 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.egit.gitflow.ui Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: %provider_name Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.job;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.op;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.project;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow.op;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.actions;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.branch;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.commit;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.rebase;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.selection;version="[5.1.0,5.2.0)", - org.eclipse.jgit.annotations;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util;version="[5.1.0,5.2.0)" +Import-Package: org.eclipse.egit.core;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.job;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.op;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.project;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow.op;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.actions;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.branch;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.commit;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.rebase;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.selection;version="[5.1.1,5.2.0)", + org.eclipse.jgit.annotations;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util;version="[5.1.1,5.2.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)", @@ -40,12 +40,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.2.0,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="5.1.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="5.1.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="5.1.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="5.1.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.1.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="5.1.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="5.1.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="5.1.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="5.1.0";x-internal:=true +Export-Package: org.eclipse.egit.gitflow.ui;version="5.1.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="5.1.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="5.1.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="5.1.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.1.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="5.1.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="5.1.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="5.1.1";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="5.1.1";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index f8ca19e51a..f72fc40ce9 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 32dfbed7b7..5963176d6b 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,22 +3,22 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %provider_name Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jgit;bundle-version="[5.1.0,5.2.0)";resolution:=optional -Export-Package: org.eclipse.egit.gitflow;version="5.1.0"; + org.eclipse.jgit;bundle-version="[5.1.1,5.2.0)";resolution:=optional +Export-Package: org.eclipse.egit.gitflow;version="5.1.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="5.1.0"; + org.eclipse.egit.gitflow.op;version="5.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.core.runtime.jobs, org.eclipse.core.runtime, @@ -27,12 +27,12 @@ Export-Package: org.eclipse.egit.gitflow;version="5.1.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.op;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.0,5.2.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.op;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.1,5.2.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index 57d0601925..f152ab371d 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.gitflow diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 72397fd163..a4f09353f5 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 907d5a79eb..708e9eeeaa 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index 5fbb9dbfe9..e45fcbf44c 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse.org diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index 5a96bc1620..7386b48448 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index a435129771..59b4ce3cb7 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.mylyn.ui Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.jface, @@ -19,16 +19,16 @@ Require-Bundle: org.eclipse.jface, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.1.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="5.1.0";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.synchronize;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.commit;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.staging;version="[5.1.0,5.2.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[5.1.0,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.0,5.2.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.1.1";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="5.1.1";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.synchronize;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.commit;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.staging;version="[5.1.1,5.2.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[5.1.1,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.1,5.2.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index e55797a738..a68818c853 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index fdfcaa341c..75b291100d 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 3ebc4a3975..504f0f3ca0 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index e53221e35c..4e5abc7b9a 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index b8e50414ae..a063f6397e 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,7 +20,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT diff --git a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF index 15cced2dfc..2c1d48f78a 100644 --- a/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.importer.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.egit.ui.importer.tests Bundle-SymbolicName: org.eclipse.egit.ui.importer.tests -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin diff --git a/org.eclipse.egit.ui.importer.tests/pom.xml b/org.eclipse.egit.ui.importer.tests/pom.xml index c7e1cc913a..ec28255039 100644 --- a/org.eclipse.egit.ui.importer.tests/pom.xml +++ b/org.eclipse.egit.ui.importer.tests/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.egit - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT egit-parent org.eclipse.egit.ui.importer.tests diff --git a/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF index 472f548161..ce02508efe 100644 --- a/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.smartimport/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %fragment_name Automatic-Module-Name: org.eclipse.egit.ui.smartimport Bundle-SymbolicName: org.eclipse.egit.ui.smartimport;singleton:=true -Fragment-Host: org.eclipse.egit.ui;bundle-version="[5.1.0,5.2.0)" -Bundle-Version: 5.1.0.201809111528-r +Fragment-Host: org.eclipse.egit.ui;bundle-version="[5.1.1,5.2.0)" +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %provider_name Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide;bundle-version="3.12.0" Bundle-Localization: fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.egit.ui.internal.clone;version="5.1.0";x-internal:=true; +Export-Package: org.eclipse.egit.ui.internal.clone;version="5.1.1";x-internal:=true; uses:="org.eclipse.ui, org.eclipse.jface.wizard, org.eclipse.jface.viewers" diff --git a/org.eclipse.egit.ui.smartimport/pom.xml b/org.eclipse.egit.ui.smartimport/pom.xml index 6c8b123354..2a6f6afc8b 100644 --- a/org.eclipse.egit.ui.smartimport/pom.xml +++ b/org.eclipse.egit.ui.smartimport/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.egit - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT egit-parent org.eclipse.egit.ui.smartimport diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 30d156624d..9d65a37c7c 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.ui.test Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", @@ -17,22 +17,22 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.mockito;bundle-version="[1.8.0,1.10.0)", org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)" Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)", - org.eclipse.egit.core.test;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow.op;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow.ui;version="[5.1.0,5.2.0)", - org.eclipse.egit.gitflow.ui.internal;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.0,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.0,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util;version="[5.1.0,5.2.0)", + org.eclipse.egit.core.test;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow.op;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow.ui;version="[5.1.1,5.2.0)", + org.eclipse.egit.gitflow.ui.internal;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.1,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.1,5.2.0)", + org.eclipse.jgit.junit.http;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util;version="[5.1.1,5.2.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 d5ce56d52b..ee910bff55 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 e5b0deda30..7206ebe232 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: %plugin_name Automatic-Module-Name: org.eclipse.egit.ui Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -30,91 +30,91 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.ui.views;bundle-version="[3.4.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.egit.core;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.attributes;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.gerrit;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.indexdiff;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.job;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.rebase;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.storage;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.internal.util;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.op;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.project;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.securestorage;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.synchronize;version="[5.1.0,5.2.0)", - org.eclipse.egit.core.synchronize.dto;version="[5.1.0,5.2.0)", - org.eclipse.jgit.annotations;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api;version="[5.1.0,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.0,5.2.0)", - org.eclipse.jgit.blame;version="[5.1.0,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.0,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.0,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.0,5.2.0)", - org.eclipse.jgit.events;version="[5.1.0,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.0,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.0,5.2.0)", - org.eclipse.jgit.notes;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.0,5.2.0)", - org.eclipse.jgit.submodule;version="[5.1.0,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.0,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util;version="[5.1.0,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.0,5.2.0)" -Export-Package: org.eclipse.egit.ui;version="5.1.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal;version="5.1.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.actions;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.clean;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="5.1.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.commit.command;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="5.1.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.credentials;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.dialogs;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.factories;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="5.1.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.gerrit;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="5.1.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="5.1.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.stash;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="5.1.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="5.1.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="5.1.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.attributes;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.gerrit;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.indexdiff;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.job;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.rebase;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.storage;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.internal.util;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.op;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.project;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.securestorage;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.synchronize;version="[5.1.1,5.2.0)", + org.eclipse.egit.core.synchronize.dto;version="[5.1.1,5.2.0)", + org.eclipse.jgit.annotations;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api;version="[5.1.1,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.1,5.2.0)", + org.eclipse.jgit.blame;version="[5.1.1,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.1,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.1,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.1,5.2.0)", + org.eclipse.jgit.events;version="[5.1.1,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.1,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.1,5.2.0)", + org.eclipse.jgit.notes;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.1,5.2.0)", + org.eclipse.jgit.submodule;version="[5.1.1,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.1,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util;version="[5.1.1,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.1,5.2.0)" +Export-Package: org.eclipse.egit.ui;version="5.1.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal;version="5.1.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.actions;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.clean;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="5.1.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.commit.command;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="5.1.1";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.credentials;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.factories;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="5.1.1";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.egit.ui.internal.gerrit;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="5.1.1";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="5.1.1";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.stash;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="5.1.1";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="5.1.1";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="5.1.1";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 0e948c25a6..fd16009bdc 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.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 dfab95a232..0bde9da76b 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit;singleton:=true -Bundle-Version: 5.1.0.201809111528-r +Bundle-Version: 5.1.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index eb4abcc314..77ceacc7ef 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 8d8d3a09b8..434cc4b60f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.egit egit-parent - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT pom EGit Parent @@ -60,7 +60,7 @@ - 5.1.0.201809111528-r + 5.1.1-SNAPSHOT 1.2.0 ${tycho-version} 1.1.0 -- cgit v1.2.3 From 32bbd140373f306bcb3c659f34f407ef9f437ce4 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 12 Sep 2018 22:15:30 +0200 Subject: [test] Fix typo in HistoryViewTest Change-Id: I53281cf0c9ff0a228a1ac0b6bf72b9c86cf8a329 Signed-off-by: Thomas Wolf --- .../src/org/eclipse/egit/ui/test/history/HistoryViewTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 911f913139..314f6c311d 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 @@ -271,7 +271,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase { // Wait a little bit to give the UiJob triggered a chance to run Thread.sleep(100); // Then join the UI update - PlatformUI.getWorkbench().getDisplay().asyncExec(() -> { + PlatformUI.getWorkbench().getDisplay().syncExec(() -> { /* empty */ }); return getHistoryViewBot().table(1); } -- cgit v1.2.3