aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2021-11-24 17:49:02 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2021-11-24 17:49:02 +0100
commit751e3ad5d1f67018421d53e3ae03444ff6f5d840 (patch)
treedea7ca864cd25434de1370cad1ec5bfe30ee7291 /org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit
parent6807661d39a43909c946e4dc1359db13dcf9d24a (diff)
parentfc60efff0d92b25c21be5fdbe84c17670ccb0288 (diff)
downloadjgit-751e3ad5d1f67018421d53e3ae03444ff6f5d840.tar.gz
jgit-751e3ad5d1f67018421d53e3ae03444ff6f5d840.zip
Merge branch 'master' into stable-6.0
* master: Add 4.22 target platform for 2021-12 Update Orbit to R20211122181901 for 2021-12 AppServer: fix keystore used to setup test SSL context factory [6.0 API cleanup] Public interface for PackLock [6.0 API cleanup] StoredObjectRepresentationNotAvailableException RepoCommand: Do not wrap GitApiExceptions in GitApiExceptions Set JSch global config values only if not set already Better git system config finding [6.0 API cleanup] CancelledException vs. CanceledException Javadoc fixes Better git system config finding HttpClientConnectionTest: organize imports Update Jetty to 10.0.6 Fix missing @since 6.0 tag Support commit.template config property DFS block cache: harden against race over ref locks. Change-Id: Id9814d92eb40b2ba63c5e753a86a4809826e7c81
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit')
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd)6
1 files changed, 2 insertions, 4 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd
index 0f0701099e..cd1d1c08fa 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd
@@ -1,7 +1,7 @@
-target "S20211108222137" with source configurePhase
+target "R20211122181901-2021-12" with source configurePhase
// see https://download.eclipse.org/tools/orbit/downloads/
-location "https://download.eclipse.org/tools/orbit/downloads/drops/S20211108222137/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/repository" {
com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
@@ -14,8 +14,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202111082221
com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
- javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
- javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]