Merge branch 'master' into stable-6.7

* master:
  Remove the cbi-snapshots Maven repository
  Update Orbit to orbit-aggregation/release/4.29.0
  Add target platform for Eclipse 2023-09 (4.29)
  Use release p2 repo for Eclipse 2023-06 (4.28)
  Update tycho to 4.0.2
  Update bouncycastle to 1.76
  Add UI support for $XDG_CONFIG_HOME/git/config

Change-Id: If46ff8d527b2c42b66e4cc4d9457cb127a6b9792

23 files changed, 776 insertions, 213 deletions

diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index dc49bb0ed0..59fadd69ee 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)",
  org.junit;bundle-version="[4.13.0,5.0.0)",
  org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
  net.bytebuddy.agent;version="[1.7.9,2.0.0)",
diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
index 8f59e06b8b..753d0eb4f2 100644
--- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Import-Package: org.eclipse.egit.core;version="[6.7.0,6.8.0)",
  org.junit;version="[4.13.0,5.0.0)"
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)",
  org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)",
- org.hamcrest;bundle-version="[1.1.0,3.0.0)"
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index 46aafcbbf1..ce4d272f5f 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -250,5 +250,5 @@
    <repository-reference location="https://download.eclipse.org/egit/github/updates" enabled="true" />
    <repository-reference location="https://download.eclipse.org/egit/github/updates-nightly" enabled="true" />
    <repository-reference location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" enabled="true" />
 </site>
diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target
index 806be99213..a5543f5fd3 100644
--- a/org.eclipse.egit.target/egit-4.26.target
+++ b/org.eclipse.egit.target/egit-4.26.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.26" sequenceNumber="1688222553">
+<target name="egit-4.26" sequenceNumber="1693399093">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -18,59 +18,46 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
       <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
-      <unit id="jakarta.activation" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.activation.source" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
-      <unit id="jakarta.xml.bind.source" version="2.3.3.v20221203-1659"/>
-      <unit id="javax.activation" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.activation.source" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.annotation.source" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.inject.source" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
-      <unit id="javax.xml.source" version="1.4.1.v20220503-2331"/>
+      <unit id="jakarta.activation-api" version="1.2.2"/>
+      <unit id="jakarta.activation-api.source" version="1.2.2"/>
+      <unit id="jakarta.xml.bind-api" version="2.3.3"/>
+      <unit id="jakarta.xml.bind-api.source" version="2.3.3"/>
+      <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+      <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
       <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
       <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
-      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
-      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
+      <unit id="org.apache.commons.commons-io" version="2.13.0"/>
+      <unit id="org.apache.commons.commons-io.source" version="2.13.0"/>
+      <unit id="org.apache.commons.logging" version="1.2.0"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
       <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
       <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
-      <unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util.source" version="9.4.0.v20221107-1714"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
+      <unit id="org.objenesis" version="3.3.0"/>
+      <unit id="org.objenesis.source" version="3.3.0"/>
+      <unit id="org.objectweb.asm" version="9.5.0"/>
+      <unit id="org.objectweb.asm.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util.source" version="9.5.0"/>
+      <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
@@ -277,25 +264,25 @@
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpg-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcprov-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpkix-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcutil-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git a/org.eclipse.egit.target/egit-4.26.tpd b/org.eclipse.egit.target/egit-4.26.tpd
index 2ea9d65f7c..fd15645c1f 100644
--- a/org.eclipse.egit.target/egit-4.26.tpd
+++ b/org.eclipse.egit.target/egit-4.26.tpd
@@ -2,6 +2,6 @@ target "egit-4.26" with source configurePhase
 
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/R20230531010532-2023-06.tpd"
+include "orbit/orbit-4.29.tpd"
 include "maven/dependencies.tpd"
 include "releasetrain/4.26-2022-12.tpd"
diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target
index 41578d31ba..adcec97d16 100644
--- a/org.eclipse.egit.target/egit-4.27.target
+++ b/org.eclipse.egit.target/egit-4.27.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.27" sequenceNumber="1688222553">
+<target name="egit-4.27" sequenceNumber="1693399093">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -18,59 +18,46 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
       <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
-      <unit id="jakarta.activation" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.activation.source" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
-      <unit id="jakarta.xml.bind.source" version="2.3.3.v20221203-1659"/>
-      <unit id="javax.activation" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.activation.source" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.annotation.source" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.inject.source" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
-      <unit id="javax.xml.source" version="1.4.1.v20220503-2331"/>
+      <unit id="jakarta.activation-api" version="1.2.2"/>
+      <unit id="jakarta.activation-api.source" version="1.2.2"/>
+      <unit id="jakarta.xml.bind-api" version="2.3.3"/>
+      <unit id="jakarta.xml.bind-api.source" version="2.3.3"/>
+      <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+      <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
       <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
       <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
-      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
-      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
+      <unit id="org.apache.commons.commons-io" version="2.13.0"/>
+      <unit id="org.apache.commons.commons-io.source" version="2.13.0"/>
+      <unit id="org.apache.commons.logging" version="1.2.0"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
       <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
       <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
