Skip to content
Success

Changes

Summary

  1. Update com.google.code.gson:gson to 2.11.0 (details)
  2. Update bytebuddy to 1.14.16 (details)
  3. Update egit.core build properties (details)
  4. CommitFileDiffViewer: command handlers for the context menu (part I) (details)
  5. CommitFileDiffViewer: command handlers for the context menu (part II) (details)
  6. Move FileDiff command handlers to separate Java package (details)
  7. DiffEditorOutlinePage: use dynamic menu with command handlers (details)
  8. Update Apache commons-compress to 1.26.2 (details)
  9. Update org.assertj:assertj-core to 3.26.0 (details)
  10. Update tycho to 4.0.8 (details)
  11. Update spotbugs-maven-plugin to 4.8.5.0 (details)
  12. Update cyclonedx-maven-plugin to 2.8.0 (details)
  13. Update maven-pmd-plugin to 3.22.0 (details)
  14. Update maven-assembly-plugin to 3.7.1 (details)
  15. Remove maven-surefire-plugin (details)
  16. Update EGit.setup to support 4.32 as a choice (details)
Commit 81e2322a943bd510def8dc3fc8e5586d392e7b22 by Ed Merks
Update com.google.code.gson:gson to 2.11.0

Change-Id: Id69735af24c752a9e007e172c022af628b80e800
The file was modified org.eclipse.egit.target/egit-4.32.target
The file was modified org.eclipse.egit.target/maven/dependencies.tpd
The file was modified org.eclipse.egit.target/egit-4.27.target
The file was modified org.eclipse.egit.target/egit-4.28.target
The file was modified org.eclipse.egit.target/egit-4.29.target
The file was modified org.eclipse.egit.target/egit-4.31.target
The file was modified org.eclipse.egit.target/egit-4.26.target
The file was modified org.eclipse.egit.target/egit-4.30.target
Commit 76810499aa443cbec5065f0249f9b1718086fac1 by Matthias Sohn
Update bytebuddy to 1.14.16

Change-Id: I9538ebfac65edb99163fb6faeeb37439983da1aa
The file was modified org.eclipse.egit.target/egit-4.32.target
The file was modified org.eclipse.egit.target/egit-4.27.target
The file was modified org.eclipse.egit.target/egit-4.30.target
The file was modified org.eclipse.egit.target/egit-4.29.target
The file was modified org.eclipse.egit.target/egit-4.28.target
The file was modified org.eclipse.egit.target/egit-4.26.target
The file was modified org.eclipse.egit.target/egit-4.31.target
The file was modified org.eclipse.egit.target/maven/dependencies.tpd
Commit bce1549c3b95fe6961443e9a58e20baf87d2ca41 by Thomas Wolf
Update egit.core build properties

Include slf4j.api and org.apache.sshd.osgi on the build classpath to
work around a JDT bug[1] in Eclipse newer than 2023-12.

[1] https://github.com/eclipse-jdt/eclipse.jdt.core/issues/543

Bug: egit-35
Change-Id: Icac5492f2285d6563782ee4f3fe0bf6e08c1357e
Signed-off-by: Thomas Wolf <twolf@apache.org>
The file was modified org.eclipse.egit.core/build.properties
Commit 4ec86b422f3d9a826e9db67bdde8baede0021f26 by Thomas Wolf
CommitFileDiffViewer: command handlers for the context menu (part I)

Make the context menu of the CommitFileDiffViewer extensible, and
migrate the first three hard-coded Actions to Command handlers. Define
the menu extension in plugin.xml.

Using menu extensions requires having the current selection reported by
the view set correctly depending on which viewer in the GitHistoryPage
is focused. Use a MultiViewerSelectionProvider; this tracks focus are
reports the selection of the focused viewer.

A new FileDiffPropertyTester is needed to express activation/enablement
correctly in plugin.xml.

Update the CommitEditor and its pages similarly so that they report the
selection from the currently focused viewer.

Unify the two "blame" commands; just use one single command with
different handlers.

Follow-up commits will migrate the remaining actions from that context
menu to command handlers, and then we re-use the new command handlers
in the DifFEditorOutlinePage, which shows objects that can adapt to
FileDiff.

Fix HistoryViewTest.testStartGitflowReleaseEnabled(). This test left
context menus open (after testing only for enablement of a particular
menu item). This confuses things a lot. In subsequent test cases, the
project explorer context menu suddenly had the menu ID
"org.eclipse.egit.ui.historyPageContributions"! As a result, the "Team"
and "Compare With" sub-menus were hidden, and subsequent tests failed
if they were looking for these sub-menus.

Bug: egit-25
Change-Id: I782467110bc9e72a1ddc3e8ab0b41e0317161457
Signed-off-by: Thomas Wolf <twolf@apache.org>
The file was modified org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
The file was modified org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffPropertyTester.java
The file was modified org.eclipse.egit.ui/plugin.xml
The file was modified org.eclipse.egit.ui/plugin.properties
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/MultiViewerSelectionProvider.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffBlameHandler.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/StashEditorPage.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithPreviousHandler.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/AbstractHistoryCommandHandler.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorPage.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffCompareWorkingTreeHandler.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
Commit 6563260bde2bfe6e2eba2051174ddf287f0ab071 by Thomas Wolf
CommitFileDiffViewer: command handlers for the context menu (part II)

Migrate the "Open This/Previous/Working Tree Version" and the "Checkout
This Version" actions to command handlers.

The CheckoutAction cannot be removed yet as it is also used in the
DiffEditorOutlinePage. It will be removed once the menu there is also
migrated to command handlers.

