Skip to content

Upgrade to Eclipse EGit 2026-03 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
planger merged 1 commit into from
Apr 28, 2026
Merged

Upgrade to Eclipse EGit 2026-03 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**/target
.DS_Store
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
- Switches to Java 21
- 0.9.0 Update to Eclipse EGit 2025-06
- 0.10.0 Update to Eclipse EGit 2025-12
- 0.11.0 Update to Eclipse EGit 2026-03
212 changes: 109 additions & 103 deletions com.eclipsesource.megit.parent/megit.target
View file
Open in desktop

Large diffs are not rendered by default.

107 changes: 56 additions & 51 deletions com.eclipsesource.megit.parent/megit.tpd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
target "MeGit Target"
with source requirements
location "https://download.eclipse.org/releases/2025-12" {
location "https://download.eclipse.org/releases/2026-03" {
org.eclipse.jgit.feature.group
org.eclipse.jgit.gpg.bc.feature.group
org.eclipse.jgit.ssh.jsch.feature.group
Expand Down Expand Up @@ -36,7 +36,7 @@ location "https://download.eclipse.org/releases/2025-12" {
org.joni
org.snakeyaml.engine

// https://github.com/eclipse-egit/egit/blob/v7.5.0.202512021534-r/org.eclipse.egit.target/releasetrain/4.38-2025-12.tpd
// https://github.com/eclipse-egit/egit/blob/v7.6.0.202603022253-r/org.eclipse.egit.target/releasetrain/4.39-2026-03.tpd
// Eclipse platform
biz.aQute.bnd.util
biz.aQute.bndlib
Expand Down Expand Up @@ -82,11 +82,11 @@ location "https://download.eclipse.org/releases/2025-12" {
org.eclipse.tools.layout.spy
}

// https://github.com/eclipse-egit/egit/blob/v7.5.0.202512021534-r/org.eclipse.egit.target/orbit/orbit-4.38.tpd
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" {
aQute.libg [7.1.0.202411251545,7.1.0.202411251545]
bndtools.api [7.1.0.202411251545,7.1.0.202411251545]
com.ibm.icu [78.1.0,78.1.0]
// https://github.com/eclipse-egit/egit/blob/v7.6.0.202603022253-r/org.eclipse.egit.target/orbit/orbit-4.39.tpd
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-03" {
aQute.libg [7.2.1.202601121903,7.2.1.202601121903]
bndtools.api [7.2.1.202601121903,7.2.1.202601121903]
com.ibm.icu [78.2.0,78.2.0]
com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400]
com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400]
com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400]
Expand All @@ -98,20 +98,20 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025
jakarta.inject.jakarta.inject-api [1.0.5,1.0.5]
jakarta.inject.jakarta.inject-api [2.0.1,2.0.1]
jakarta.xml.bind-api [2.3.3,2.3.3]
jakarta.xml.bind-api [4.0.4,4.0.4]
jakarta.xml.bind-api [4.0.5,4.0.5]
javax.servlet-api [3.1.0,3.1.0]
junit-jupiter-api [5.14.1,5.14.1]
junit-jupiter-engine [5.14.1,5.14.1]
junit-jupiter-migrationsupport [5.14.1,5.14.1]
junit-jupiter-params [5.14.1,5.14.1]
junit-platform-commons [1.14.1,1.14.1]
junit-platform-engine [1.14.1,1.14.1]
junit-platform-launcher [1.14.1,1.14.1]
junit-platform-runner [1.14.1,1.14.1]
junit-platform-suite-api [1.14.1,1.14.1]
junit-platform-suite-commons [1.14.1,1.14.1]
junit-platform-suite-engine [1.14.1,1.14.1]
junit-vintage-engine [5.14.1,5.14.1]
junit-jupiter-api [5.14.3,5.14.3]
junit-jupiter-engine [5.14.3,5.14.3]
junit-jupiter-migrationsupport [5.14.3,5.14.3]
junit-jupiter-params [5.14.3,5.14.3]
junit-platform-commons [1.14.3,1.14.3]
junit-platform-engine [1.14.3,1.14.3]
junit-platform-launcher [1.14.3,1.14.3]
junit-platform-runner [1.14.3,1.14.3]
junit-platform-suite-api [1.14.3,1.14.3]
junit-platform-suite-commons [1.14.3,1.14.3]
junit-platform-suite-engine [1.14.3,1.14.3]
junit-vintage-engine [5.14.3,5.14.3]
org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000]
org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000]
org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7]
Expand All @@ -130,21 +130,21 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025
org.apache.lucene.analysis-common [10.3.2.v20251117-1800,10.3.2.v20251117-1800]
org.apache.lucene.analysis-smartcn [10.3.2.v20251117-1800,10.3.2.v20251117-1800]
org.apache.lucene.core [10.3.2.v20251117-1800,10.3.2.v20251117-1800]
org.commonmark [0.27.0,0.27.0]
org.commonmark.ext-gfm-tables [0.27.0,0.27.0]
org.commonmark [0.27.1,0.27.1]
org.commonmark.ext-gfm-tables [0.27.1,0.27.1]
org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534]
org.hamcrest [3.0.0,3.0.0]
org.hamcrest.source [3.0.0,3.0.0]
org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000]
org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000]
org.objectweb.asm [9.9.0, 9.9.0]
org.objectweb.asm.source [9.9.0, 9.9.0]
org.objectweb.asm.commons [9.9.0,9.9.0]
org.objectweb.asm.tree [9.9.0, 9.9.0]
org.objectweb.asm.tree.analysis [9.9.0, 9.9.0]
org.objectweb.asm.util [9.9.0, 9.9.0]
org.objenesis [3.4,3.4]
org.objenesis.source [3.4,3.4]
org.objectweb.asm [9.9.1, 9.9.1]
org.objectweb.asm.source [9.9.1, 9.9.1]
org.objectweb.asm.commons [9.9.1,9.9.1]
org.objectweb.asm.tree [9.9.1, 9.9.1]
org.objectweb.asm.tree.analysis [9.9.1, 9.9.1]
org.objectweb.asm.util [9.9.1, 9.9.1]
org.objenesis [3.5.0,3.5.0]
org.objenesis.source [3.5.0,3.5.0]
org.opentest4j [1.3.0,1.3.0]
org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024]
org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024]
Expand All @@ -153,7 +153,7 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025
org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733]
}