-      <unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util.source" version="9.4.0.v20221107-1714"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
+      <unit id="org.objenesis" version="3.3.0"/>
+      <unit id="org.objenesis.source" version="3.3.0"/>
+      <unit id="org.objectweb.asm" version="9.5.0"/>
+      <unit id="org.objectweb.asm.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util.source" version="9.5.0"/>
+      <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.commons.jxpath" version="0.0.0"/>
@@ -278,25 +265,25 @@
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpg-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcprov-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpkix-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcutil-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git a/org.eclipse.egit.target/egit-4.27.tpd b/org.eclipse.egit.target/egit-4.27.tpd
index a08e491975..434ad384fe 100644
--- a/org.eclipse.egit.target/egit-4.27.tpd
+++ b/org.eclipse.egit.target/egit-4.27.tpd
@@ -2,6 +2,6 @@ target "egit-4.27" with source configurePhase
 
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/R20230531010532-2023-06.tpd"
+include "orbit/orbit-4.29.tpd"
 include "maven/dependencies.tpd"
 include "releasetrain/4.27-2023-03.tpd"
diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target
index a6a7c6876f..687bc17474 100644
--- a/org.eclipse.egit.target/egit-4.28.target
+++ b/org.eclipse.egit.target/egit-4.28.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.28" sequenceNumber="1688222553">
+<target name="egit-4.28" sequenceNumber="1693399093">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -18,59 +18,46 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
       <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
-      <unit id="jakarta.activation" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.activation.source" version="1.2.2.v20221203-1659"/>
-      <unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
-      <unit id="jakarta.xml.bind.source" version="2.3.3.v20221203-1659"/>
-      <unit id="javax.activation" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.activation.source" version="2.0.0.v20221203-1659"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.annotation.source" version="1.3.5.v20230504-0748"/>
-      <unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.inject.source" version="1.0.0.v20220405-0441"/>
-      <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
-      <unit id="javax.xml.source" version="1.4.1.v20220503-2331"/>
+      <unit id="jakarta.activation-api" version="1.2.2"/>
+      <unit id="jakarta.activation-api.source" version="1.2.2"/>
+      <unit id="jakarta.xml.bind-api" version="2.3.3"/>
+      <unit id="jakarta.xml.bind-api.source" version="2.3.3"/>
+      <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+      <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
       <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
       <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
-      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
-      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20230516-1249"/>
-      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
-      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
+      <unit id="org.apache.commons.commons-io" version="2.13.0"/>
+      <unit id="org.apache.commons.commons-io.source" version="2.13.0"/>
+      <unit id="org.apache.commons.logging" version="1.2.0"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
       <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
       <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
-      <unit id="org.objenesis" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/>
-      <unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.tree.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.analysis.source" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
-      <unit id="org.objectweb.asm.util.source" version="9.4.0.v20221107-1714"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
+      <unit id="org.objenesis" version="3.3.0"/>
+      <unit id="org.objenesis.source" version="3.3.0"/>
+      <unit id="org.objectweb.asm" version="9.5.0"/>
+      <unit id="org.objectweb.asm.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util.source" version="9.5.0"/>
+      <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="biz.aQute.bnd.util" version="0.0.0"/>
@@ -90,7 +77,7 @@
       <unit id="org.sat4j.core" version="0.0.0"/>
       <unit id="org.sat4j.pb" version="0.0.0"/>
       <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/staging/2023-06"/>
+      <repository location="https://download.eclipse.org/releases/2023-06"/>
     </location>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi">
     <dependencies>
@@ -281,25 +268,25 @@
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpg-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcprov-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcpkix-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.bouncycastle</groupId>
     		<artifactId>bcutil-jdk18on</artifactId>
-    		<version>1.75</version>
+    		<version>1.76</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git a/org.eclipse.egit.target/egit-4.28.tpd b/org.eclipse.egit.target/egit-4.28.tpd
index 56ca2485f3..4d7c5d1d2c 100644
--- a/org.eclipse.egit.target/egit-4.28.tpd
+++ b/org.eclipse.egit.target/egit-4.28.tpd
@@ -2,6 +2,6 @@ target "egit-4.28" with source configurePhase
 
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/R20230531010532-2023-06.tpd"
+include "orbit/orbit-4.29.tpd"
 include "maven/dependencies.tpd"
 include "releasetrain/4.28-2023-06.tpd"
diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target
new file mode 100644
index 0000000000..fd346a8f15
--- /dev/null
+++ b/org.eclipse.egit.target/egit-4.29.target
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.29" sequenceNumber="1693406073">
+  <locations>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+      <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
+      <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
+      <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
+      <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
+      <unit id="jakarta.activation-api" version="1.2.2"/>
+      <unit id="jakarta.activation-api.source" version="1.2.2"/>
+      <unit id="jakarta.xml.bind-api" version="2.3.3"/>
+      <unit id="jakarta.xml.bind-api.source" version="2.3.3"/>
+      <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+      <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/>
+      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
+      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
+      <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
+      <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+      <unit id="org.apache.commons.commons-io" version="2.13.0"/>
+      <unit id="org.apache.commons.commons-io.source" version="2.13.0"/>
+      <unit id="org.apache.commons.logging" version="1.2.0"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
+      <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
+      <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
+      <unit id="org.objenesis" version="3.3.0"/>
+      <unit id="org.objenesis.source" version="3.3.0"/>
+      <unit id="org.objectweb.asm" version="9.5.0"/>
+      <unit id="org.objectweb.asm.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/>
+      <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util" version="9.5.0"/>
+      <unit id="org.objectweb.asm.util.source" version="9.5.0"/>
+      <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="biz.aQute.bnd.util" version="0.0.0"/>
+      <unit id="biz.aQute.bndlib" version="0.0.0"/>
+      <unit id="org.apache.commons.jxpath" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/>
+      <unit id="org.eclipse.e4.tools.services" version="0.0.0"/>
+      <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+      <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/>
+      <unit id="org.osgi.service.repository" version="0.0.0"/>
+      <unit id="org.sat4j.core" version="0.0.0"/>
+      <unit id="org.sat4j.pb" version="0.0.0"/>
+      <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/staging/2023-09"/>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.osgi</groupId>
+    		<artifactId>org.osgi.annotation.bundle</artifactId>
+    		<version>2.0.0</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.osgi</groupId>
+    		<artifactId>org.osgi.annotation.versioning</artifactId>
+    		<version>1.1.2</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.osgi</groupId>
+    		<artifactId>org.osgi.service.component.annotations</artifactId>
+    		<version>1.5.1</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.osgi</groupId>
+    		<artifactId>org.osgi.service.metatype.annotations</artifactId>
+    		<version>1.4.1</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.tukaani</groupId>
+    		<artifactId>xz</artifactId>
+    		<version>1.9</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.slf4j</groupId>
+    		<artifactId>slf4j-api</artifactId>
+    		<version>1.7.36</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.slf4j</groupId>
+    		<artifactId>slf4j-simple</artifactId>
+    		<version>1.7.36</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.apache.sshd</groupId>
+    		<artifactId>sshd-osgi</artifactId>
+    		<version>2.10.0</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.apache.sshd</groupId>
+    		<artifactId>sshd-sftp</artifactId>
+    		<version>2.10.0</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.mockito</groupId>
+    		<artifactId>mockito-core</artifactId>
+    		<version>5.4.0</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna">
+    <dependencies>
+    	<dependency>
+    		<groupId>net.java.dev.jna</groupId>
+    		<artifactId>jna</artifactId>
+    		<version>5.13.0</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>net.java.dev.jna</groupId>
+    		<artifactId>jna-platform</artifactId>
+    		<version>5.13.0</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-http</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-io</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-security</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-server</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-servlet</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-util</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.eclipse.jetty</groupId>
+    		<artifactId>jetty-util-ajax</artifactId>
+    		<version>10.0.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>jakarta.servlet</groupId>
+    		<artifactId>jakarta.servlet-api</artifactId>
+    		<version>4.0.4</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah">
+    <dependencies>
+    	<dependency>
+    		<groupId>com.googlecode.javaewah</groupId>
+    		<artifactId>JavaEWAH</artifactId>
+    		<version>1.2.3</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson">
+    <dependencies>
+    	<dependency>
+    		<groupId>com.google.code.gson</groupId>
+    		<artifactId>gson</artifactId>
+    		<version>2.10.1</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy">
+    <dependencies>
+    	<dependency>
+    		<groupId>net.bytebuddy</groupId>
+    		<artifactId>byte-buddy</artifactId>
+    		<version>1.14.5</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>net.bytebuddy</groupId>
+    		<artifactId>byte-buddy-agent</artifactId>
+    		<version>1.14.5</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.bouncycastle</groupId>
+    		<artifactId>bcpg-jdk18on</artifactId>
+    		<version>1.76</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.bouncycastle</groupId>
+    		<artifactId>bcprov-jdk18on</artifactId>
+    		<version>1.76</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.bouncycastle</groupId>
+    		<artifactId>bcpkix-jdk18on</artifactId>
+    		<version>1.76</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.bouncycastle</groupId>
+    		<artifactId>bcutil-jdk18on</artifactId>
+    		<version>1.76</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj">
+    <dependencies>
+    	<dependency>
+    		<groupId>org.assertj</groupId>
+    		<artifactId>assertj-core</artifactId>
+    		<version>3.24.2</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j">
+    <dependencies>
+    	<dependency>
+    		<groupId>args4j</groupId>
+    		<artifactId>args4j</artifactId>
+    		<version>2.33</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
+    <dependencies>
+    	<dependency>
+    		<groupId>commons-codec</groupId>
+    		<artifactId>commons-codec</artifactId>
+    		<version>1.15</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.apache.commons</groupId>
+    		<artifactId>commons-compress</artifactId>
+    		<version>1.23.0</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.egit.target/egit-4.29.tpd b/org.eclipse.egit.target/egit-4.29.tpd
new file mode 100644
index 0000000000..cace3d0094
--- /dev/null
+++ b/org.eclipse.egit.target/egit-4.29.tpd
@@ -0,0 +1,7 @@
+target "egit-4.29" with source configurePhase
+
+include "projects/license.tpd"
+include "projects/swtbot-snapshot.tpd"
+include "orbit/orbit-4.29.tpd"
+include "maven/dependencies.tpd"
+include "releasetrain/4.29-2023-09.tpd"
diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd
index 11fd1bdbd5..8d8dd4b536 100644
--- a/org.eclipse.egit.target/maven/dependencies.tpd
+++ b/org.eclipse.egit.target/maven/dependencies.tpd
@@ -53,22 +53,22 @@ maven bouncycastle
 	dependency {
 		groupId = "org.bouncycastle"
 		artifactId = "bcpg-jdk18on"
-		version = "1.75"
+		version = "1.76"
 	}
 	dependency {
 		groupId = "org.bouncycastle"
 		artifactId = "bcprov-jdk18on"
-		version = "1.75"
+		version = "1.76"
 	}
 	dependency {
 		groupId = "org.bouncycastle"
 		artifactId = "bcpkix-jdk18on"
-		version = "1.75"
+		version = "1.76"
 	}
 	dependency {
 		groupId = "org.bouncycastle"
 		artifactId = "bcutil-jdk18on"
-		version = "1.75"
+		version = "1.76"
 	}
 }
 
