Update to Eclipse and EGit 2023-06

eclipsesource · Jul 13, 2023 · 6c6b144 · 6c6b144
1 parent cb781a6
commit 6c6b144
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -4,30 +4,30 @@ Looking for a powerful, yet easy-to-use, fully open-source user interface for gi
 
 This made us think... wouldn't EGit be a great git standalone tool if it would be... well, an actual standalone tool?
 
-That's exactly what *MeGit* is: a minimal standalone application that contains just enough to run EGit conveniently.
+That's exactly what _MeGit_ is: a minimal standalone application that contains just enough to run EGit conveniently.
 
 ![Screenshot of MeGit](doc/megit-screenshot.png)
 
 # Features
 
 EGit (and hence MeGit) provides tons of features:
-* Nice visualization of the git history making it easy to keep a good overview when analyzing, merging or rebasing branches, cherry-picking commits, changing the git history, etc.
-* Interactive rebasing support
-* Easy-to-use git staging view
-* Support for Gerrit and Github
-* Support for GitFlow operations
-* and much more.
+
+- Nice visualization of the git history making it easy to keep a good overview when analyzing, merging or rebasing branches, cherry-picking commits, changing the git history, etc.
+- Interactive rebasing support
+- Easy-to-use git staging view
+- Support for Gerrit and Github
+- Support for GitFlow operations
+- and much more.
 
 Please refer to the [EGit user guide](https://wiki.eclipse.org/EGit/User_Guide) to learn more.
 
 MeGit intends to make it easy to just use EGit. It hence doesn't add any functionality itself, but only builds EGit as a standalone application with the minimal dependencies. Thus, start up should be fast. Just open MeGit and add the git repositories you care about. There is no need to import them as Eclipse projects. Just use the EGit perspective and directly handle your git tasks on the imported git repositories.
 
-
 # Installing MeGit
 
 Download the archive for your operating system from the [releases](https://github.com/eclipsesource/megit/releases), unpack the archive and run the `megit` or `megit.exe`. You'll need to select a workspace location to store your metadata.
 
-MeGit requires Java 11 or higher to be installed on your system.
+MeGit requires Java 17 or higher to be installed on your system.
 
 # Building
 
@@ -42,12 +42,13 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
 
 # Changelog
 
-  * 0.0.1 Initial release based on Eclipse EGit 2020-12
-  * 0.0.2 Based on Eclipse EGit 2020-12
-    * Git perspective as default and dark theme by default (#7)
-    * Miminize editor area by default and fix of #8 (#9)
-  * 0.0.3 Update to Eclipse EGit 2021-03
-  * 0.0.4 Update to Eclipse EGit 2021-09
-  * 0.1.0 Update to Eclipse EGit 2021-12
-  * 0.2.0 Update to Eclipse EGit 2022-06
-  * 0.3.0 Update to Eclipse EGit 2022-12
+- 0.0.1 Initial release based on Eclipse EGit 2020-12
+- 0.0.2 Based on Eclipse EGit 2020-12
+  - Git perspective as default and dark theme by default (#7)
+  - Miminize editor area by default and fix of #8 (#9)
+- 0.0.3 Update to Eclipse EGit 2021-03
+- 0.0.4 Update to Eclipse EGit 2021-09
+- 0.1.0 Update to Eclipse EGit 2021-12
+- 0.2.0 Update to Eclipse EGit 2022-06
+- 0.3.0 Update to Eclipse EGit 2022-12
+- 0.4.0 Update to Eclipse EGit 2023-12
diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml
@@ -5,15 +5,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.megit</groupId>
 	<artifactId>com.eclipsesource.megit.parent</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<tycho-version>2.7.5</tycho-version>
 		<tycho-extras-version>2.7.5</tycho-extras-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.release>17</maven.compiler.release>
 
 		<mav-checkstyle-version>3.0.0</mav-checkstyle-version>
 		<checkstyle-version>8.8</checkstyle-version>

diff --git a/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF b/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plugin
 Bundle-SymbolicName: com.eclipsesource.megit.plugin;singleton:=true
-Bundle-Version: 0.3.0.qualifier
+Bundle-Version: 0.4.0.qualifier
 Bundle-Activator: com.eclipsesource.megit.plugin.Activator
 Bundle-Vendor: ECLIPSESOURCE
 Require-Bundle: org.eclipse.ui,

diff --git a/com.eclipsesource.megit.plugin/pom.xml b/com.eclipsesource.megit.plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.plugin</artifactId>

diff --git a/com.eclipsesource.megit.product.feature/feature.xml b/com.eclipsesource.megit.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.eclipsesource.megit.product.feature"
       label="Minimal EGit Product Feature"
-      version="0.3.0.qualifier"
+      version="0.4.0.qualifier"
       provider-name="ECLIPSESOURCE">
 
    <description url="https://github.com/eclipsesource/megit">

diff --git a/com.eclipsesource.megit.product.feature/pom.xml b/com.eclipsesource.megit.product.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product.feature</artifactId>

diff --git a/com.eclipsesource.megit.product/pom.xml b/com.eclipsesource.megit.product/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product</artifactId>

diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target
@@ -1,48 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="MeGit Target" sequenceNumber="1673360380">
+<target name="MeGit Target" sequenceNumber="1689280877">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jgit.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.egit.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.4.0.202211300538-r"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
+      <unit id="org.eclipse.jgit.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.egit.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.6.0.202305301015-r"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.34.0.v20230406-1334"/>
       <unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
-      <unit id="org.eclipse.emf.validation.feature.group" version="1.13.2.202208271102"/>
-      <unit id="org.eclipse.platform.ide" version="4.26.0.I20221123-1800"/>
-      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1800.v20221117-1044"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.600.v20221116-1440"/>
-      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.900.v20221116-1440"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1200.v20221111-1340"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1900.v20221108-1024"/>
-      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20211005-1944"/>
-      <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20220215-0126"/>
-      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20221112-0806"/>
-      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20210409-2301"/>
-      <unit id="org.eclipse.jdt.core" version="3.32.0.v20221108-1853"/>
-      <unit id="javaewah" version="1.1.13.v20211029-0839"/>
+      <unit id="org.eclipse.emf.validation.feature.group" version="1.13.3.202305230712"/>
+      <unit id="org.eclipse.platform.ide" version="4.28.0.I20230605-0440"/>
+      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2000.v20230510-1208"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.0.v20230523-2142"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.0.v20230322-1009"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2100.v20230415-0944"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20230507-1923"/>
+      <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20230507-1921"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20230422-0242"/>
+      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20230423-0417"/>
+      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20230422-0242"/>
+      <unit id="org.eclipse.jdt.core.compiler.batch" version="3.34.0.v20230523-1233"/>
+      <unit id="org.eclipse.jdt.core" version="3.34.0.v20230512-1803"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
       <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
-      <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/>
+      <unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20221112-0806"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
-      <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/>
-      <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/>
-      <unit id="slf4j.api" version="1.7.36"/>
-      <unit id="slf4j.nop" version="1.7.36"/>
-      <repository location="https://download.eclipse.org/releases/2022-12/"/>
+      <unit id="org.apache.sshd.sftp" version="2.10.0"/>
+      <unit id="org.apache.sshd.osgi" version="2.10.0"/>
+      <unit id="slf4j.api" version="2.0.7"/>
+      <unit id="slf4j.nop" version="2.0.7"/>
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.6"/>
+      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
+      <unit id="javax.inject" version="1.0.0.v20220405-0441"/>
+      <unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
+      <unit id="com.sun.jna" version="5.13.0"/>
+      <unit id="com.sun.jna.platform" version="5.13.0"/>
+      <repository location="https://download.eclipse.org/releases/2023-06/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
-      <unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository"/>
+      <unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
+      <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
+      <unit id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
+      <unit id="org.bouncycastle.bcutil" version="1.72.0.v20221013-1810"/>
+      <unit id="javaewah" version="1.1.13.v20211029-0839"/>
+      <unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
+      <unit id="org.objectweb.asm.commons" version="9.4.0.v20221107-1714"/>
+      <unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
+      <unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
+      <unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
     </location>
   </locations>
 </target>
diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.tpd b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.tpd
@@ -1,6 +1,6 @@
 target "MeGit Target"
 with allEnvironments source
-location "https://download.eclipse.org/releases/2022-12/" {
+location "https://download.eclipse.org/releases/2023-06/" {
 	org.eclipse.jgit.feature.group
 	org.eclipse.jgit.gpg.bc.feature.group
 	org.eclipse.jgit.ssh.jsch.feature.group
@@ -22,8 +22,8 @@ location "https://download.eclipse.org/releases/2022-12/" {
 	org.eclipse.ecf.filetransfer.feature.feature.group
 	org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
 	org.eclipse.ecf.filetransfer.ssl.feature.feature.group
+	org.eclipse.jdt.core.compiler.batch
 	org.eclipse.jdt.core
-	javaewah
 	net.i2p.crypto.eddsa
 	org.apache.commons.io
 	org.apache.commons.compress
@@ -34,8 +34,24 @@ location "https://download.eclipse.org/releases/2022-12/" {
 	org.apache.sshd.osgi
 	slf4j.api
 	slf4j.nop
+	org.apache.aries.spifly.dynamic.bundle
+	javax.annotation
+	javax.inject
+	org.apache.commons.jxpath
+	com.sun.jna
+	com.sun.jna.platform
 }
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
 	com.google.guava
 	com.google.gson
+	org.bouncycastle.bcpg
+	org.bouncycastle.bcpkix
+	org.bouncycastle.bcprov
+	org.bouncycastle.bcutil
+	javaewah
+	org.objectweb.asm
+	org.objectweb.asm.commons
+	org.objectweb.asm.util
+	org.objectweb.asm.tree
+	org.objectweb.asm.analysis
 }
diff --git a/com.eclipsesource.megit.target/pom.xml b/com.eclipsesource.megit.target/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.target</artifactId>