// https://github.com/eclipse-egit/egit/blob/v7.5.0.202512021534-r/org.eclipse.egit.target/maven/dependencies.tpd
// https://github.com/eclipse-egit/egit/blob/v7.6.0.202603022253-r/org.eclipse.egit.target/maven/dependencies.tpd
maven apache
scope = compile
dependencyDepth = none
Expand All @@ -163,7 +163,7 @@ maven apache
dependency {
groupId = "commons-codec"
artifactId = "commons-codec"
version = "1.20.0"
version = "1.21.0"
}
dependency {
groupId = "org.apache.commons"
Expand Down Expand Up @@ -209,7 +209,7 @@ maven assertj
dependency {
groupId = "org.assertj"
artifactId = "assertj-core"
version = "3.27.6"
version = "3.27.7"
}
}

Expand All @@ -222,22 +222,22 @@ maven bouncycastle
dependency {
groupId = "org.bouncycastle"
artifactId = "bcpg-jdk18on"
version = "1.82"
version = "1.83"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcprov-jdk18on"
version = "1.82"
version = "1.83"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk18on"
version = "1.82"
version = "1.83"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcutil-jdk18on"
version = "1.82"
version = "1.83"
}
}

Expand All @@ -250,12 +250,12 @@ maven bytebuddy
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy"
version = "1.18.1"
version = "1.18.5"
}
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy-agent"
version = "1.18.1"
version = "1.18.5"
}
}

Expand Down Expand Up @@ -294,42 +294,42 @@ maven jetty
dependency {
groupId = "org.eclipse.jetty.ee10"
artifactId = "jetty-ee10-servlet"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-http"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-io"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-security"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-server"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-session"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-util"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-util-ajax"
version = "12.1.4"
version = "12.1.6"
}
dependency {
groupId = "jakarta.servlet"
Expand Down Expand Up @@ -365,7 +365,7 @@ maven mockito
dependency {
groupId = "org.mockito"
artifactId = "mockito-core"
version = "5.20.0"
version = "5.21.0"
}
}

Expand All @@ -378,12 +378,12 @@ maven sshd
dependency {
groupId = "org.apache.sshd"
artifactId = "sshd-osgi"
version = "2.16.0"
version = "2.17.1"
}
dependency {
groupId = "org.apache.sshd"
artifactId = "sshd-sftp"
version = "2.16.0"
version = "2.17.1"
}
}

Expand All @@ -403,6 +403,11 @@ maven slf4j
artifactId = "slf4j-simple"
version = "2.0.17"
}
dependency {
groupId = "org.slf4j"
artifactId = "jcl-over-slf4j"
version = "2.0.17"
}
}

maven xz
Expand Down Expand Up @@ -460,6 +465,6 @@ maven extras-megit
dependency {
groupId = "org.junit.platform"
artifactId = "junit-platform-commons"
version = "1.14.1"
version = "1.14.3"
}
}
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0.qualifier
Bundle-Version: 0.11.0.qualifier
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
Bundle-Vendor: ECLIPSESOURCE
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../com.eclipsesource.megit.parent</relativePath>
</parent>
<artifactId>com.eclipsesource.megit.plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.product/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../com.eclipsesource.megit.parent</relativePath>
</parent>
<artifactId>com.eclipsesource.megit.product</artifactId>
Expand Down
Loading