diff --git a/org.eclipse.egit.target/orbit/orbit-4.29.tpd b/org.eclipse.egit.target/orbit/orbit-4.29.tpd
new file mode 100644
index 0000000000..4b6e4d09ee
--- /dev/null
+++ b/org.eclipse.egit.target/orbit/orbit-4.29.tpd
@@ -0,0 +1,49 @@
+target "orbit-4.29" with source configurePhase
+// see https://download.eclipse.org/tools/orbit/downloads/
+
+// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml
+location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" {
+	com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806]
+	com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806]
+	com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820]
+	com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820]
+	jakarta.activation-api [1.2.2,1.2.2]
+	jakarta.activation-api.source [1.2.2,1.2.2]
+	jakarta.xml.bind-api [2.3.3,2.3.3]
+	jakarta.xml.bind-api.source [2.3.3,2.3.3]
+	jakarta.activation [2.0.0.v20221203-1659,2.0.0.v20221203-1659]
+	jakarta.activation.source [2.0.0.v20221203-1659,2.0.0.v20221203-1659]
+	jakarta.inject.jakarta.inject-api  [1.0.5,1.0.5]
+	jakarta.inject.jakarta.inject-api.source [1.0.5,1.0.5]
+	net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020]
+	net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020]
+	org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
+	org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
+	org.apache.commons.commons-io [2.13.0,2.13.0]
+	org.apache.commons.commons-io.source [2.13.0,2.13.0]
+	org.apache.commons.logging [1.2.0,1.2.0]
+	org.apache.commons.logging.source [1.2.0,1.2.0]
+	org.apache.httpcomponents.httpclient [4.5.14,4.5.14]
+	org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14]
+	org.apache.httpcomponents.httpcore [4.4.16,4.4.16]
+	org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16]
+	org.apache.log4j [1.2.24.v20221221-2012,1.2.24.v20221221-2012]
+	org.apache.log4j.source [1.2.24.v20221221-2012,1.2.24.v20221221-2012]
+	org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000]
+	org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000]
+	org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000]
+	org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000]
+	org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000]
+	org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000]
+	org.objenesis [3.3,3.3]
+	org.objenesis.source [3.3,3.3]
+	org.objectweb.asm [9.5.0, 9.5.0]
+	org.objectweb.asm.source [9.5.0, 9.5.0]
+	org.objectweb.asm.tree [9.5.0,9.5.0]
+	org.objectweb.asm.tree.source [9.5.0,9.5.0]
+	org.objectweb.asm.tree.analysis [9.5.0,9.5.0]
+	org.objectweb.asm.tree.analysis.source [9.5.0,9.5.0]
+	org.objectweb.asm.util [9.5.0,9.5.0]
+	org.objectweb.asm.util.source [9.5.0,9.5.0]
+	org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733]
+}
diff --git a/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd b/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd
index 3cf3b3de26..db87ba29c4 100644
--- a/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd
+++ b/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd
@@ -1,6 +1,6 @@
 target "4.28-2023-06" with source configurePhase
 