Change-Id: I0ecd16e9d2666407e9dc1860fa56d9698b07893e
Signed-off-by: Thomas Wolf <twolf@apache.org>
The file was modified org.eclipse.egit.ui/plugin.xml
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenWorkingTreeHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffCheckoutNewHandler.java
The file was modified org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
The file was modified org.eclipse.egit.ui/plugin.properties
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenPreviousHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenThisHandler.java
Commit 783a5457a64cf735a6135e8f2e779699c306cc67 by Thomas Wolf
Move FileDiff command handlers to separate Java package

Give them all a new abstract super class to factor out common things.
This also ensures that none of these command handlers depends on the
history page.

Change-Id: Id56dca2193605d005dd4eba0754d824e485d7afa
Signed-off-by: Thomas Wolf <twolf@apache.org>
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/AbstractFileDiffHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenWorkingTreeHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffCheckoutNewHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffCompareWorkingTreeHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenThisHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffCompareWithPreviousHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffOpenPreviousHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffOpenThisHandler.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffPropertyTester.java
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/FileDiffBlameHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffCheckoutNewHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffBlameHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffPropertyTester.java
The file was modified org.eclipse.egit.ui/META-INF/MANIFEST.MF
The file was removedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithPreviousHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffOpenWorkingTreeHandler.java
The file was modified org.eclipse.egit.ui/plugin.xml
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffCompareWorkingTreeHandler.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/filediff/FileDiffOpenPreviousHandler.java
Commit 0e458fca7694e065b4ae74fb2e228c45137f1f74 by Thomas Wolf
DiffEditorOutlinePage: use dynamic menu with command handlers

Reuse the FileDiff command handlers introduced for the
CommitFileDiffViewer also in the DiffEditorOutlinePage.

This removes the dynamic menu item label (showing the commit id), and
also the menu tooltips showing the commit subject. But it enables us
to reuse the existing code as is.

Change-Id: I1d7b89ef86a7039deb1e24fc423a32125f560915
Signed-off-by: Thomas Wolf <twolf@apache.org>
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
The file was modified org.eclipse.egit.ui/plugin.xml
The file was modified org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
Commit 5bf49b08a2cb3081c54f2a07b9bd71d12f284a8c by Matthias Sohn
Update Apache commons-compress to 1.26.2

Change-Id: Ieece0181100f046b1e12bb55d0fdaed802cc4ca8
The file was modified org.eclipse.egit.target/egit-4.26.target
The file was modified org.eclipse.egit.target/egit-4.28.target
The file was modified org.eclipse.egit.target/egit-4.29.target
The file was modified org.eclipse.egit.target/egit-4.32.target
The file was modified org.eclipse.egit.target/maven/dependencies.tpd
The file was modified org.eclipse.egit.target/egit-4.31.target
The file was modified org.eclipse.egit.target/egit-4.27.target
The file was modified org.eclipse.egit.target/egit-4.30.target
Commit 96a6e850ed3d349df92f3bc94edd54f423e8e636 by Matthias Sohn
Update org.assertj:assertj-core to 3.26.0

Change-Id: Ife6970f652de2f5a698b67a6f3f8be7418bc8bb5
The file was modified org.eclipse.egit.target/egit-4.30.target
The file was modified org.eclipse.egit.target/egit-4.28.target
The file was modified org.eclipse.egit.target/egit-4.29.target
The file was modified org.eclipse.egit.target/egit-4.32.target
The file was modified org.eclipse.egit.target/egit-4.26.target
The file was modified org.eclipse.egit.target/egit-4.27.target
The file was modified org.eclipse.egit.target/egit-4.31.target
The file was modified org.eclipse.egit.target/maven/dependencies.tpd
Commit c6bb912d36835e7d6db9325e731533f6192a1a8a by Matthias Sohn
Update tycho to 4.0.8

Change-Id: Ic1dbb3aef7a6012a79e5b7d8c1c0d8ff9cc74be5
The file was modified pom.xml
Commit 7cb62737ef57469ac1bbb7567521e79de40ea87e by Matthias Sohn
Update spotbugs-maven-plugin to 4.8.5.0

Change-Id: Ic220b35d193caa1736645309752f6aa5170461b9
The file was modified pom.xml
Commit 4fa71b7798071646b86fee0c3af57cb958c8ec59 by Matthias Sohn
Update cyclonedx-maven-plugin to 2.8.0

Change-Id: I8d82fd9efb536dfe5ccec161a7158117f34b352f
The file was modified pom.xml
Commit e237f072fdf7a9e21e300ac00c914d05bddaa79c by Matthias Sohn
Update maven-pmd-plugin to 3.22.0

Change-Id: I1823d6bd8d022be5f26a1902f33ff082959152a7
The file was modified pom.xml
Commit 5f2b41a6423dffcf3fc18fbda6814ba2e0f8970c by Matthias Sohn
Update maven-assembly-plugin to 3.7.1

Change-Id: Ib96e5399513e0147e675dd6a86d333b2e8615a1d
The file was modified pom.xml
Commit 3c8a2d8be27f3acc503bbf79b4047d7edeeeba4c by Matthias Sohn
Remove maven-surefire-plugin

Change-Id: I08ced48f4d90fdf9a3d8900f6825c6b41f85961e
The file was modified org.eclipse.egit.core.junit/pom.xml
Commit b737ac9e84ad93a486bde24003f145a6299e51e5 by Matthias Sohn
Update EGit.setup to support 4.32 as a choice

- Update to the proper Oomph setup location URIs.

Change-Id: Iedd8594764a88a465e455a6e1cfc58c327c3d7ef
The file was modified tools/oomph/EGit.setup