-location "https://download.eclipse.org/staging/2023-06" {
+location "https://download.eclipse.org/releases/2023-06" {
 	// Eclipse platform
 	biz.aQute.bnd.util lazy
 	biz.aQute.bndlib lazy
diff --git a/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd b/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd
new file mode 100644
index 0000000000..bd7e4e4f7e
--- /dev/null
+++ b/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd
@@ -0,0 +1,24 @@
+target "4.28-2023-06" with source configurePhase
+
+location "https://download.eclipse.org/staging/2023-09" {
+	// Eclipse platform
+	biz.aQute.bnd.util lazy
+	biz.aQute.bndlib lazy
+	org.apache.commons.jxpath lazy
+	org.eclipse.sdk.ide lazy
+	org.eclipse.ecf.core.feature.feature.group lazy
+	org.eclipse.ecf.filetransfer.feature.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.equinox.p2.director lazy
+	org.eclipse.equinox.sdk.feature.group lazy
+	org.eclipse.e4.tools.emf.ui lazy
+	org.eclipse.e4.tools.services lazy
+	org.eclipse.e4.ui.progress lazy
+	org.eclipse.e4.ui.workbench lazy
+	org.osgi.service.repository lazy
+	org.sat4j.core lazy
+	org.sat4j.pb lazy
+
+	// debugging SWT layouts
+	org.eclipse.tools.layout.spy lazy
+}
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index 048b81d7a8..0b69375161 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
  org.eclipse.ui;bundle-version="[3.201.200,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.19.800,4.0.0)",
  org.eclipse.egit.core.junit;bundle-version="[6.7.0,6.8.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
  org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)",
diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs
index 0689c41a36..764501283e 100644
--- a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jgit.annotations.NonNull
@@ -18,6 +19,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
@@ -106,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warni
 org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
 org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index 9c1dcfa237..0e700f7361 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -1207,6 +1207,9 @@ public class UIText extends NLS {
 	public static String RepositoryPropertySource_SystemConfigurationMenu;
 
 	/** */
+	public static String RepositoryPropertySource_XdgConfigurationMenu;
+
+	/** */
 	public static String RepositoryPropertySource_SelectModeTooltip;
 
 	/** */
@@ -2689,6 +2692,9 @@ public class UIText extends NLS {
 	public static String GlobalConfigurationPreferencePage_systemSettingTabTitle;
 
 	/** */
+	public static String GlobalConfigurationPreferencePage_userSettingLabel;
+
+	/** */
 	public static String GlobalConfigurationPreferencePage_userSettingTabTitle;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java
index 9336c65cd1..40c22500d9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, SAP AG.
+ * Copyright (c) 2010, 2023 SAP AG and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -34,9 +34,12 @@ import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jgit.events.ConfigChangedEvent;
 import org.eclipse.jgit.events.ConfigChangedListener;
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.storage.file.UserConfigFile;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.SystemReader;
 import org.eclipse.swt.SWT;
@@ -65,10 +68,14 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 
 	private FileBasedConfig userConfig;
 
+	private FileBasedConfig xdgConfig;
+
 	private FileBasedConfig sysConfig;
 
 	private StackLayout repoConfigStackLayout;
 
+	private StackLayout userConfigStackLayout;
+
 	private List<Repository> repositories;
 
 	private Map<Repository, ConfigurationEditorComponent> repoConfigEditors = new HashMap<>();
@@ -77,14 +84,20 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 
 	private boolean userIsDirty;
 
+	private boolean xdgIsDirty;
+
 	private boolean sysIsDirty;
 
 	private ConfigurationEditorComponent userConfigEditor;
 
+	private ConfigurationEditorComponent xdgConfigEditor;
+
 	private ConfigurationEditorComponent sysConfigEditor;
 
 	private Composite repoConfigComposite;
 
+	private Composite userConfigComposite;
+
 	@Override
 	protected Control createContents(Composite parent) {
 
@@ -92,19 +105,97 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 				SWTUtils.MARGINS_NONE);
 		TabFolder tabFolder = new TabFolder(composite, SWT.NONE);
 		tabFolder.setLayoutData(SWTUtils.createHVFillGridData());
-		userConfigEditor = new ConfigurationEditorComponent(tabFolder,
-				userConfig, true, 5) {
-			@Override
-			protected void setErrorMessage(String message) {
-				GlobalConfigurationPreferencePage.this.setErrorMessage(message);
-			}
+		Control userTabControl;
+		if (xdgConfig != null) {
+			Composite userTab = new Composite(tabFolder, SWT.NONE);
+			String variable = SystemReader.getInstance().isWindows()
+					? '%' + Constants.XDG_CONFIG_HOME + '%'
+					: '$' + Constants.XDG_CONFIG_HOME;
+			String[] items = { "~" + File.separatorChar + ".gitconfig", //$NON-NLS-1$ //$NON-NLS-2$
+					variable + File.separatorChar + "git" //$NON-NLS-1$
+							+ File.separatorChar + Constants.CONFIG };
+			Combo userCombo = insertCombo(userTab,
+					UIText.GlobalConfigurationPreferencePage_userSettingLabel,
+					items);
+			userCombo.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					Combo combo = (Combo) e.widget;
+					switch (combo.getSelectionIndex()) {
+					case 0:
+						userConfigStackLayout.topControl = userConfigEditor
+								.getContents();
+						break;
+					case 1:
+						userConfigStackLayout.topControl = xdgConfigEditor
+								.getContents();
+						break;
+					default:
+						return;
+					}
+					userConfigComposite.layout();
+				}
+			});
 
-			@Override
-			protected void setDirty(boolean dirty) {
-				userIsDirty = dirty;
-				updateApplyButton();
-			}
-		};
+			userConfigComposite = new Composite(userTab, SWT.NONE);
+			GridDataFactory.fillDefaults().grab(true, true)
+					.applyTo(userConfigComposite);
+			userConfigStackLayout = new StackLayout();
+			userConfigComposite.setLayout(userConfigStackLayout);
+			userConfigEditor = new ConfigurationEditorComponent(
+					userConfigComposite, userConfig, true, 5) {
+				@Override
+				protected void setErrorMessage(String message) {
+					GlobalConfigurationPreferencePage.this
+							.setErrorMessage(message);
+				}
+
+				@Override
+				protected void setDirty(boolean dirty) {
+					userIsDirty = dirty;
+					updateApplyButton();
+				}
+			};
+			Control control = userConfigEditor.createContents();
+			Dialog.applyDialogFont(control);
+			userConfigStackLayout.topControl = control;
+
+			xdgConfigEditor = new ConfigurationEditorComponent(
+					userConfigComposite,
+					xdgConfig, true, 5) {
+				@Override
+				protected void setErrorMessage(String message) {
+					GlobalConfigurationPreferencePage.this
+							.setErrorMessage(message);
+				}
+
+				@Override
+				protected void setDirty(boolean dirty) {
+					xdgIsDirty = dirty;
+					updateApplyButton();
+				}
+			};
+			control = xdgConfigEditor.createContents();
+			Dialog.applyDialogFont(control);
+			userTabControl = userTab;
+		} else {
+			userConfigEditor = new ConfigurationEditorComponent(tabFolder,
+					userConfig, true, 5) {
+				@Override
+				protected void setErrorMessage(String message) {
+					GlobalConfigurationPreferencePage.this
+							.setErrorMessage(message);
+				}
+
+				@Override
+				protected void setDirty(boolean dirty) {
+					userIsDirty = dirty;
+					updateApplyButton();
+				}
+			};
+			userTabControl = userConfigEditor.createContents();
+			Dialog.applyDialogFont(userTabControl);
+		}
 		sysConfigEditor = new ConfigurationEditorComponent(tabFolder, sysConfig,
 				true, 5) {
 			@Override
@@ -120,17 +211,9 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 		};
 
 		Composite repoTab = new Composite(tabFolder, SWT.NONE);
-		GridLayoutFactory.swtDefaults().margins(0, 0).applyTo(repoTab);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(repoTab);
-		Composite repositoryComposite = new Composite(repoTab, SWT.NONE);
-		repositoryComposite.setLayout(new GridLayout(2, false));
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(
-				repositoryComposite);
-		Label repoLabel = new Label(repositoryComposite, SWT.NONE);
-		repoLabel
-				.setText(UIText.GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel);
-
-		Combo repoCombo = new Combo(repositoryComposite, SWT.READ_ONLY);
+		Combo repoCombo = insertCombo(repoTab,
+				UIText.GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel,
+				getRepositoryComboItems());
 		repoCombo.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -138,7 +221,6 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 				showRepositoryConfiguration(combo.getSelectionIndex());
 			}
 		});
-		repoCombo.setItems(getRepositoryComboItems());
 
 		repoConfigComposite = new Composite(repoTab, SWT.NONE);
 		GridDataFactory.fillDefaults().grab(true, true).applyTo(repoConfigComposite);
@@ -158,14 +240,12 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 			repoCombo.setEnabled(false);
 		}
 
-		Control result = userConfigEditor.createContents();
-		Dialog.applyDialogFont(result);
 		TabItem userTabItem = new TabItem(tabFolder, SWT.FILL);
-		userTabItem.setControl(result);
+		userTabItem.setControl(userTabControl);
 		userTabItem.setText(
 				UIText.GlobalConfigurationPreferencePage_userSettingTabTitle);
 
-		result = sysConfigEditor.createContents();
+		Control result = sysConfigEditor.createContents();
 		Dialog.applyDialogFont(result);
 		TabItem sysTabItem = new TabItem(tabFolder, SWT.FILL);
 		sysTabItem.setControl(result);
@@ -187,7 +267,8 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 	@Override
 	protected void updateApplyButton() {
 		if (getApplyButton() != null)
-			getApplyButton().setEnabled(userIsDirty || sysIsDirty || !dirtyRepositories.isEmpty());
+			getApplyButton().setEnabled(userIsDirty || xdgIsDirty || sysIsDirty
+					|| !dirtyRepositories.isEmpty());
 	}
 
 	@Override
@@ -201,6 +282,14 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 				ok = false;
 			}
 		}
+		if (xdgIsDirty) {
+			try {
+				xdgConfigEditor.save();
+			} catch (IOException e) {
+				Activator.handleError(e.getMessage(), e, true);
+				ok = false;
+			}
+		}
 		if (sysIsDirty) {
 			try {
 				sysConfigEditor.save();
@@ -229,6 +318,9 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 	protected void performDefaults() {
 		try {
 			userConfigEditor.restore();
+			if (xdgConfigEditor != null) {
+				xdgConfigEditor.restore();
+			}
 			sysConfigEditor.restore();
 			for (ConfigurationEditorComponent editor : repoConfigEditors.values()) {
 				editor.restore();
@@ -244,8 +336,26 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 	public void init(IWorkbench workbench) {
 		if (sysConfig == null)
 			sysConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED);
-		if (userConfig == null)
-			userConfig = SystemReader.getInstance().openUserConfig(null, FS.DETECTED); // no inherit here!
+		if (userConfig == null) {
+			FileBasedConfig userCfg = SystemReader.getInstance()
+					.openUserConfig(null, FS.DETECTED);
+			FileBasedConfig xdgCfg = null;
+
+			if (userCfg instanceof UserConfigFile) {
+				Config base = userCfg.getBaseConfig();
+				if (base instanceof FileBasedConfig) {
+					xdgCfg = (FileBasedConfig) base;
+					userCfg = new FileBasedConfig(null, userCfg.getFile(),
+							FS.DETECTED);
+					if (xdgCfg.getFile() == null
+							|| !xdgCfg.getFile().isFile()) {
+						xdgCfg = null;
+					}
+				}
+			}
+			userConfig = userCfg;
+			xdgConfig = xdgCfg;
+		}
 		if (repositories == null) {
 			repositories = new ArrayList<>();
 			List<String> repoPaths = RepositoryUtil.INSTANCE
@@ -274,6 +384,22 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
 				String.CASE_INSENSITIVE_ORDER));
 	}
 
+	private Combo insertCombo(Composite parent, String label, String[] items) {
+		GridLayoutFactory.swtDefaults().margins(0, 0).applyTo(parent);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
+		Composite comboComposite = new Composite(parent, SWT.NONE);
+		comboComposite.setLayout(new GridLayout(2, false));
+		GridDataFactory.fillDefaults().grab(true, false)
+				.applyTo(comboComposite);
+		Label l = new Label(comboComposite, SWT.NONE);
+		l.setText(label);
+
+		Combo combo = new Combo(comboComposite, SWT.READ_ONLY);
+		combo.setItems(items);
+		combo.select(0);
+		return combo;
+	}
+
 	private String[] getRepositoryComboItems() {
 		List<String> items = new ArrayList<>();
 		for (Repository repository : repositories) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java
index c5014fcfe1..7619be63c2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2023 SAP AG and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.storage.file.UserConfigFile;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.SystemReader;
 import org.eclipse.osgi.util.NLS;
@@ -69,6 +70,8 @@ public class RepositoryPropertySource implements IPropertySource {
 
 	private static final String SYSTEM_ID_PREFIX = "system"; //$NON-NLS-1$
 
+	private static final String XDG_ID_PREFIX = "xdg"; //$NON-NLS-1$
+
 	private static final String USER_ID_PREFIX = "user"; //$NON-NLS-1$
 
 	private static final String REPO_ID_PREFIX = "repo"; //$NON-NLS-1$
@@ -106,6 +109,9 @@ public class RepositoryPropertySource implements IPropertySource {
 			case SYSTEM:
 				config = source.systemConfig;
 				break;
+			case XDG:
+				config = source.xdgConfig;
+				break;
 			case USER:
 				config = source.userHomeConfig;
 				break;
@@ -134,6 +140,8 @@ public class RepositoryPropertySource implements IPropertySource {
 
 	private final FileBasedConfig userHomeConfig;
 
+	private final FileBasedConfig xdgConfig;
+
 	private final StoredConfig repositoryConfig;
 
 	private final StoredConfig effectiveConfig;
@@ -156,7 +164,20 @@ public class RepositoryPropertySource implements IPropertySource {
 
 		effectiveConfig = repository.getConfig();
 		systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED);
-		userHomeConfig = SystemReader.getInstance().openUserConfig(null, FS.DETECTED);
+		FileBasedConfig userConfig = SystemReader.getInstance()
+				.openUserConfig(null, FS.DETECTED);
+		FileBasedConfig xdgCfg = null;
+
+		if (userConfig instanceof UserConfigFile) {
+			Config base = userConfig.getBaseConfig();
+			if (base instanceof FileBasedConfig) {
+				xdgCfg = (FileBasedConfig) base;
+				userConfig = new FileBasedConfig(null, userConfig.getFile(),
+						FS.DETECTED);
+			}
+		}
+		userHomeConfig = userConfig;
+		xdgConfig = xdgCfg;
 
 		if (effectiveConfig instanceof FileBasedConfig) {
 			File configFile = ((FileBasedConfig) effectiveConfig).getFile();
@@ -199,6 +220,12 @@ public class RepositoryPropertySource implements IPropertySource {
 					final Menu ctxMenu = mgr.createContextMenu(control);
 
 					for (final DisplayMode aMode : DisplayMode.values()) {
+						if (DisplayMode.XDG.equals(aMode)
+								&& (xdgConfig == null
+										|| xdgConfig.getFile() == null
+										|| !xdgConfig.getFile().isFile())) {
+							continue;
+						}
 						mgr.add(new Action(aMode.getText()) {
 							@Override
 							public void run() {
@@ -214,6 +241,11 @@ public class RepositoryPropertySource implements IPropertySource {
 								case EFFECTIVE:
 									enabled = false;
 									break;
+								case XDG:
+									enabled = xdgConfig != null
+											&& xdgConfig.getFile() != null
+											&& xdgConfig.getFile().canWrite();
+									break;
 								case SYSTEM:
 									enabled = systemConfig.getFile() != null
 											&& systemConfig.getFile()
@@ -224,14 +256,17 @@ public class RepositoryPropertySource implements IPropertySource {
 									break;
 								}
 								editAction.getAction().setEnabled(enabled);
+								// We change the action text, so force an update
+								// to get proper re-layout.
+								myPage.getSite().getActionBars()
+										.updateActionBars();
 								myPage.refresh();
 							}
 
 							@Override
 							public boolean isEnabled() {
 								return aMode != DisplayMode.SYSTEM
-												|| systemConfig
-												.getFile() != null;
+										|| systemConfig.getFile() != null;
 							}
 
 							@Override
@@ -353,6 +388,9 @@ public class RepositoryPropertySource implements IPropertySource {
 	public IPropertyDescriptor[] getPropertyDescriptors() {
 		try {
 			systemConfig.load();
+			if (xdgConfig != null) {
+				xdgConfig.load();
+			}
 			userHomeConfig.load();
 			repositoryConfig.load();
 			effectiveConfig.load();
@@ -387,6 +425,18 @@ public class RepositoryPropertySource implements IPropertySource {
 			config = repositoryConfig;
 			break;
 		}
+		case XDG: {
+			if (xdgConfig == null) {
+				return new IPropertyDescriptor[0];
+			}
+			prefix = XDG_ID_PREFIX;
+			String location = xdgConfig.getFile().getAbsolutePath();
+			category = NLS.bind(
+					UIText.RepositoryPropertySource_GlobalConfigurationCategory,
+					location);
+			config = xdgConfig;
+			break;
+		}
 		case USER: {
 			prefix = USER_ID_PREFIX;
 			String location = userHomeConfig.getFile().getAbsolutePath();
@@ -440,6 +490,9 @@ public class RepositoryPropertySource implements IPropertySource {
 		if (actId.startsWith(SYSTEM_ID_PREFIX)) {
 			value = getValueFromConfig(systemConfig,
 					actId.substring(SYSTEM_ID_PREFIX.length()));
+		} else if (actId.startsWith(XDG_ID_PREFIX)) {
+			value = getValueFromConfig(xdgConfig,
+					actId.substring(XDG_ID_PREFIX.length()));
 		} else if (actId.startsWith(USER_ID_PREFIX)) {
 			value = getValueFromConfig(userHomeConfig,
 					actId.substring(USER_ID_PREFIX.length()));
@@ -482,7 +535,9 @@ public class RepositoryPropertySource implements IPropertySource {
 		EFFECTIVE(UIText.RepositoryPropertySource_EffectiveConfigurationAction),
 		/* System wide configuration */
 		SYSTEM(UIText.RepositoryPropertySource_SystemConfigurationMenu),
-		/* The user specific configuration */
+		/* The configuration at $XDG_CONFIG_HOME/git/config */
+		XDG(UIText.RepositoryPropertySource_XdgConfigurationMenu),
+		/* The configuration in the user's home directory */
 		USER(UIText.RepositoryPropertySource_GlobalConfigurationMenu),
 		/* The repository specific configuration */
 		REPO(UIText.RepositoryPropertySource_RepositoryConfigurationButton);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java
index d7edf0ad4b..6da6544972 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java
@@ -27,7 +27,6 @@ import java.util.Collections;
 import java.util.Objects;
 
 import org.eclipse.compare.ISharedDocumentAdapter;
-import org.eclipse.compare.internal.Utilities;
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.resources.IContainer;
@@ -154,9 +153,12 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement
 		if (modifiedContent == null) {
 			try {
 				InputStream is = createStream();
-				modifiedContent = Utilities.readBytes(is);
+				modifiedContent = is.readAllBytes();
 			} catch (CoreException e) {
 				Activator.handleStatus(e.getStatus(), false);
+			} catch (IOException e) {
+				Activator.handleStatus(
+						Activator.createErrorStatus(e.getMessage(), e), false);
 			}
 		}
 		return modifiedContent;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 98a1cfad89..8e9d3310bf 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2019, 2020 Shawn Pearce and others.
+# Copyright (c) 2005, 2023 Shawn Pearce and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -494,6 +494,7 @@ RepositoryPropertySource_SelectModeTooltip=Select a configuration to display
 RepositoryPropertySource_SingleValueButton=Single Value
 RepositoryPropertySource_SuppressMultipleValueTooltip=Suppress display of multiple values
 RepositoryPropertySource_SystemConfigurationMenu=System Configuration
+RepositoryPropertySource_XdgConfigurationMenu=XDG_CONFIG_HOME Configuration
 
 RepositoryRemotePropertySource_ErrorHeader=Error
 RepositoryRemotePropertySource_FetchLabel=Remote Fetch Specification
@@ -1655,6 +1656,7 @@ ContinueRebaseCommand_JobName=Continuing Rebase
 MixedResetToRevisionAction_mixedReset=Mixed Reset
 
 GlobalConfigurationPreferencePage_systemSettingTabTitle=&System Settings
+GlobalConfigurationPreferencePage_userSettingLabel=Con&figuration:
 GlobalConfigurationPreferencePage_userSettingTabTitle=&User Settings
 GlobalConfigurationPreferencePage_repositorySettingTabTitle=Repository Sett&ings
 GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel=Reposi&tory:
diff --git a/pom.xml b/pom.xml
index a5e6545ca3..d2fe39b24d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
   <properties>
     <maven-version-minimum>3.6.3</maven-version-minimum>
     <egit-version>6.7.0-SNAPSHOT</egit-version>
-    <tycho-version>4.0.0</tycho-version>
+    <tycho-version>4.0.2</tycho-version>
     <java-version>11</java-version>
     <ecj-version>3.33.0</ecj-version>
     <spotbugs-maven-plugin-version>4.7.3.4</spotbugs-maven-plugin-version>
@@ -195,10 +195,6 @@
       <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
     </pluginRepository>
     <pluginRepository>
-      <id>repo.eclipse.org.cbi-snapshots</id>
-      <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
-    </pluginRepository>
-    <pluginRepository>
       <id>repo.eclipse.org.dash-releases</id>
       <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
     </pluginRepository>