Merge branch 'master' into next
* master: (38 commits) Revert "DFS block cache: Refactor to enable parallel index loading" GitServlet: allow to override default error handlers Silence API error for new interface method ProtocolV2Hook#onObjectInfo transport: add object-info capability Ignore IllegalStateException if JVM is already shutting down Update orbit to R20210825222808 for 2021-09 Update spotbugs-maven-plugin to 4.3.0 Update ant to 1.10.11 also in pom.xml DFS block cache: add additional stats to DfsReaderIoStats Update Orbit to S20210817231813 [gpg] Better GPG home directory determination FS: cleanup use of final modifier Ensure FS#searchPath only selects executable files RevWalk: getMergedInto's result is wrong on the second call DFS block cache: Refactor to enable parallel index loading [test] Create keystore with the keytool of the running JDK [gpg] Update to Bouncy Castle 1.69 [test] Create keystore with the keytool of the running JDK [sshd] Minor code clean-up Support commit.template config property ... Change-Id: I9f99e9a513a23c0c0d252334e79c351512d7355e
This commit is contained in:
Matthias Sohn
commit
a19494b735
99
DEPENDENCIES
99
DEPENDENCIES
|
|
@ -1,66 +1,69 @@
|
|||
maven/mavencentral/args4j/args4j/2.33, MIT, approved, CQ11068
|
||||
maven/mavencentral/com.google.code.gson/gson/2.8.6, Apache-2.0, approved, CQ23102
|
||||
maven/mavencentral/com.googlecode.javaewah/JavaEWAH/1.1.7, Apache-2.0, approved, CQ11658
|
||||
maven/mavencentral/com.google.code.gson/gson/2.8.7, Apache-2.0, approved, CQ23496
|
||||
maven/mavencentral/com.googlecode.javaewah/JavaEWAH/1.1.12, Apache-2.0, approved, CQ11658
|
||||
maven/mavencentral/com.jcraft/jsch/0.1.55, BSD-3-Clause, approved, CQ19435
|
||||
maven/mavencentral/com.jcraft/jzlib/1.1.1, BSD-2-Clause, approved, CQ6218
|
||||
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0, approved, CQ15971
|
||||
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
|
||||
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
|
||||
maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, Apache-2.0 AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0), approved, emo_ip_team
|
||||
maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, Apache-2.0 AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ7248
|
||||
maven/mavencentral/junit/junit/4.13, , approved, CQ22796
|
||||
maven/mavencentral/log4j/log4j/1.2.15, Apache-2.0, approved, CQ7837
|
||||
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0, approved, CQ17804
|
||||
maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0-1.0, approved, CQ22537
|
||||
maven/mavencentral/net.sf.jopt-simple/jopt-simple/4.6, MIT, approved, clearlydefined
|
||||
maven/mavencentral/org.apache.ant/ant-launcher/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560
|
||||
maven/mavencentral/org.apache.ant/ant/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560
|
||||
maven/mavencentral/org.apache.commons/commons-compress/1.19, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/org.apache.commons/commons-compress/1.20, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ21771
|
||||
maven/mavencentral/org.apache.commons/commons-math3/3.2, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0, approved, CQ22761
|
||||
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.14, Apache-2.0, approved, CQ18704
|
||||
maven/mavencentral/org.apache.sshd/sshd-common/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
|
||||
maven/mavencentral/org.apache.sshd/sshd-core/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
|
||||
maven/mavencentral/org.apache.sshd/sshd-osgi/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
|
||||
maven/mavencentral/org.apache.sshd/sshd-sftp/2.6.0, Apache-2.0 AND ISC, approved, CQ22993
|
||||
maven/mavencentral/org.assertj/assertj-core/3.14.0, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.65, Apache-2.0, approved, CQ21975
|
||||
maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.65, MIT AND LicenseRef-Public-Domain, approved, CQ21976
|
||||
maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.65.01, MIT AND LicenseRef-Public-Domain, approved, CQ21977
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.41.v20210516, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.12.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
|
||||
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.14, Apache-2.0, approved, CQ23528
|
||||
maven/mavencentral/org.apache.sshd/sshd-common/2.7.0, Apache-2.0 and ISC, approved, CQ23469
|
||||
maven/mavencentral/org.apache.sshd/sshd-core/2.7.0, Apache-2.0, approved, CQ23469
|
||||
maven/mavencentral/org.apache.sshd/sshd-osgi/2.7.0, Apache-2.0 and ISC, approved, CQ23469
|
||||
maven/mavencentral/org.apache.sshd/sshd-sftp/2.7.0, Apache-2.0, approved, CQ23470
|
||||
maven/mavencentral/org.assertj/assertj-core/3.20.2, Apache-2.0, approved, clearlydefined
|
||||
maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.69, MIT and Apache-2.0, approved, CQ23472
|
||||
maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, CQ23473
|
||||
maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, CQ23471
|
||||
maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.69, MIT, approved, CQ23474
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.43.v20210629, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.13.0-SNAPSHOT, , approved, eclipse
|
||||
maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ7063
|
||||
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-2-Clause, approved, clearlydefined
|
||||
maven/mavencentral/org.mockito/mockito-core/2.23.0, MIT, approved, CQ17976
|
||||
maven/mavencentral/org.objenesis/objenesis/2.6, Apache-2.0, approved, CQ15478
|
||||
maven/mavencentral/org.openjdk.jmh/jmh-core/1.21, GPL-2.0, approved, CQ20517
|
||||
maven/mavencentral/org.openjdk.jmh/jmh-generator-annprocess/1.21, GPL-2.0, approved, CQ20518
|
||||
maven/mavencentral/org.openjdk.jmh/jmh-core/1.32, GPL-2.0, approved, CQ23499
|
||||
maven/mavencentral/org.openjdk.jmh/jmh-generator-annprocess/1.32, GPL-2.0, approved, CQ23500
|
||||
maven/mavencentral/org.osgi/org.osgi.core/4.3.1, Apache-2.0, approved, CQ10111
|
||||
maven/mavencentral/org.slf4j/jcl-over-slf4j/1.7.30, Apache-2.0, approved, CQ12843
|
||||
maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
|
||||
maven/mavencentral/org.slf4j/slf4j-log4j12/1.7.30, MIT, approved, CQ7665
|
||||
maven/mavencentral/org.tukaani/xz/1.8, LicenseRef-Public-Domain, approved, CQ15386
|
||||
maven/mavencentral/org.tukaani/xz/1.9, LicenseRef-Public-Domain, approved, CQ23498
|
||||
|
|
|
|||
99
WORKSPACE
99
WORKSPACE
|
|
@ -55,20 +55,20 @@ exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
|
|||
],
|
||||
)
|
||||
|
||||
JMH_VERS = "1.21"
|
||||
JMH_VERS = "1.32"
|
||||
|
||||
maven_jar(
|
||||
name = "jmh-core",
|
||||
artifact = "org.openjdk.jmh:jmh-core:" + JMH_VERS,
|
||||
attach_source = False,
|
||||
sha1 = "442447101f63074c61063858033fbfde8a076873",
|
||||
sha1 = "9a8b69ea08118fd4e5d30a152d37b7087ee4a720",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jmh-annotations",
|
||||
artifact = "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERS,
|
||||
attach_source = False,
|
||||
sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3",
|
||||
sha1 = "0a28eccc75e0d65984ce25e1ec4dd021a0ca6c57",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
@ -105,8 +105,8 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "javaewah",
|
||||
artifact = "com.googlecode.javaewah:JavaEWAH:1.1.7",
|
||||
sha1 = "570dde3cd706ae10c62fe19b150928cfdb415e87",
|
||||
artifact = "com.googlecode.javaewah:JavaEWAH:1.1.12",
|
||||
sha1 = "9feecc2b24d6bc9ff865af8d082f192238a293eb",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
@ -123,14 +123,14 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "sshd-osgi",
|
||||
artifact = "org.apache.sshd:sshd-osgi:2.6.0",
|
||||
sha1 = "40e365bb799e1bff3d31dc858b1e59a93c123f29",
|
||||
artifact = "org.apache.sshd:sshd-osgi:2.7.0",
|
||||
sha1 = "a101aad0f79ad424498098f7e91c39d3d92177c1",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd-sftp",
|
||||
artifact = "org.apache.sshd:sshd-sftp:2.6.0",
|
||||
sha1 = "6eddfe8fdf59a3d9a49151e4177f8c1bebeb30c9",
|
||||
artifact = "org.apache.sshd:sshd-sftp:2.7.0",
|
||||
sha1 = "0c9eff7145e20b338c1dd6aca36ba93ed7c0147c",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
@ -165,14 +165,14 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "commons-compress",
|
||||
artifact = "org.apache.commons:commons-compress:1.19",
|
||||
sha1 = "7e65777fb451ddab6a9c054beb879e521b7eab78",
|
||||
artifact = "org.apache.commons:commons-compress:1.20",
|
||||
sha1 = "b8df472b31e1f17c232d2ad78ceb1c84e00c641b",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "tukaani-xz",
|
||||
artifact = "org.tukaani:xz:1.8",
|
||||
sha1 = "c4f7d054303948eb6a4066194253886c8af07128",
|
||||
artifact = "org.tukaani:xz:1.9",
|
||||
sha1 = "1ea4bec1a921180164852c65006d928617bd2caf",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
@ -188,15 +188,9 @@ maven_jar(
|
|||
)
|
||||
|
||||
maven_jar(
|
||||
name = "hamcrest-library",
|
||||
artifact = "org.hamcrest:hamcrest-library:1.3",
|
||||
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "hamcrest-core",
|
||||
artifact = "org.hamcrest:hamcrest-core:1.3",
|
||||
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
|
||||
name = "hamcrest",
|
||||
artifact = "org.hamcrest:hamcrest:2.2",
|
||||
sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
@ -207,8 +201,8 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "assertj-core",
|
||||
artifact = "org.assertj:assertj-core:3.14.0",
|
||||
sha1 = "3b7b0fcac821f3d167764e9926573cd64f78f9e9",
|
||||
artifact = "org.assertj:assertj-core:3.20.2",
|
||||
sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5",
|
||||
)
|
||||
|
||||
BYTE_BUDDY_VERSION = "1.9.0"
|
||||
|
|
@ -233,80 +227,87 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "gson",
|
||||
artifact = "com.google.code.gson:gson:2.8.6",
|
||||
sha1 = "9180733b7df8542621dc12e21e87557e8c99b8cb",
|
||||
artifact = "com.google.code.gson:gson:2.8.7",
|
||||
sha1 = "69d9503ea0a40ee16f0bcdac7e3eaf83d0fa914a",
|
||||
)
|
||||
|
||||
JETTY_VER = "9.4.42.v20210604"
|
||||
JETTY_VER = "9.4.43.v20210629"
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-servlet",
|
||||
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
|
||||
sha1 = "2b0529a22eab56f9a5553dd963e79edee7ffc1b5",
|
||||
src_sha1 = "3351f1fdde7a9bc214f42283af82f002666c777d",
|
||||
sha1 = "ee000c7dcdbe7b4ef94e3fa67be8f56a46915944",
|
||||
src_sha1 = "50236764fe1d3619ca07f346e148189c4f5b801a",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-security",
|
||||
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
|
||||
sha1 = "8f755242d4d73d98bef0055546aa53cf1ca456d9",
|
||||
src_sha1 = "1442ba55bfdf147fdd9d8386627838b36af7a555",
|
||||
sha1 = "ae1958da077c46bac61be9b8de2b45a3aa112353",
|
||||
src_sha1 = "6e5271e91da37e381f566e0db07ab4d936d86104",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-server",
|
||||
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
|
||||
sha1 = "f5f95cdabe677bd8aad9e80f5e125c5b1c5011aa",
|
||||
src_sha1 = "bdf93b825e7a7478a4a47d1c7569fc468f8c949e",
|
||||
sha1 = "8ba04f6b5d00223983684a563a3edaa12282bcf0",
|
||||
src_sha1 = "51600567dbd082fb03feeb9c786f5e7cc9e0a17d",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-http",
|
||||
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
|
||||
sha1 = "2b0bb748d2388c6aa981ab29bc0a6a695dee31a4",
|
||||
src_sha1 = "9f5b97a66ce62f03ce67b4f06936caa0ea9ba695",
|
||||
sha1 = "5171466337a6da7efbf317490b9c4574c0b4b640",
|
||||
src_sha1 = "52f477161fd0fc90869f48a145aa2c86624c496e",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-io",
|
||||
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
|
||||
sha1 = "581c5bb1aca96934e6961315fff066000c783659",
|
||||
src_sha1 = "6822c5df4877b9d631543dd3e048bb1f0d9c7249",
|
||||
sha1 = "acf672c64ac21851069c5b5b789e5c185a25933f",
|
||||
src_sha1 = "824d5cffce7a72af7c11d9cd87f86184e2a05c17",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-util",
|
||||
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
|
||||
sha1 = "16b116e9982c2037fd4bf05ce2525ccd5917eb9c",
|
||||
src_sha1 = "e31bf18e992a5fd6e0e60f752b4edac4d57ca7cf",
|
||||
sha1 = "97306fd3c76171602caad2acc54ca779c9240d5f",
|
||||
src_sha1 = "dffff7271c248d4e21e2b1629c57896b8e631051",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jetty-util-ajax",
|
||||
artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER,
|
||||
sha1 = "dfff709928e92d8fd4888d53dbdfb024a4aa92f9",
|
||||
src_sha1 = "6b59220ec832e41ed433581409006a567691a75c",
|
||||
sha1 = "2500d180c6e8e28eb3b75372b6ea9d457cf37658",
|
||||
src_sha1 = "682470f5ad074e64fc0e9c93bdc2784482f79362",
|
||||
)
|
||||
|
||||
BOUNCYCASTLE_VER = "1.65"
|
||||
BOUNCYCASTLE_VER = "1.69"
|
||||
|
||||
maven_jar(
|
||||
name = "bcpg",
|
||||
artifact = "org.bouncycastle:bcpg-jdk15on:" + BOUNCYCASTLE_VER,
|
||||
sha1 = "f32fc02cc29c9fdcc35c0de4d16964f01777067c",
|
||||
src_sha1 = "508476d5383c7d086b400f5e7c5a8cf4dc8ac4e2",
|
||||
sha1 = "d99a08c3f651b26e8eb668e941b0bbd2c09ece08",
|
||||
src_sha1 = "de1fc261b44a8eb60583413a31ffc98ce3dce38b",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "bcprov",
|
||||
artifact = "org.bouncycastle:bcprov-jdk15on:1.65.01",
|
||||
sha1 = "0fbd478ea7b07acc3902b9585a37fd88393f8427",
|
||||
src_sha1 = "8f54635075628c69b6c037e800dd0b03ffb8dd51",
|
||||
artifact = "org.bouncycastle:bcprov-jdk15on:" + BOUNCYCASTLE_VER,
|
||||
sha1 = "91e1628251cf3ca90093ce9d0fe67e5b7dab3850",
|
||||
src_sha1 = "67dc6476845f6b29cb520b5df61db65ae56718e4",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "bcutil",
|
||||
artifact = "org.bouncycastle:bcutil-jdk15on:" + BOUNCYCASTLE_VER,
|
||||
sha1 = "c3edf93d346e97f64f041e448e7455c39c7eff64",
|
||||
src_sha1 = "deeb3fbbf373e05e2a20941f9a8ce90e9aeab3d2",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "bcpkix",
|
||||
artifact = "org.bouncycastle:bcpkix-jdk15on:" + BOUNCYCASTLE_VER,
|
||||
sha1 = "c9507d93e4b453320b57d9ac21bdd67d65a00bbc",
|
||||
src_sha1 = "16c71e83af43927d20ccad19defcbb0babcbdb26",
|
||||
sha1 = "45c36fb72fafb0b688c6af795e6cc803f6f79ee5",
|
||||
src_sha1 = "8bc5214401459bd91eea816b516079da38374e90",
|
||||
)
|
||||
|
|
|
|||
18
lib/BUILD
18
lib/BUILD
|
|
@ -148,7 +148,6 @@ java_library(
|
|||
java_library(
|
||||
name = "jsch",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit:__pkg__",
|
||||
"//org.eclipse.jgit.junit.ssh:__pkg__",
|
||||
"//org.eclipse.jgit.ssh.jsch:__pkg__",
|
||||
"//org.eclipse.jgit.ssh.jsch.test:__pkg__",
|
||||
|
|
@ -159,7 +158,6 @@ java_library(
|
|||
java_library(
|
||||
name = "bcpg",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
|
||||
"//org.eclipse.jgit.test:__pkg__",
|
||||
|
|
@ -170,7 +168,6 @@ java_library(
|
|||
java_library(
|
||||
name = "bcprov",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
|
||||
"//org.eclipse.jgit.test:__pkg__",
|
||||
|
|
@ -178,10 +175,19 @@ java_library(
|
|||
exports = ["@bcprov//jar"],
|
||||
)
|
||||
|
||||
java_library(
|
||||
name = "bcutil",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit.gpg.bc:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
|
||||
"//org.eclipse.jgit.test:__pkg__",
|
||||
],
|
||||
exports = ["@bcutil//jar"],
|
||||
)
|
||||
|
||||
java_library(
|
||||
name = "bcpkix",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit:__pkg__",
|
||||
"//org.eclipse.jgit.gpg.bc:__pkg__",
|
||||
"//org.eclipse.jgit.test:__pkg__",
|
||||
],
|
||||
|
|
@ -191,7 +197,6 @@ java_library(
|
|||
java_library(
|
||||
name = "jzlib",
|
||||
visibility = [
|
||||
"//org.eclipse.jgit:__pkg__",
|
||||
"//org.eclipse.jgit.ssh.jsch:__pkg__",
|
||||
"//org.eclipse.jgit.test:__pkg__",
|
||||
],
|
||||
|
|
@ -205,8 +210,7 @@ java_library(
|
|||
exports = [
|
||||
"@bytebuddy-agent//jar",
|
||||
"@bytebuddy//jar",
|
||||
"@hamcrest-core//jar",
|
||||
"@hamcrest-library//jar",
|
||||
"@hamcrest//jar",
|
||||
"@junit//jar",
|
||||
"@mockito//jar",
|
||||
"@objenesis//jar",
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ Import-Package: org.apache.tools.ant,
|
|||
org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest.core;version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.core;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)"
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.10.8</version>
|
||||
<version>1.10.11</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<javac.target>1.8</javac.target>
|
||||
<jmh.version>1.21</jmh.version>
|
||||
<jmh.version>1.32</jmh.version>
|
||||
<uberjar.name>benchmarks</uberjar.name>
|
||||
</properties>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ junit_tests(
|
|||
deps = [
|
||||
"//lib:bcpg",
|
||||
"//lib:bcprov",
|
||||
"//lib:bcutil",
|
||||
"//lib:junit",
|
||||
"//org.eclipse.jgit.gpg.bc:gpg-bc",
|
||||
"//org.eclipse.jgit:jgit",
|
||||
|
|
|
|||
|
|
@ -15,10 +15,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
|
|||
org.eclipse.jgit.gpg.bc.internal;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.gpg.bc.internal.keys;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util.sha1;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)",
|
||||
org.junit.runners;version="[4.13,5.0.0)"
|
||||
Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true,
|
||||
org.eclipse.jgit.gpg.bc.internal.keys;x-internal:=true
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ java_library(
|
|||
"//lib:bcpg",
|
||||
"//lib:bcpkix",
|
||||
"//lib:bcprov",
|
||||
"//lib:bcutil",
|
||||
"//lib:slf4j-api",
|
||||
"//org.eclipse.jgit:jgit",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -8,27 +8,27 @@ Bundle-Vendor: %Bundle-Vendor
|
|||
Bundle-Localization: plugin
|
||||
Bundle-Version: 6.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.asn1.x9;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.bcpg.sig;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.crypto.ec;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.jcajce.interfaces;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.jcajce.util;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.math.ec;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.math.field;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.openpgp;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.jcajce;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.util;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
|
||||
org.bouncycastle.util.io;version="[1.65.0,2.0.0)",
|
||||
Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.bcpg;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.bcpg.sig;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.crypto.ec;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.gpg;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.gpg.keybox;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.gpg.keybox.jcajce;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.jcajce.interfaces;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.jcajce.util;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.jce.provider;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.math.ec;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.math.field;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.openpgp;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.jcajce;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.operator;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.openpgp.operator.jcajce;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.util;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)",
|
||||
org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
|
||||
org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
|
||||
org.slf4j;version="[1.7.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -49,6 +49,11 @@
|
|||
<artifactId>bcprov-jdk15on</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcutil-jdk15on</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpkix-jdk15on</artifactId>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ gpgNoSuchAlgorithm=Cannot decrypt encrypted secret key: encryption algorithm {0}
|
|||
gpgNotASigningKey=Secret key ({0}) is not suitable for signing
|
||||
gpgKeyInfo=GPG Key (fingerprint {0})
|
||||
gpgSigningCancelled=Signing was cancelled
|
||||
logWarnGnuPGHome=Cannot access GPG home directory given by environment variable GNUPGHOME={}
|
||||
logWarnGpgHomeProperty=Cannot access GPG home directory given by Java system property jgit.gpg.home={}
|
||||
nonSignatureError=Signature does not decode into a signature object
|
||||
secretKeyTooShort=Secret key file corrupt; only {0} bytes read
|
||||
sexprHexNotClosed=Hex number in s-expression not closed
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ public static BCText get() {
|
|||
/***/ public String gpgNotASigningKey;
|
||||
/***/ public String gpgKeyInfo;
|
||||
/***/ public String gpgSigningCancelled;
|
||||
/***/ public String logWarnGnuPGHome;
|
||||
/***/ public String logWarnGpgHomeProperty;
|
||||
/***/ public String nonSignatureError;
|
||||
/***/ public String secretKeyTooShort;
|
||||
/***/ public String sexprHexNotClosed;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@
|
|||
import java.text.MessageFormat;
|
||||
import java.util.Iterator;
|
||||
import java.util.Locale;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
|
||||
import org.bouncycastle.gpg.keybox.BlobType;
|
||||
import org.bouncycastle.gpg.keybox.KeyBlob;
|
||||
|
|
@ -98,29 +100,54 @@ private static class NoOpenPgpKeyException extends Exception {
|
|||
|
||||
private static Path findGpgDirectory() {
|
||||
SystemReader system = SystemReader.getInstance();
|
||||
Function<String, Path> resolveTilde = s -> {
|
||||
if (s.startsWith("~/") || s.startsWith("~" + File.separatorChar)) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
return new File(FS.DETECTED.userHome(), s.substring(2))
|
||||
.getAbsoluteFile().toPath();
|
||||
}
|
||||
return Paths.get(s);
|
||||
};
|
||||
Path path = checkDirectory(system.getProperty("jgit.gpg.home"), //$NON-NLS-1$
|
||||
resolveTilde,
|
||||
s -> log.warn(BCText.get().logWarnGpgHomeProperty, s));
|
||||
if (path != null) {
|
||||
return path;
|
||||
}
|
||||
path = checkDirectory(system.getenv("GNUPGHOME"), resolveTilde, //$NON-NLS-1$
|
||||
s -> log.warn(BCText.get().logWarnGnuPGHome, s));
|
||||
if (path != null) {
|
||||
return path;
|
||||
}
|
||||
if (system.isWindows()) {
|
||||
// On Windows prefer %APPDATA%\gnupg if it exists, even if Cygwin is
|
||||
// used.
|
||||
String appData = system.getenv("APPDATA"); //$NON-NLS-1$
|
||||
if (appData != null && !appData.isEmpty()) {
|
||||
try {
|
||||
Path directory = Paths.get(appData).resolve("gnupg"); //$NON-NLS-1$
|
||||
if (Files.isDirectory(directory)) {
|
||||
return directory;
|
||||
}
|
||||
} catch (SecurityException | InvalidPathException e) {
|
||||
// Ignore and return the default location below.
|
||||
}
|
||||
path = checkDirectory(system.getenv("APPDATA"), //$NON-NLS-1$
|
||||
s -> Paths.get(s).resolve("gnupg"), null); //$NON-NLS-1$
|
||||
if (path != null) {
|
||||
return path;
|
||||
}
|
||||
}
|
||||
// All systems, including Cygwin and even Windows if
|
||||
// %APPDATA%\gnupg doesn't exist: ~/.gnupg
|
||||
File home = FS.DETECTED.userHome();
|
||||
if (home == null) {
|
||||
// Oops. What now?
|
||||
home = new File(".").getAbsoluteFile(); //$NON-NLS-1$
|
||||
return resolveTilde.apply("~/.gnupg"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
private static Path checkDirectory(String dir,
|
||||
Function<String, Path> toPath, Consumer<String> warn) {
|
||||
if (!StringUtils.isEmptyOrNull(dir)) {
|
||||
try {
|
||||
Path directory = toPath.apply(dir);
|
||||
if (Files.isDirectory(directory)) {
|
||||
return directory;
|
||||
}
|
||||
} catch (SecurityException | InvalidPathException e) {
|
||||
// Ignore, warn, and try other known directories
|
||||
}
|
||||
if (warn != null) {
|
||||
warn.accept(dir);
|
||||
}
|
||||
}
|
||||
return home.toPath().resolve(".gnupg"); //$NON-NLS-1$
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ public void signObject(@NonNull ObjectBuilder object,
|
|||
}
|
||||
}
|
||||
if (userId != null) {
|
||||
subpackets.setSignerUserID(false, userId);
|
||||
subpackets.addSignerUserID(false, userId);
|
||||
}
|
||||
signatureGenerator
|
||||
.setHashedSubpackets(subpackets.generate());
|
||||
|
|
|
|||
|
|
@ -112,6 +112,17 @@ public void setUploadPackFactory(UploadPackFactory<HttpServletRequest> f) {
|
|||
gitFilter.setUploadPackFactory(f);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a custom error handler for git-upload-pack.
|
||||
*
|
||||
* @param h
|
||||
* A custom error handler for git-upload-pack.
|
||||
* @since 5.9.1
|
||||
*/
|
||||
public void setUploadPackErrorHandler(UploadPackErrorHandler h) {
|
||||
gitFilter.setUploadPackErrorHandler(h);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add upload-pack filter
|
||||
*
|
||||
|
|
@ -136,6 +147,17 @@ public void setReceivePackFactory(ReceivePackFactory<HttpServletRequest> f) {
|
|||
gitFilter.setReceivePackFactory(f);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a custom error handler for git-receive-pack.
|
||||
*
|
||||
* @param h
|
||||
* A custom error handler for git-receive-pack.
|
||||
* @since 5.9.1
|
||||
*/
|
||||
public void setReceivePackErrorHandler(ReceivePackErrorHandler h) {
|
||||
gitFilter.setReceivePackErrorHandler(h);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add receive-pack filter
|
||||
*
|
||||
|
|
|
|||
|
|
@ -48,10 +48,9 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
|
|||
org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest;version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.core;version="[1.1.0,2.0.0)",
|
||||
org.hamcrest;version="[1.1.0,3.0.0)",
|
||||
org.hamcrest.core;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.rules;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)",
|
||||
org.junit.runners;version="[4.13,5.0.0)"
|
||||
Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest-library</artifactId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<scope>test</scope>
|
||||
<version>[1.1.0,2.0.0)</version>
|
||||
<version>${hamcrest-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -181,9 +181,12 @@ private SslContextFactory createTestSslContextFactory(String hostName) {
|
|||
tmpDir.deleteOnExit();
|
||||
makePrivate(tmpDir);
|
||||
File keyStore = new File(tmpDir, "keystore.jks");
|
||||
File keytool = new File(
|
||||
new File(new File(System.getProperty("java.home")), "bin"),
|
||||
"keytool");
|
||||
Runtime.getRuntime().exec(
|
||||
new String[] {
|
||||
"keytool", //
|
||||
keytool.getAbsolutePath(), //
|
||||
"-keystore", keyStore.getAbsolutePath(), //
|
||||
"-storepass", keyPassword,
|
||||
"-alias", hostName, //
|
||||
|
|
|
|||
|
|
@ -8,31 +8,31 @@ Bundle-Localization: plugin
|
|||
Bundle-Vendor: %Bundle-Vendor
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.file.virtualfs;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.io;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.kex;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.threads;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.core;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.auth;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.auth.gss;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.auth.keyboard;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.auth.password;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.command;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.session;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.shell;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
|
||||
Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.command;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.shell;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)",
|
||||
org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
|
|||
org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest.core;version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.core;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.rules;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Import-Package: org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
|
|||
org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest.core;version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.core;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)",
|
||||
org.junit.runners;version="[4.13,5.0.0)"
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.10" sequenceNumber="1623856101">
|
||||
<target name="jgit-4.10" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.10" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2018-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.11" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.11" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.11" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.12" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.12" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.12" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.13" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.13" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.13" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.14" sequenceNumber="1623856141">
|
||||
<target name="jgit-4.14" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.14" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2019-12/201912181000/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.15" sequenceNumber="1623856141">
|
||||
<target name="jgit-4.15" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.15" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-03/202003181000/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.16" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.16" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.16" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.17" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.17" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.17" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.18" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.18" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.18" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.19-staging" sequenceNumber="1623856140">
|
||||
<target name="jgit-4.19-staging" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.19-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
target "jgit-4.20-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.20" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
|
||||
<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
|
||||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
|
||||
<unit id="org.junit" version="4.13.0.v20200204-1500"/>
|
||||
<unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
|
||||
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
|
||||
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
|
||||
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
|
||||
<unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
|
||||
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
|
||||
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
|
||||
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
<repository location="https://download.eclipse.org/releases/2021-06/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
target "jgit-4.20" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
}
|
||||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.20-staging" sequenceNumber="1623856145">
|
||||
<target name="jgit-4.21" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,13 +87,13 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
<repository location="https://download.eclipse.org/staging/2021-06/"/>
|
||||
<repository location="https://download.eclipse.org/staging/2021-09/"/>
|
||||
</location>
|
||||
</locations>
|
||||
</target>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
target "jgit-4.21" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
}
|
||||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.6" sequenceNumber="1623856172">
|
||||
<target name="jgit-4.6" sequenceNumber="1630003285">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.6" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/neon/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.7" sequenceNumber="1623856154">
|
||||
<target name="jgit-4.7" sequenceNumber="1630003276">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.7" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/oxygen/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.8" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.8" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.8" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/photon/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde?>
|
||||
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
|
||||
<target name="jgit-4.9" sequenceNumber="1623856144">
|
||||
<target name="jgit-4.9" sequenceNumber="1630003272">
|
||||
<locations>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
|
||||
<repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
|
||||
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
|
||||
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
|
||||
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
|
||||
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
|
||||
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
|
||||
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
|
||||
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
|
||||
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
|
||||
<unit id="javaewah" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
|
||||
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
|
||||
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
|
||||
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
|
||||
|
|
@ -41,12 +41,12 @@
|
|||
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
|
||||
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
|
||||
<unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
|
||||
<unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
|
||||
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
|
||||
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
|
||||
<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
|
||||
<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
|
||||
<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.13.v20210128-2225"/>
|
||||
|
|
@ -55,19 +55,22 @@
|
|||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
|
||||
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
|
||||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
|
||||
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
|
||||
<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
|
||||
<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.library" version="1.3.0.v20180524-2246"/>
|
||||
|
|
@ -84,9 +87,9 @@
|
|||
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
|
||||
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.9" with source configurePhase
|
||||
|
||||
include "projects/jetty-9.4.x.tpd"
|
||||
include "orbit/R20210602031627-2021-06.tpd"
|
||||
include "orbit/R20210825222808-2021-09.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2018-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
target "R20210825222808-2021-09" with source configurePhase
|
||||
// see https://download.eclipse.org/tools/orbit/downloads/
|
||||
|
||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" {
|
||||
com.google.gson [2.8.7.v20210624-1215,2.8.7.v20210624-1215]
|
||||
com.google.gson.source [2.8.7.v20210624-1215,2.8.7.v20210624-1215]
|
||||
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
|
||||
javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
|
||||
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]
|
||||
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
|
||||
net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
|
||||
net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
|
||||
org.apache.ant [1.10.11.v20210720-1445,1.10.11.v20210720-1445]
|
||||
org.apache.ant.source [1.10.11.v20210720-1445,1.10.11.v20210720-1445]
|
||||
org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.compress [1.20.0.v20210713-1928,1.20.0.v20210713-1928]
|
||||
org.apache.commons.compress.source [1.20.0.v20210713-1928,1.20.0.v20210713-1928]
|
||||
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
|
||||
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
|
||||
org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
|
||||
org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
|
||||
org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcprov [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcprov.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.junit [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
|
||||
org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
|
||||
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
|
||||
org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
|
||||
org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
|
||||
org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
|
||||
}
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
target "jetty-9.4.x" with source configurePhase
|
||||
|
||||
location jetty-9.4.40 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/" {
|
||||
org.eclipse.jetty.client [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.client.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.continuation [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.continuation.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.http [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.http.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.io [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.io.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.security [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.security.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.server [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.server.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.servlet [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.servlet.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.util [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.util.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.util.ajax [9.4.42.v20210604,9.4.42.v20210604]
|
||||
org.eclipse.jetty.util.ajax.source [9.4.42.v20210604,9.4.42.v20210604]
|
||||
location jetty-9.4.x "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/" {
|
||||
org.eclipse.jetty.client [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.client.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.continuation [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.continuation.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.http [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.http.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.io [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.io.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.security [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.security.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.server [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.server.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.servlet [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.servlet.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.util [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.util.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.util.ajax [9.4.43.v20210629,9.4.43.v20210629]
|
||||
org.eclipse.jetty.util.ajax.source [9.4.43.v20210629,9.4.43.v20210629]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Import-Package: org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
|
|||
org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.core;bundle-version="[2.2.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.rules;version="[4.13,5.0.0)",
|
||||
org.kohsuke.args4j;version="[2.33.0,3.0.0)"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ VAL=VAL
|
|||
# default meta variable defined in the org.kohsuke.args4j.spi.ExplicitBooleanOptionHandler
|
||||
VALUE=VAL
|
||||
# default meta variable defined in the org.kohsuke.args4j.spi.StopOptionHandler
|
||||
ARGUMENTS=ARGUMENTS
|
||||
ARGS=ARGS
|
||||
# default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler
|
||||
N=N
|
||||
|
||||
|
|
|
|||
|
|
@ -219,8 +219,12 @@ public final void execute(String[] args) throws Exception {
|
|||
case APACHE: {
|
||||
SshdSessionFactory factory = new SshdSessionFactory(
|
||||
new JGitKeyCache(), new DefaultProxyDataFactory());
|
||||
Runtime.getRuntime()
|
||||
.addShutdownHook(new Thread(factory::close));
|
||||
try {
|
||||
Runtime.getRuntime()
|
||||
.addShutdownHook(new Thread(factory::close));
|
||||
} catch (IllegalStateException e) {
|
||||
// ignore - the VM is already shutting down
|
||||
}
|
||||
SshSessionFactory.setInstance(factory);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
import org.kohsuke.args4j.spi.Setter;
|
||||
|
||||
/**
|
||||
* Create a {@link org.eclipse.jgit.treewalk.filter.TreeFilter} to patch math
|
||||
* Create a {@link org.eclipse.jgit.treewalk.filter.TreeFilter} to match path
|
||||
* names.
|
||||
* <p>
|
||||
* This handler consumes all arguments to the end of the command line, and is
|
||||
|
|
|
|||
|
|
@ -7,19 +7,20 @@ Bundle-Version: 6.0.0.qualifier
|
|||
Bundle-Vendor: %Bundle-Vendor
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.auth;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.core;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
|
||||
Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.forward;version="[2.7.0,2.8.0)",
|
||||
org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.0.0,6.1.0)",
|
||||
|
|
@ -29,7 +30,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)",
|
|||
org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.transport.sshd;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.experimental.theories;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)"
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -34,13 +34,18 @@
|
|||
|
||||
import org.apache.sshd.client.config.hosts.KnownHostEntry;
|
||||
import org.apache.sshd.client.config.hosts.KnownHostHashValue;
|
||||
import org.apache.sshd.common.NamedFactory;
|
||||
import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
|
||||
import org.apache.sshd.common.config.keys.KeyUtils;
|
||||
import org.apache.sshd.common.config.keys.PublicKeyEntry;
|
||||
import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
|
||||
import org.apache.sshd.common.kex.BuiltinDHFactories;
|
||||
import org.apache.sshd.common.kex.DHFactory;
|
||||
import org.apache.sshd.common.kex.KeyExchangeFactory;
|
||||
import org.apache.sshd.common.session.Session;
|
||||
import org.apache.sshd.common.util.net.SshdSocketAddress;
|
||||
import org.apache.sshd.server.ServerAuthenticationManager;
|
||||
import org.apache.sshd.server.ServerBuilder;
|
||||
import org.apache.sshd.server.SshServer;
|
||||
import org.apache.sshd.server.forward.StaticDecisionForwardingFilter;
|
||||
import org.eclipse.jgit.api.Git;
|
||||
|
|
@ -702,4 +707,42 @@ public void testConnectAuthSshRsa() throws Exception {
|
|||
session.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that one can log in at an even poorer server that also only has the
|
||||
* SHA1 KEX methods available. Apparently this is the case for at least some
|
||||
* Microsoft TFS instances. The user has to enable the poor KEX methods in
|
||||
* the ssh config explicitly; we don't enable them by default.
|
||||
*
|
||||
* @throws Exception
|
||||
* on failure
|
||||
*/
|
||||
@Test
|
||||
public void testConnectOnlyRsaSha1() throws Exception {
|
||||
try (SshServer oldServer = createServer(TEST_USER, publicKey1)) {
|
||||
oldServer.setSignatureFactoriesNames("ssh-rsa");
|
||||
List<DHFactory> sha1Factories = BuiltinDHFactories
|
||||
.parseDHFactoriesList(
|
||||
"diffie-hellman-group1-sha1,diffie-hellman-group14-sha1")
|
||||
.getParsedFactories();
|
||||
assertEquals(2, sha1Factories.size());
|
||||
List<KeyExchangeFactory> kexFactories = NamedFactory
|
||||
.setUpTransformedFactories(true, sha1Factories,
|
||||
ServerBuilder.DH2KEX);
|
||||
oldServer.setKeyExchangeFactories(kexFactories);
|
||||
oldServer.start();
|
||||
registerServer(oldServer);
|
||||
installConfig("Host server", //
|
||||
"HostName localhost", //
|
||||
"Port " + oldServer.getPort(), //
|
||||
"User " + TEST_USER, //
|
||||
"IdentityFile " + privateKey1.getAbsolutePath(), //
|
||||
"KexAlgorithms +diffie-hellman-group1-sha1");
|
||||
RemoteSession session = getSessionFactory().getSession(
|
||||
new URIish("ssh://server/doesntmatter"), null, FS.DETECTED,
|
||||
10000);
|
||||
assertNotNull(session);
|
||||
session.disconnect();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,53 +33,53 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.0.0";x-inter
|
|||
org.apache.sshd.client.session,
|
||||
org.apache.sshd.client.keyverifier"
|
||||
Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
|
||||
org.apache.sshd.agent;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.auth;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.auth.keyboard;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.auth.password;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.auth.pubkey;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.channel;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.config.keys;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.future;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.keyverifier;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.session;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.client.session.forward;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.auth;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.channel;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.compression;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.config.keys.loader;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.digest;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.forward;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.future;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.io;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.kex;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.kex.extension;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.kex.extension.parser;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.mac;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.random;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.session.helpers;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.closeable;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.io;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.io.resource;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.core;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.server.auth;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
|
||||
org.apache.sshd.agent;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.channel;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.future;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.channel;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.compression;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.digest;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.forward;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.future;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex.extension;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex.extension.parser;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.mac;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.random;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)",
|
||||
org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.fnmatch;version="[6.0.0,6.1.0)",
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ configInvalidProxyJump=Ssh config, host ''{0}'': Cannot parse ProxyJump ''{1}''
|
|||
configNoKnownAlgorithms=Ssh config ''{0}'' ''{1}'' resulted in empty list (none known, or all known removed); using default.
|
||||
configProxyJumpNotSsh=Non-ssh URI in ProxyJump ssh config
|
||||
configProxyJumpWithPath=ProxyJump ssh config: jump host specification must not have a path
|
||||
configUnknownAlgorithm=Ssh config {0}: ignoring unknown algorithm ''{1}'' in {2} {3}
|
||||
ftpCloseFailed=Closing the SFTP channel failed
|
||||
gssapiFailure=GSS-API error for mechanism OID {0}
|
||||
gssapiInitFailure=GSS-API initialization failure for mechanism {0}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2018, 2019 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
* Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
import java.io.StreamCorruptedException;
|
||||
import java.net.SocketAddress;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.GeneralSecurityException;
|
||||
import java.security.PublicKey;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
|
@ -29,17 +28,27 @@
|
|||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.sshd.client.ClientBuilder;
|
||||
import org.apache.sshd.client.ClientFactoryManager;
|
||||
import org.apache.sshd.client.config.hosts.HostConfigEntry;
|
||||
import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
|
||||
import org.apache.sshd.client.session.ClientSessionImpl;
|
||||
import org.apache.sshd.common.AttributeRepository;
|
||||
import org.apache.sshd.common.FactoryManager;
|
||||
import org.apache.sshd.common.NamedResource;
|
||||
import org.apache.sshd.common.PropertyResolver;
|
||||
import org.apache.sshd.common.config.keys.KeyUtils;
|
||||
import org.apache.sshd.common.io.IoSession;
|
||||
import org.apache.sshd.common.io.IoWriteFuture;
|
||||
import org.apache.sshd.common.kex.BuiltinDHFactories;
|
||||
import org.apache.sshd.common.kex.DHFactory;
|
||||
import org.apache.sshd.common.kex.KexProposalOption;
|
||||
import org.apache.sshd.common.kex.KeyExchangeFactory;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensionHandler;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensionHandler.AvailabilityPhase;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensions;
|
||||
import org.apache.sshd.common.keyprovider.KeyPairProvider;
|
||||
import org.apache.sshd.common.signature.BuiltinSignatures;
|
||||
import org.apache.sshd.common.util.Readable;
|
||||
import org.apache.sshd.common.util.buffer.Buffer;
|
||||
import org.eclipse.jgit.errors.InvalidPatternException;
|
||||
|
|
@ -70,6 +79,8 @@ public class JGitClientSession extends ClientSessionImpl {
|
|||
*/
|
||||
private static final int DEFAULT_MAX_IDENTIFICATION_SIZE = 64 * 1024;
|
||||
|
||||
private static final AttributeKey<Boolean> INITIAL_KEX_DONE = new AttributeKey<>();
|
||||
|
||||
private HostConfigEntry hostConfig;
|
||||
|
||||
private CredentialsProvider credentialsProvider;
|
||||
|
|
@ -136,51 +147,38 @@ public void setProxyHandler(StatefulProxyConnector handler) {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected IoWriteFuture sendIdentification(String ident)
|
||||
throws IOException {
|
||||
protected IoWriteFuture sendIdentification(String ident,
|
||||
List<String> extraLines) throws Exception {
|
||||
StatefulProxyConnector proxy = proxyHandler;
|
||||
if (proxy != null) {
|
||||
try {
|
||||
// We must not block here; the framework starts reading messages
|
||||
// from the peer only once the initial sendKexInit() following
|
||||
// this call to sendIdentification() has returned!
|
||||
proxy.runWhenDone(() -> {
|
||||
JGitClientSession.super.sendIdentification(ident);
|
||||
return null;
|
||||
});
|
||||
// Called only from the ClientSessionImpl constructor, where the
|
||||
// return value is ignored.
|
||||
// We must not block here; the framework starts reading messages
|
||||
// from the peer only once the initial sendKexInit() following
|
||||
// this call to sendIdentification() has returned!
|
||||
proxy.runWhenDone(() -> {
|
||||
JGitClientSession.super.sendIdentification(ident, extraLines);
|
||||
return null;
|
||||
} catch (IOException e) {
|
||||
throw e;
|
||||
} catch (Exception other) {
|
||||
throw new IOException(other.getLocalizedMessage(), other);
|
||||
}
|
||||
});
|
||||
// Called only from the ClientSessionImpl constructor, where the
|
||||
// return value is ignored.
|
||||
return null;
|
||||
}
|
||||
return super.sendIdentification(ident);
|
||||
return super.sendIdentification(ident, extraLines);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected byte[] sendKexInit()
|
||||
throws IOException, GeneralSecurityException {
|
||||
protected byte[] sendKexInit() throws Exception {
|
||||
StatefulProxyConnector proxy = proxyHandler;
|
||||
if (proxy != null) {
|
||||
try {
|
||||
// We must not block here; the framework starts reading messages
|
||||
// from the peer only once the initial sendKexInit() has
|
||||
// returned!
|
||||
proxy.runWhenDone(() -> {
|
||||
JGitClientSession.super.sendKexInit();
|
||||
return null;
|
||||
});
|
||||
// This is called only from the ClientSessionImpl
|
||||
// constructor, where the return value is ignored.
|
||||
// We must not block here; the framework starts reading messages
|
||||
// from the peer only once the initial sendKexInit() has
|
||||
// returned!
|
||||
proxy.runWhenDone(() -> {
|
||||
JGitClientSession.super.sendKexInit();
|
||||
return null;
|
||||
} catch (IOException | GeneralSecurityException e) {
|
||||
throw e;
|
||||
} catch (Exception other) {
|
||||
throw new IOException(other.getLocalizedMessage(), other);
|
||||
}
|
||||
});
|
||||
// This is called only from the ClientSessionImpl
|
||||
// constructor, where the return value is ignored.
|
||||
return null;
|
||||
}
|
||||
return super.sendKexInit();
|
||||
}
|
||||
|
|
@ -219,6 +217,32 @@ protected Map<KexProposalOption, String> setNegotiationResult(
|
|||
return result;
|
||||
}
|
||||
|
||||
Set<String> getAllAvailableSignatureAlgorithms() {
|
||||
Set<String> allAvailable = new HashSet<>();
|
||||
BuiltinSignatures.VALUES.forEach(s -> allAvailable.add(s.getName()));
|
||||
BuiltinSignatures.getRegisteredExtensions()
|
||||
.forEach(s -> allAvailable.add(s.getName()));
|
||||
return allAvailable;
|
||||
}
|
||||
|
||||
private void setNewFactories(Collection<String> defaultFactories,
|
||||
Collection<String> finalFactories) {
|
||||
// If new factory names were added make sure we actually have factories
|
||||
// for them all.
|
||||
//
|
||||
// But add new ones at the end: we don't want to change the order for
|
||||
// pubkey auth, and any new ones added here were not included in the
|
||||
// default set for some reason, such as being deprecated or weak.
|
||||
//
|
||||
// The order for KEX is determined by the order in the proposal string,
|
||||
// but the order in pubkey auth is determined by the order in the
|
||||
// factory list (possibly overridden via ssh config
|
||||
// PubkeyAcceptedAlgorithms; see JGitPublicKeyAuthentication).
|
||||
Set<String> resultSet = new LinkedHashSet<>(defaultFactories);
|
||||
resultSet.addAll(finalFactories);
|
||||
setSignatureFactoriesNames(resultSet);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String resolveAvailableSignaturesProposal(
|
||||
FactoryManager manager) {
|
||||
|
|
@ -229,16 +253,17 @@ protected String resolveAvailableSignaturesProposal(
|
|||
.getProperty(SshConstants.HOST_KEY_ALGORITHMS);
|
||||
if (!StringUtils.isEmptyOrNull(algorithms)) {
|
||||
List<String> result = modifyAlgorithmList(defaultSignatures,
|
||||
algorithms, SshConstants.HOST_KEY_ALGORITHMS);
|
||||
getAllAvailableSignatureAlgorithms(), algorithms,
|
||||
SshConstants.HOST_KEY_ALGORITHMS);
|
||||
if (!result.isEmpty()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(SshConstants.HOST_KEY_ALGORITHMS + ' ' + result);
|
||||
}
|
||||
setNewFactories(defaultSignatures, result);
|
||||
return String.join(",", result); //$NON-NLS-1$
|
||||
}
|
||||
log.warn(format(SshdText.get().configNoKnownAlgorithms,
|
||||
SshConstants.HOST_KEY_ALGORITHMS,
|
||||
algorithms));
|
||||
SshConstants.HOST_KEY_ALGORITHMS, algorithms));
|
||||
}
|
||||
// No HostKeyAlgorithms; using default -- change order to put existing
|
||||
// keys first.
|
||||
|
|
@ -253,6 +278,11 @@ protected String resolveAvailableSignaturesProposal(
|
|||
if (key != null) {
|
||||
String keyType = KeyUtils.getKeyType(key);
|
||||
if (keyType != null) {
|
||||
if (KeyPairProvider.SSH_RSA.equals(keyType)) {
|
||||
// Add all available signatures for ssh-rsa.
|
||||
reordered.add(KeyUtils.RSA_SHA512_KEY_TYPE_ALIAS);
|
||||
reordered.add(KeyUtils.RSA_SHA256_KEY_TYPE_ALIAS);
|
||||
}
|
||||
reordered.add(keyType);
|
||||
}
|
||||
}
|
||||
|
|
@ -261,6 +291,10 @@ protected String resolveAvailableSignaturesProposal(
|
|||
if (log.isDebugEnabled()) {
|
||||
log.debug(SshConstants.HOST_KEY_ALGORITHMS + ' ' + reordered);
|
||||
}
|
||||
// Make sure we actually have factories for them all.
|
||||
if (reordered.size() > defaultSignatures.size()) {
|
||||
setNewFactories(defaultSignatures, reordered);
|
||||
}
|
||||
return String.join(",", reordered); //$NON-NLS-1$
|
||||
}
|
||||
if (log.isDebugEnabled()) {
|
||||
|
|
@ -270,15 +304,87 @@ protected String resolveAvailableSignaturesProposal(
|
|||
return String.join(",", defaultSignatures); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
private List<String> determineKexProposal() {
|
||||
List<KeyExchangeFactory> kexFactories = getKeyExchangeFactories();
|
||||
List<String> defaultKexMethods = NamedResource
|
||||
.getNameList(kexFactories);
|
||||
HostConfigEntry config = resolveAttribute(
|
||||
JGitSshClient.HOST_CONFIG_ENTRY);
|
||||
String algorithms = config.getProperty(SshConstants.KEX_ALGORITHMS);
|
||||
if (!StringUtils.isEmptyOrNull(algorithms)) {
|
||||
Set<String> allAvailable = new HashSet<>();
|
||||
BuiltinDHFactories.VALUES
|
||||
.forEach(s -> allAvailable.add(s.getName()));
|
||||
BuiltinDHFactories.getRegisteredExtensions()
|
||||
.forEach(s -> allAvailable.add(s.getName()));
|
||||
List<String> result = modifyAlgorithmList(defaultKexMethods,
|
||||
allAvailable, algorithms, SshConstants.KEX_ALGORITHMS);
|
||||
if (!result.isEmpty()) {
|
||||
// If new ones were added, update the installed factories
|
||||
Set<String> configuredKexMethods = new HashSet<>(
|
||||
defaultKexMethods);
|
||||
List<KeyExchangeFactory> newKexFactories = new ArrayList<>();
|
||||
result.forEach(name -> {
|
||||
if (!configuredKexMethods.contains(name)) {
|
||||
DHFactory factory = BuiltinDHFactories
|
||||
.resolveFactory(name);
|
||||
if (factory == null) {
|
||||
// Should not occur here
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"determineKexProposal({}) unknown KEX algorithm {} ignored", //$NON-NLS-1$
|
||||
this, name);
|
||||
}
|
||||
} else {
|
||||
newKexFactories
|
||||
.add(ClientBuilder.DH2KEX.apply(factory));
|
||||
}
|
||||
}
|
||||
});
|
||||
if (!newKexFactories.isEmpty()) {
|
||||
newKexFactories.addAll(kexFactories);
|
||||
setKeyExchangeFactories(newKexFactories);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
log.warn(format(SshdText.get().configNoKnownAlgorithms,
|
||||
SshConstants.KEX_ALGORITHMS, algorithms));
|
||||
}
|
||||
return defaultKexMethods;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String resolveSessionKexProposal(String hostKeyTypes)
|
||||
throws IOException {
|
||||
String kexMethods = String.join(",", determineKexProposal()); //$NON-NLS-1$
|
||||
Boolean isRekey = getAttribute(INITIAL_KEX_DONE);
|
||||
if (isRekey == null || !isRekey.booleanValue()) {
|
||||
// First time
|
||||
KexExtensionHandler extHandler = getKexExtensionHandler();
|
||||
if (extHandler != null && extHandler.isKexExtensionsAvailable(this,
|
||||
AvailabilityPhase.PROPOSAL)) {
|
||||
if (kexMethods.isEmpty()) {
|
||||
kexMethods = KexExtensions.CLIENT_KEX_EXTENSION;
|
||||
} else {
|
||||
kexMethods += ',' + KexExtensions.CLIENT_KEX_EXTENSION;
|
||||
}
|
||||
}
|
||||
setAttribute(INITIAL_KEX_DONE, Boolean.TRUE);
|
||||
}
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(SshConstants.KEX_ALGORITHMS + ' ' + kexMethods);
|
||||
}
|
||||
return kexMethods;
|
||||
}
|
||||
|
||||
/**
|
||||
* Modifies a given algorithm list according to a list from the ssh config,
|
||||
* including remove ('-') and reordering ('^') operators. Addition ('+') is
|
||||
* not handled since we have no way of adding dynamically implementations,
|
||||
* and the defaultList is supposed to contain all known implementations
|
||||
* already.
|
||||
* including add ('+'), remove ('-') and reordering ('^') operators.
|
||||
*
|
||||
* @param defaultList
|
||||
* to modify
|
||||
* @param allAvailable
|
||||
* all available values
|
||||
* @param fromConfig
|
||||
* telling how to modify the {@code defaultList}, must not be
|
||||
* {@code null} or empty
|
||||
|
|
@ -288,22 +394,22 @@ protected String resolveAvailableSignaturesProposal(
|
|||
* set
|
||||
*/
|
||||
public List<String> modifyAlgorithmList(List<String> defaultList,
|
||||
String fromConfig, String overrideKey) {
|
||||
Set<String> allAvailable, String fromConfig, String overrideKey) {
|
||||
Set<String> defaults = new LinkedHashSet<>();
|
||||
defaults.addAll(defaultList);
|
||||
switch (fromConfig.charAt(0)) {
|
||||
case '+':
|
||||
// Additions make not much sense -- it's either in
|
||||
// defaultList already, or we have no implementation for
|
||||
// it. No point in proposing it.
|
||||
return defaultList;
|
||||
List<String> newSignatures = filteredList(allAvailable, overrideKey,
|
||||
fromConfig.substring(1));
|
||||
defaults.addAll(newSignatures);
|
||||
return new ArrayList<>(defaults);
|
||||
case '-':
|
||||
// This takes wildcard patterns!
|
||||
removeFromList(defaults, overrideKey, fromConfig.substring(1));
|
||||
return new ArrayList<>(defaults);
|
||||
case '^':
|
||||
// Specified entries go to the front of the default list
|
||||
List<String> allSignatures = filteredList(defaults,
|
||||
List<String> allSignatures = filteredList(allAvailable, overrideKey,
|
||||
fromConfig.substring(1));
|
||||
Set<String> atFront = new HashSet<>(allSignatures);
|
||||
for (String sig : defaults) {
|
||||
|
|
@ -315,7 +421,7 @@ public List<String> modifyAlgorithmList(List<String> defaultList,
|
|||
default:
|
||||
// Default is overridden -- only accept the ones for which we do
|
||||
// have an implementation.
|
||||
return filteredList(defaults, fromConfig);
|
||||
return filteredList(allAvailable, overrideKey, fromConfig);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -342,11 +448,15 @@ private void removeFromList(Set<String> current, String key,
|
|||
}
|
||||
}
|
||||
|
||||
private List<String> filteredList(Set<String> known, String values) {
|
||||
private List<String> filteredList(Set<String> known, String key,
|
||||
String values) {
|
||||
List<String> newNames = new ArrayList<>();
|
||||
for (String newValue : values.split("\\s*,\\s*")) { //$NON-NLS-1$
|
||||
if (known.contains(newValue)) {
|
||||
newNames.add(newValue);
|
||||
} else {
|
||||
log.warn(format(SshdText.get().configUnknownAlgorithm, this,
|
||||
newValue, key, values));
|
||||
}
|
||||
}
|
||||
return newNames;
|
||||
|
|
|
|||
|
|
@ -1,163 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
* https://www.eclipse.org/org/documents/edl-v10.php.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
package org.eclipse.jgit.internal.transport.sshd;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import org.apache.sshd.common.AttributeRepository.AttributeKey;
|
||||
import org.apache.sshd.common.NamedFactory;
|
||||
import org.apache.sshd.common.kex.KexProposalOption;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensionHandler;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensions;
|
||||
import org.apache.sshd.common.kex.extension.parser.ServerSignatureAlgorithms;
|
||||
import org.apache.sshd.common.session.Session;
|
||||
import org.apache.sshd.common.signature.Signature;
|
||||
import org.apache.sshd.common.util.logging.AbstractLoggingBean;
|
||||
import org.eclipse.jgit.util.StringUtils;
|
||||
|
||||
/**
|
||||
* Do not use the DefaultClientKexExtensionHandler from sshd; it doesn't work
|
||||
* properly because of misconceptions. See SSHD-1141.
|
||||
*
|
||||
* @see <a href="https://issues.apache.org/jira/browse/SSHD-1141">SSHD-1141</a>
|
||||
*/
|
||||
public class JGitKexExtensionHandler extends AbstractLoggingBean
|
||||
implements KexExtensionHandler {
|
||||
|
||||
/** Singleton instance. */
|
||||
public static final JGitKexExtensionHandler INSTANCE = new JGitKexExtensionHandler();
|
||||
|
||||
/**
|
||||
* Session {@link AttributeKey} used to store whether the extension
|
||||
* indicator was already sent.
|
||||
*/
|
||||
private static final AttributeKey<Boolean> CLIENT_PROPOSAL_MADE = new AttributeKey<>();
|
||||
|
||||
/**
|
||||
* Session {@link AttributeKey} storing the algorithms announced by the
|
||||
* server as known.
|
||||
*/
|
||||
public static final AttributeKey<Set<String>> SERVER_ALGORITHMS = new AttributeKey<>();
|
||||
|
||||
private JGitKexExtensionHandler() {
|
||||
// No public instantiation for singleton
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isKexExtensionsAvailable(Session session,
|
||||
AvailabilityPhase phase) throws IOException {
|
||||
return !AvailabilityPhase.PREKEX.equals(phase);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleKexInitProposal(Session session, boolean initiator,
|
||||
Map<KexProposalOption, String> proposal) throws IOException {
|
||||
// If it's the very first time, we may add the marker telling the server
|
||||
// that we are ready to handle SSH_MSG_EXT_INFO
|
||||
if (session == null || session.isServerSession() || !initiator) {
|
||||
return;
|
||||
}
|
||||
if (session.getAttribute(CLIENT_PROPOSAL_MADE) != null) {
|
||||
return;
|
||||
}
|
||||
String kexAlgorithms = proposal.get(KexProposalOption.SERVERKEYS);
|
||||
if (StringUtils.isEmptyOrNull(kexAlgorithms)) {
|
||||
return;
|
||||
}
|
||||
List<String> algorithms = new ArrayList<>();
|
||||
// We're a client. We mustn't send the server extension, and we should
|
||||
// send the client extension only once.
|
||||
for (String algo : kexAlgorithms.split(",")) { //$NON-NLS-1$
|
||||
if (KexExtensions.CLIENT_KEX_EXTENSION.equalsIgnoreCase(algo)
|
||||
|| KexExtensions.SERVER_KEX_EXTENSION
|
||||
.equalsIgnoreCase(algo)) {
|
||||
continue;
|
||||
}
|
||||
algorithms.add(algo);
|
||||
}
|
||||
// Tell the server that we want to receive SSH2_MSG_EXT_INFO
|
||||
algorithms.add(KexExtensions.CLIENT_KEX_EXTENSION);
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"handleKexInitProposal({}): proposing HostKeyAlgorithms {}", //$NON-NLS-1$
|
||||
session, algorithms);
|
||||
}
|
||||
proposal.put(KexProposalOption.SERVERKEYS,
|
||||
String.join(",", algorithms)); //$NON-NLS-1$
|
||||
session.setAttribute(CLIENT_PROPOSAL_MADE, Boolean.TRUE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleKexExtensionRequest(Session session, int index,
|
||||
int count, String name, byte[] data) throws IOException {
|
||||
if (ServerSignatureAlgorithms.NAME.equals(name)) {
|
||||
handleServerSignatureAlgorithms(session,
|
||||
ServerSignatureAlgorithms.INSTANCE.parseExtension(data));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform updates after a server-sig-algs extension has been received.
|
||||
*
|
||||
* @param session
|
||||
* the message was received for
|
||||
* @param serverAlgorithms
|
||||
* signature algorithm names announced by the server
|
||||
*/
|
||||
protected void handleServerSignatureAlgorithms(Session session,
|
||||
Collection<String> serverAlgorithms) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("handleServerSignatureAlgorithms({}): {}", session, //$NON-NLS-1$
|
||||
serverAlgorithms);
|
||||
}
|
||||
// Client determines order; server says what it supports. Re-order
|
||||
// such that supported ones are at the front, in client order,
|
||||
// followed by unsupported ones, also in client order.
|
||||
if (serverAlgorithms != null && !serverAlgorithms.isEmpty()) {
|
||||
List<NamedFactory<Signature>> clientAlgorithms = new ArrayList<>(
|
||||
session.getSignatureFactories());
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"handleServerSignatureAlgorithms({}): PubkeyAcceptedAlgorithms before: {}", //$NON-NLS-1$
|
||||
session, clientAlgorithms);
|
||||
}
|
||||
List<NamedFactory<Signature>> unknown = new ArrayList<>();
|
||||
Set<String> known = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
|
||||
known.addAll(serverAlgorithms);
|
||||
for (Iterator<NamedFactory<Signature>> iter = clientAlgorithms
|
||||
.iterator(); iter.hasNext();) {
|
||||
NamedFactory<Signature> algo = iter.next();
|
||||
if (!known.contains(algo.getName())) {
|
||||
unknown.add(algo);
|
||||
iter.remove();
|
||||
}
|
||||
}
|
||||
// Re-add the unknown ones at the end. Per RFC 8308, some
|
||||
// servers may not announce _all_ their supported algorithms,
|
||||
// and a client may use unknown algorithms.
|
||||
clientAlgorithms.addAll(unknown);
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"handleServerSignatureAlgorithms({}): PubkeyAcceptedAlgorithms after: {}", //$NON-NLS-1$
|
||||
session, clientAlgorithms);
|
||||
}
|
||||
session.setAttribute(SERVER_ALGORITHMS, known);
|
||||
session.setSignatureFactories(clientAlgorithms);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9,216 +9,56 @@
|
|||
*/
|
||||
package org.eclipse.jgit.internal.transport.sshd;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.PublicKey;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Deque;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
import static java.text.MessageFormat.format;
|
||||
import static org.eclipse.jgit.transport.SshConstants.PUBKEY_ACCEPTED_ALGORITHMS;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.sshd.client.auth.pubkey.UserAuthPublicKey;
|
||||
import org.apache.sshd.client.config.hosts.HostConfigEntry;
|
||||
import org.apache.sshd.client.session.ClientSession;
|
||||
import org.apache.sshd.common.NamedFactory;
|
||||
import org.apache.sshd.common.NamedResource;
|
||||
import org.apache.sshd.common.RuntimeSshException;
|
||||
import org.apache.sshd.common.SshConstants;
|
||||
import org.apache.sshd.common.config.keys.KeyUtils;
|
||||
import org.apache.sshd.common.signature.Signature;
|
||||
import org.apache.sshd.common.signature.SignatureFactoriesHolder;
|
||||
import org.apache.sshd.common.util.buffer.Buffer;
|
||||
import org.eclipse.jgit.util.StringUtils;
|
||||
|
||||
/**
|
||||
* Custom {@link UserAuthPublicKey} implementation fixing SSHD-1105: if there
|
||||
* are several signature algorithms applicable for a public key type, we must
|
||||
* try them all, in the correct order.
|
||||
*
|
||||
* @see <a href="https://issues.apache.org/jira/browse/SSHD-1105">SSHD-1105</a>
|
||||
* @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=572056">Bug
|
||||
* 572056</a>
|
||||
* Custom {@link UserAuthPublicKey} implementation for handling SSH config
|
||||
* PubkeyAcceptedAlgorithms.
|
||||
*/
|
||||
public class JGitPublicKeyAuthentication extends UserAuthPublicKey {
|
||||
|
||||
private final Deque<String> currentAlgorithms = new LinkedList<>();
|
||||
|
||||
private String chosenAlgorithm;
|
||||
|
||||
JGitPublicKeyAuthentication(List<NamedFactory<Signature>> factories) {
|
||||
super(factories);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean sendAuthDataRequest(ClientSession session, String service)
|
||||
public void init(ClientSession rawSession, String service)
|
||||
throws Exception {
|
||||
if (current == null) {
|
||||
currentAlgorithms.clear();
|
||||
chosenAlgorithm = null;
|
||||
if (!(rawSession instanceof JGitClientSession)) {
|
||||
throw new IllegalStateException("Wrong session type: " //$NON-NLS-1$
|
||||
+ rawSession.getClass().getCanonicalName());
|
||||
}
|
||||
String currentAlgorithm = null;
|
||||
if (current != null && !currentAlgorithms.isEmpty()) {
|
||||
currentAlgorithm = currentAlgorithms.poll();
|
||||
if (chosenAlgorithm != null) {
|
||||
Set<String> knownServerAlgorithms = session.getAttribute(
|
||||
JGitKexExtensionHandler.SERVER_ALGORITHMS);
|
||||
if (knownServerAlgorithms != null
|
||||
&& knownServerAlgorithms.contains(chosenAlgorithm)) {
|
||||
// We've tried key 'current' with 'chosenAlgorithm', but it
|
||||
// failed. However, the server had told us it supported
|
||||
// 'chosenAlgorithm'. Thus it makes no sense to continue
|
||||
// with this key and other signature algorithms. Skip to the
|
||||
// next key, if any.
|
||||
currentAlgorithm = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (currentAlgorithm == null) {
|
||||
try {
|
||||
if (keys == null || !keys.hasNext()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"sendAuthDataRequest({})[{}] no more keys to send", //$NON-NLS-1$
|
||||
session, service);
|
||||
}
|
||||
current = null;
|
||||
return false;
|
||||
}
|
||||
current = keys.next();
|
||||
currentAlgorithms.clear();
|
||||
chosenAlgorithm = null;
|
||||
} catch (Error e) { // Copied from superclass
|
||||
throw new RuntimeSshException(e);
|
||||
}
|
||||
}
|
||||
PublicKey key;
|
||||
try {
|
||||
key = current.getPublicKey();
|
||||
} catch (Error e) { // Copied from superclass
|
||||
throw new RuntimeSshException(e);
|
||||
}
|
||||
if (currentAlgorithm == null) {
|
||||
String keyType = KeyUtils.getKeyType(key);
|
||||
Set<String> aliases = new HashSet<>(
|
||||
KeyUtils.getAllEquivalentKeyTypes(keyType));
|
||||
aliases.add(keyType);
|
||||
List<NamedFactory<Signature>> existingFactories;
|
||||
if (current instanceof SignatureFactoriesHolder) {
|
||||
existingFactories = ((SignatureFactoriesHolder) current)
|
||||
.getSignatureFactories();
|
||||
} else {
|
||||
existingFactories = getSignatureFactories();
|
||||
}
|
||||
if (existingFactories != null) {
|
||||
JGitClientSession session = ((JGitClientSession) rawSession);
|
||||
HostConfigEntry hostConfig = session.getHostConfigEntry();
|
||||
// Set signature algorithms for public key authentication
|
||||
String pubkeyAlgos = hostConfig.getProperty(PUBKEY_ACCEPTED_ALGORITHMS);
|
||||
if (!StringUtils.isEmptyOrNull(pubkeyAlgos)) {
|
||||
List<String> signatures = session.getSignatureFactoriesNames();
|
||||
signatures = session.modifyAlgorithmList(signatures,
|
||||
session.getAllAvailableSignatureAlgorithms(), pubkeyAlgos,
|
||||
PUBKEY_ACCEPTED_ALGORITHMS);
|
||||
if (!signatures.isEmpty()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"sendAuthDataRequest({})[{}] selecting from PubKeyAcceptedAlgorithms {}", //$NON-NLS-1$
|
||||
session, service,
|
||||
NamedResource.getNames(existingFactories));
|
||||
log.debug(PUBKEY_ACCEPTED_ALGORITHMS + ' ' + signatures);
|
||||
}
|
||||
// Select the factories by name and in order
|
||||
existingFactories.forEach(f -> {
|
||||
if (aliases.contains(f.getName())) {
|
||||
currentAlgorithms.add(f.getName());
|
||||
}
|
||||
});
|
||||
setSignatureFactoriesNames(signatures);
|
||||
} else {
|
||||
log.warn(format(SshdText.get().configNoKnownAlgorithms,
|
||||
PUBKEY_ACCEPTED_ALGORITHMS, pubkeyAlgos));
|
||||
}
|
||||
currentAlgorithm = currentAlgorithms.isEmpty() ? keyType
|
||||
: currentAlgorithms.poll();
|
||||
}
|
||||
String name = getName();
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"sendAuthDataRequest({})[{}] send SSH_MSG_USERAUTH_REQUEST request {} type={} - fingerprint={}", //$NON-NLS-1$
|
||||
session, service, name, currentAlgorithm,
|
||||
KeyUtils.getFingerPrint(key));
|
||||
}
|
||||
|
||||
chosenAlgorithm = currentAlgorithm;
|
||||
Buffer buffer = session
|
||||
.createBuffer(SshConstants.SSH_MSG_USERAUTH_REQUEST);
|
||||
buffer.putString(session.getUsername());
|
||||
buffer.putString(service);
|
||||
buffer.putString(name);
|
||||
buffer.putBoolean(false);
|
||||
buffer.putString(currentAlgorithm);
|
||||
buffer.putPublicKey(key);
|
||||
session.writePacket(buffer);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean processAuthDataRequest(ClientSession session,
|
||||
String service, Buffer buffer) throws Exception {
|
||||
String name = getName();
|
||||
int cmd = buffer.getUByte();
|
||||
if (cmd != SshConstants.SSH_MSG_USERAUTH_PK_OK) {
|
||||
throw new IllegalStateException(MessageFormat.format(
|
||||
SshdText.get().pubkeyAuthWrongCommand,
|
||||
SshConstants.getCommandMessageName(cmd),
|
||||
session.getConnectAddress(), session.getServerVersion()));
|
||||
}
|
||||
PublicKey key;
|
||||
try {
|
||||
key = current.getPublicKey();
|
||||
} catch (Error e) { // Copied from superclass
|
||||
throw new RuntimeSshException(e);
|
||||
}
|
||||
String rspKeyAlgorithm = buffer.getString();
|
||||
PublicKey rspKey = buffer.getPublicKey();
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"processAuthDataRequest({})[{}][{}] SSH_MSG_USERAUTH_PK_OK type={}, fingerprint={}", //$NON-NLS-1$
|
||||
session, service, name, rspKeyAlgorithm,
|
||||
KeyUtils.getFingerPrint(rspKey));
|
||||
}
|
||||
if (!KeyUtils.compareKeys(rspKey, key)) {
|
||||
throw new InvalidKeySpecException(MessageFormat.format(
|
||||
SshdText.get().pubkeyAuthWrongKey,
|
||||
KeyUtils.getFingerPrint(key),
|
||||
KeyUtils.getFingerPrint(rspKey),
|
||||
session.getConnectAddress(), session.getServerVersion()));
|
||||
}
|
||||
if (!chosenAlgorithm.equalsIgnoreCase(rspKeyAlgorithm)) {
|
||||
// 'algo' SHOULD be the same as 'chosenAlgorithm', which is the one
|
||||
// we sent above. See https://tools.ietf.org/html/rfc4252#page-9 .
|
||||
//
|
||||
// However, at least Github (SSH-2.0-babeld-383743ad) servers seem
|
||||
// to return the key type, not the algorithm name.
|
||||
//
|
||||
// So we don't check but just log the inconsistency. We sign using
|
||||
// 'chosenAlgorithm' in any case, so we don't really care what the
|
||||
// server says here.
|
||||
log.warn(MessageFormat.format(
|
||||
SshdText.get().pubkeyAuthWrongSignatureAlgorithm,
|
||||
chosenAlgorithm, rspKeyAlgorithm, session.getConnectAddress(),
|
||||
session.getServerVersion()));
|
||||
}
|
||||
String username = session.getUsername();
|
||||
Buffer out = session
|
||||
.createBuffer(SshConstants.SSH_MSG_USERAUTH_REQUEST);
|
||||
out.putString(username);
|
||||
out.putString(service);
|
||||
out.putString(name);
|
||||
out.putBoolean(true);
|
||||
out.putString(chosenAlgorithm);
|
||||
out.putPublicKey(key);
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(
|
||||
"processAuthDataRequest({})[{}][{}]: signing with algorithm {}", //$NON-NLS-1$
|
||||
session, service, name, chosenAlgorithm);
|
||||
}
|
||||
appendSignature(session, service, name, username, chosenAlgorithm, key,
|
||||
out);
|
||||
session.writePacket(out);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void releaseKeys() throws IOException {
|
||||
currentAlgorithms.clear();
|
||||
current = null;
|
||||
chosenAlgorithm = null;
|
||||
super.releaseKeys();
|
||||
// If we don't set signature factories here, the default ones from the
|
||||
// session will be used.
|
||||
super.init(session, service);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2018, 2020 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
* Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
|
|
@ -267,24 +267,6 @@ private JGitClientSession createSession(IoSession ioSession,
|
|||
session.setUsername(username);
|
||||
session.setConnectAddress(address);
|
||||
session.setHostConfigEntry(hostConfig);
|
||||
// Set signature algorithms for public key authentication
|
||||
String pubkeyAlgos = hostConfig
|
||||
.getProperty(SshConstants.PUBKEY_ACCEPTED_ALGORITHMS);
|
||||
if (!StringUtils.isEmptyOrNull(pubkeyAlgos)) {
|
||||
List<String> signatures = getSignatureFactoriesNames();
|
||||
signatures = session.modifyAlgorithmList(signatures, pubkeyAlgos,
|
||||
SshConstants.PUBKEY_ACCEPTED_ALGORITHMS);
|
||||
if (!signatures.isEmpty()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug(SshConstants.PUBKEY_ACCEPTED_ALGORITHMS + ' '
|
||||
+ signatures);
|
||||
}
|
||||
session.setSignatureFactoriesNames(signatures);
|
||||
} else {
|
||||
log.warn(format(SshdText.get().configNoKnownAlgorithms,
|
||||
SshConstants.PUBKEY_ACCEPTED_ALGORITHMS, pubkeyAlgos));
|
||||
}
|
||||
}
|
||||
if (session.getCredentialsProvider() == null) {
|
||||
session.setCredentialsProvider(getCredentialsProvider());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2018, 2019 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
* Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
|
|
@ -182,10 +182,13 @@ public List<PublicKey> lookup(@NonNull String connectAddress,
|
|||
for (HostKeyFile file : filesToUse) {
|
||||
for (HostEntryPair current : file.get()) {
|
||||
KnownHostEntry entry = current.getHostEntry();
|
||||
for (SshdSocketAddress host : candidates) {
|
||||
if (entry.isHostMatch(host.getHostName(), host.getPort())) {
|
||||
result.add(current.getServerKey());
|
||||
break;
|
||||
if (!isRevoked(entry)) {
|
||||
for (SshdSocketAddress host : candidates) {
|
||||
if (entry.isHostMatch(host.getHostName(),
|
||||
host.getPort())) {
|
||||
result.add(current.getServerKey());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -266,6 +269,10 @@ private static class RevokedKeyException extends Exception {
|
|||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
|
||||
private boolean isRevoked(KnownHostEntry entry) {
|
||||
return MARKER_REVOKED.equals(entry.getMarker());
|
||||
}
|
||||
|
||||
private boolean find(Collection<SshdSocketAddress> candidates,
|
||||
PublicKey serverKey, List<HostEntryPair> entries,
|
||||
HostEntryPair[] modified) throws RevokedKeyException {
|
||||
|
|
@ -273,22 +280,22 @@ private boolean find(Collection<SshdSocketAddress> candidates,
|
|||
KnownHostEntry entry = current.getHostEntry();
|
||||
for (SshdSocketAddress host : candidates) {
|
||||
if (entry.isHostMatch(host.getHostName(), host.getPort())) {
|
||||
boolean isRevoked = MARKER_REVOKED
|
||||
.equals(entry.getMarker());
|
||||
boolean revoked = isRevoked(entry);
|
||||
if (KeyUtils.compareKeys(serverKey,
|
||||
current.getServerKey())) {
|
||||
// Exact match
|
||||
if (isRevoked) {
|
||||
if (revoked) {
|
||||
throw new RevokedKeyException();
|
||||
}
|
||||
modified[0] = null;
|
||||
return true;
|
||||
} else if (!isRevoked) {
|
||||
} else if (!revoked) {
|
||||
// Server sent a different key
|
||||
modified[0] = current;
|
||||
// Keep going -- maybe there's another entry for this
|
||||
// host
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ public static SshdText get() {
|
|||
/***/ public String configNoKnownAlgorithms;
|
||||
/***/ public String configProxyJumpNotSsh;
|
||||
/***/ public String configProxyJumpWithPath;
|
||||
/***/ public String configUnknownAlgorithm;
|
||||
/***/ public String ftpCloseFailed;
|
||||
/***/ public String gssapiFailure;
|
||||
/***/ public String gssapiInitFailure;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
public interface ServerKeyDatabase {
|
||||
|
||||
/**
|
||||
* Retrieves all known host keys for the given addresses.
|
||||
* Retrieves all known and not revoked host keys for the given addresses.
|
||||
*
|
||||
* @param connectAddress
|
||||
* IP address the session tried to connect to
|
||||
|
|
@ -39,7 +39,7 @@ public interface ServerKeyDatabase {
|
|||
* @param config
|
||||
* giving access to potentially interesting configuration
|
||||
* settings
|
||||
* @return the list of known keys for the given addresses
|
||||
* @return the list of known and not revoked keys for the given addresses
|
||||
*/
|
||||
@NonNull
|
||||
List<PublicKey> lookup(@NonNull String connectAddress,
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
import org.eclipse.jgit.internal.transport.sshd.AuthenticationCanceledException;
|
||||
import org.eclipse.jgit.internal.transport.sshd.CachingKeyPairProvider;
|
||||
import org.eclipse.jgit.internal.transport.sshd.GssApiWithMicAuthFactory;
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitKexExtensionHandler;
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitPasswordAuthFactory;
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitPublicKeyAuthFactory;
|
||||
import org.eclipse.jgit.internal.transport.sshd.JGitServerKeyVerifier;
|
||||
|
|
@ -217,7 +216,6 @@ public SshdSession getSession(URIish uri,
|
|||
new JGitUserInteraction(credentialsProvider));
|
||||
client.setUserAuthFactories(getUserAuthFactories());
|
||||
client.setKeyIdentityProvider(defaultKeysProvider);
|
||||
client.setKexExtensionHandler(JGitKexExtensionHandler.INSTANCE);
|
||||
// JGit-specific things:
|
||||
JGitSshClient jgitClient = (JGitSshClient) client;
|
||||
jgitClient.setKeyCache(getKeyCache());
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
|
|||
org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.experimental.theories;version="[4.13,5.0.0)",
|
||||
org.junit.runner;version="[4.13,5.0.0)"
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
|
|||
org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
|
||||
org.eclipse.jgit.util.sha1;version="[6.0.0,6.1.0)",
|
||||
org.hamcrest;version="[1.1.0,3.0.0)",
|
||||
org.hamcrest.collection;version="[1.1.0,3.0.0)",
|
||||
org.junit;version="[4.13,5.0.0)",
|
||||
org.junit.experimental.theories;version="[4.13,5.0.0)",
|
||||
org.junit.function;version="[4.13.0,5.0.0)",
|
||||
|
|
@ -82,5 +84,3 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
|
|||
org.objenesis;version="[2.6.0,3.0.0)",
|
||||
org.slf4j;version="[1.7.0,2.0.0)",
|
||||
org.tukaani.xz;version="[1.6.0,2.0)"
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
|
||||
org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest-library</artifactId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<scope>test</scope>
|
||||
<version>[1.1.0,2.0.0)</version>
|
||||
<version>${hamcrest-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public void reachable() throws Exception {
|
|||
assertReachable("reachable from another tip",
|
||||
checker.areAllReachable(Arrays.asList(a), Stream.of(b2)));
|
||||
assertReachable("reachable from itself",
|
||||
checker.areAllReachable(Arrays.asList(a), Stream.of(b2)));
|
||||
checker.areAllReachable(Arrays.asList(a), Stream.of(a)));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.text.MessageFormat;
|
||||
|
|
@ -50,6 +51,7 @@
|
|||
import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.junit.JGitTestUtil;
|
||||
import org.eclipse.jgit.junit.MockSystemReader;
|
||||
import org.eclipse.jgit.merge.MergeConfig;
|
||||
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||
|
|
@ -1463,6 +1465,107 @@ public void testWhitespaceContinuation() throws ConfigInvalidException {
|
|||
assertEquals("tr ue", parseEscapedValue("tr \\\r\n ue"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCommitTemplateEmptyConfig()
|
||||
throws ConfigInvalidException, IOException {
|
||||
// no values defined nowhere
|
||||
Config config = new Config(null);
|
||||
assertNull(config.get(CommitConfig.KEY).getCommitTemplatePath());
|
||||
assertNull(config.get(CommitConfig.KEY).getCommitTemplateContent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCommitTemplateConfig()
|
||||
throws ConfigInvalidException, IOException {
|
||||
|
||||
File tempFile = tmp.newFile("testCommitTemplate-");
|
||||
String templateContent = "content of the template";
|
||||
JGitTestUtil.write(tempFile, templateContent);
|
||||
String expectedTemplatePath = tempFile.getPath();
|
||||
|
||||
Config config = parse(
|
||||
"[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
|
||||
|
||||
String templatePath = config.get(CommitConfig.KEY)
|
||||
.getCommitTemplatePath();
|
||||
String commitEncoding = config.get(CommitConfig.KEY)
|
||||
.getCommitEncoding();
|
||||
assertEquals(expectedTemplatePath, templatePath);
|
||||
assertEquals(templateContent,
|
||||
config.get(CommitConfig.KEY).getCommitTemplateContent());
|
||||
assertNull("no commitEncoding has been set so it must be null",
|
||||
commitEncoding);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCommitTemplateEncoding()
|
||||
throws ConfigInvalidException, IOException {
|
||||
Config config = new Config(null);
|
||||
File tempFile = tmp.newFile("testCommitTemplate-");
|
||||
String templateContent = "content of the template";
|
||||
JGitTestUtil.write(tempFile, templateContent);
|
||||
String expectedTemplatePath = tempFile.getPath();
|
||||
config = parse("[i18n]\n\tcommitEncoding = utf-8\n"
|
||||
+ "[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
|
||||
assertEquals(templateContent,
|
||||
config.get(CommitConfig.KEY).getCommitTemplateContent());
|
||||
String commitEncoding = config.get(CommitConfig.KEY)
|
||||
.getCommitEncoding();
|
||||
assertEquals("commitEncoding has been set to utf-8 it must be utf-8",
|
||||
"utf-8", commitEncoding);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCommitTemplatePathInHomeDirecory()
|
||||
throws ConfigInvalidException, IOException {
|
||||
Config config = new Config(null);
|
||||
File tempFile = tmp.newFile("testCommitTemplate-");
|
||||
String templateContent = "content of the template";
|
||||
JGitTestUtil.write(tempFile, templateContent);
|
||||
// proper evaluation of the ~/ directory
|
||||
String homeDir = System.getProperty("user.home");
|
||||
File tempFileInHomeDirectory = File.createTempFile("fileInHomeFolder",
|
||||
".tmp", new File(homeDir));
|
||||
tempFileInHomeDirectory.deleteOnExit();
|
||||
JGitTestUtil.write(tempFileInHomeDirectory, templateContent);
|
||||
String expectedTemplatePath = tempFileInHomeDirectory.getPath()
|
||||
.replace(homeDir, "~");
|
||||
config = parse("[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
|
||||
String templatePath = config.get(CommitConfig.KEY)
|
||||
.getCommitTemplatePath();
|
||||
assertEquals(expectedTemplatePath, templatePath);
|
||||
assertEquals(templateContent,
|
||||
config.get(CommitConfig.KEY).getCommitTemplateContent());
|
||||
}
|
||||
|
||||
@Test(expected = ConfigInvalidException.class)
|
||||
public void testCommitTemplateWithInvalidEncoding()
|
||||
throws ConfigInvalidException, IOException {
|
||||
Config config = new Config(null);
|
||||
File tempFile = tmp.newFile("testCommitTemplate-");
|
||||
String templateContent = "content of the template";
|
||||
JGitTestUtil.write(tempFile, templateContent);
|
||||
config = parse("[i18n]\n\tcommitEncoding = invalidEcoding\n"
|
||||
+ "[commit]\n\ttemplate = " + tempFile.getPath() + "\n");
|
||||
config.get(CommitConfig.KEY).getCommitTemplateContent();
|
||||
}
|
||||
|
||||
@Test(expected = FileNotFoundException.class)
|
||||
public void testCommitTemplateWithInvalidPath()
|
||||
throws ConfigInvalidException, IOException {
|
||||
Config config = new Config(null);
|
||||
File tempFile = tmp.newFile("testCommitTemplate-");
|
||||
String templateContent = "content of the template";
|
||||
JGitTestUtil.write(tempFile, templateContent);
|
||||
// commit message encoding
|
||||
String expectedTemplatePath = "nonExistingTemplate";
|
||||
config = parse("[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
|
||||
String templatePath = config.get(CommitConfig.KEY)
|
||||
.getCommitTemplatePath();
|
||||
assertEquals(expectedTemplatePath, templatePath);
|
||||
config.get(CommitConfig.KEY).getCommitTemplateContent();
|
||||
}
|
||||
|
||||
private static void assertValueRoundTrip(String value)
|
||||
throws ConfigInvalidException {
|
||||
assertValueRoundTrip(value, value);
|
||||
|
|
|
|||
|
|
@ -76,6 +76,28 @@ public void withCommitLoadedByDifferentRevWalk() throws Exception {
|
|||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findBranchesReachableManyTimes() throws Exception {
|
||||
/*
|
||||
* a b
|
||||
* | |
|
||||
* c d
|
||||
*/
|
||||
RevCommit a = commit();
|
||||
RevCommit b = commit();
|
||||
RevCommit c = commit(a);
|
||||
RevCommit d = commit(b);
|
||||
Ref branchA = branch("a", a);
|
||||
Ref branchB = branch("b", b);
|
||||
Ref branchC = branch("c", c);
|
||||
Ref branchD = branch("d", d);
|
||||
|
||||
assertContains(a, asList(branchA, branchC));
|
||||
assertContains(b, asList(branchB, branchD));
|
||||
assertContains(c, asList(branchC));
|
||||
assertContains(d, asList(branchD));
|
||||
}
|
||||
|
||||
private Ref branch(String name, RevCommit dst) throws Exception {
|
||||
return Git.wrap(db).branchCreate().setName(name)
|
||||
.setStartPoint(dst.name()).call();
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
import org.eclipse.jgit.lib.ObjectId;
|
||||
import org.eclipse.jgit.lib.Sets;
|
||||
import org.hamcrest.Description;
|
||||
import org.hamcrest.Factory;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.hamcrest.TypeSafeMatcher;
|
||||
|
||||
|
|
@ -59,7 +58,6 @@ protected boolean matchesSafely(Collection<ObjectId> resultOids) {
|
|||
* @return true if examined and specified sets contains exactly the same
|
||||
* elements.
|
||||
*/
|
||||
@Factory
|
||||
static Matcher<Collection<ObjectId>> hasOnlyObjectIds(
|
||||
String... oids) {
|
||||
return new ObjectIdMatcher(Sets.of(oids));
|
||||
|
|
|
|||
|
|
@ -460,6 +460,8 @@ private static class TestV2Hook implements ProtocolV2Hook {
|
|||
|
||||
private FetchV2Request fetchRequest;
|
||||
|
||||
private ObjectInfoRequest objectInfoRequest;
|
||||
|
||||
@Override
|
||||
public void onCapabilities(CapabilitiesV2Request req) {
|
||||
capabilitiesRequest = req;
|
||||
|
|
@ -474,6 +476,11 @@ public void onLsRefs(LsRefsV2Request req) {
|
|||
public void onFetch(FetchV2Request req) {
|
||||
fetchRequest = req;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onObjectInfo(ObjectInfoRequest req) {
|
||||
objectInfoRequest = req;
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -2641,4 +2648,44 @@ public RefDatabase getRefDatabase() {
|
|||
return refdb;
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testObjectInfo() throws Exception {
|
||||
server.getConfig().setBoolean("uploadpack", null, "advertiseobjectinfo",
|
||||
true);
|
||||
|
||||
RevBlob blob1 = remote.blob("foobar");
|
||||
RevBlob blob2 = remote.blob("fooba");
|
||||
RevTree tree = remote.tree(remote.file("1", blob1),
|
||||
remote.file("2", blob2));
|
||||
RevCommit commit = remote.commit(tree);
|
||||
remote.update("master", commit);
|
||||
|
||||
TestV2Hook hook = new TestV2Hook();
|
||||
ByteArrayInputStream recvStream = uploadPackV2((UploadPack up) -> {
|
||||
up.setProtocolV2Hook(hook);
|
||||
}, "command=object-info\n", "size",
|
||||
"oid " + ObjectId.toString(blob1.getId()),
|
||||
"oid " + ObjectId.toString(blob2.getId()), PacketLineIn.end());
|
||||
PacketLineIn pckIn = new PacketLineIn(recvStream);
|
||||
|
||||
assertThat(hook.objectInfoRequest, notNullValue());
|
||||
assertThat(pckIn.readString(), is("size"));
|
||||
assertThat(pckIn.readString(),
|
||||
is(ObjectId.toString(blob1.getId()) + " 6"));
|
||||
assertThat(pckIn.readString(),
|
||||
is(ObjectId.toString(blob2.getId()) + " 5"));
|
||||
assertTrue(PacketLineIn.isEnd(pckIn.readString()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testObjectInfo_invalidOid() throws Exception {
|
||||
server.getConfig().setBoolean("uploadpack", null, "advertiseobjectinfo",
|
||||
true);
|
||||
|
||||
assertThrows(UploadPackInternalServerErrorException.class,
|
||||
() -> uploadPackV2("command=object-info\n", "size",
|
||||
"oid invalid",
|
||||
PacketLineIn.end()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,14 @@
|
|||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/jgit/transport/ProtocolV2Hook.java" type="org.eclipse.jgit.transport.ProtocolV2Hook">
|
||||
<filter id="404000815">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.jgit.transport.ProtocolV2Hook"/>
|
||||
<message_argument value="onObjectInfo(ObjectInfoRequest)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/jgit/transport/SshConstants.java" type="org.eclipse.jgit.transport.SshConstants">
|
||||
<filter id="1142947843">
|
||||
<message_arguments>
|
||||
|
|
|
|||
|
|
@ -365,6 +365,7 @@ invalidBooleanValue=Invalid boolean value: {0}.{1}={2}
|
|||
invalidChannel=Invalid channel {0}
|
||||
invalidCommitParentNumber=Invalid commit parent number
|
||||
invalidDepth=Invalid depth: {0}
|
||||
invalidEncoding=Invalid encoding from git config i18n.commitEncoding: {0}
|
||||
invalidEncryption=Invalid encryption
|
||||
invalidExpandWildcard=ExpandFromSource on a refspec that can have mismatched wildcards does not make sense.
|
||||
invalidFilter=Invalid filter: {0}
|
||||
|
|
|
|||
|
|
@ -173,7 +173,11 @@ public Git call() throws GitAPIException, InvalidRemoteException,
|
|||
Repository repository = init();
|
||||
FetchResult fetchResult = null;
|
||||
Thread cleanupHook = new Thread(() -> cleanup());
|
||||
Runtime.getRuntime().addShutdownHook(cleanupHook);
|
||||
try {
|
||||
Runtime.getRuntime().addShutdownHook(cleanupHook);
|
||||
} catch (IllegalStateException e) {
|
||||
// ignore - the VM is already shutting down
|
||||
}
|
||||
try {
|
||||
fetchResult = fetch(repository, u);
|
||||
} catch (IOException ioe) {
|
||||
|
|
@ -197,7 +201,11 @@ public Git call() throws GitAPIException, InvalidRemoteException,
|
|||
cleanup();
|
||||
throw e;
|
||||
} finally {
|
||||
Runtime.getRuntime().removeShutdownHook(cleanupHook);
|
||||
try {
|
||||
Runtime.getRuntime().removeShutdownHook(cleanupHook);
|
||||
} catch (IllegalStateException e) {
|
||||
// ignore - the VM is already shutting down
|
||||
}
|
||||
}
|
||||
if (!noCheckout) {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -393,6 +393,7 @@ public static JGitText get() {
|
|||
/***/ public String invalidChannel;
|
||||
/***/ public String invalidCommitParentNumber;
|
||||
/***/ public String invalidDepth;
|
||||
/***/ public String invalidEncoding;
|
||||
/***/ public String invalidEncryption;
|
||||
/***/ public String invalidExpandWildcard;
|
||||
/***/ public String invalidFilter;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
import java.nio.channels.Channels;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.zip.CRC32;
|
||||
import java.util.zip.DataFormatException;
|
||||
import java.util.zip.Inflater;
|
||||
|
|
@ -162,10 +163,17 @@ private PackIndex idx(DfsReader ctx) throws IOException {
|
|||
|
||||
try {
|
||||
DfsStreamKey idxKey = desc.getStreamKey(INDEX);
|
||||
AtomicBoolean cacheHit = new AtomicBoolean(true);
|
||||
DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(
|
||||
idxKey,
|
||||
REF_POSITION,
|
||||
() -> loadPackIndex(ctx, idxKey));
|
||||
() -> {
|
||||
cacheHit.set(false);
|
||||
return loadPackIndex(ctx, idxKey);
|
||||
});
|
||||
if (cacheHit.get()) {
|
||||
ctx.stats.idxCacheHit++;
|
||||
}
|
||||
PackIndex idx = idxref.get();
|
||||
if (index == null && idx != null) {
|
||||
index = idx;
|
||||
|
|
@ -200,10 +208,17 @@ PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
|
|||
PackIndex idx = idx(ctx);
|
||||
PackReverseIndex revidx = getReverseIdx(ctx);
|
||||
DfsStreamKey bitmapKey = desc.getStreamKey(BITMAP_INDEX);
|
||||
AtomicBoolean cacheHit = new AtomicBoolean(true);
|
||||
DfsBlockCache.Ref<PackBitmapIndex> idxref = cache.getOrLoadRef(
|
||||
bitmapKey,
|
||||
REF_POSITION,
|
||||
() -> loadBitmapIndex(ctx, bitmapKey, idx, revidx));
|
||||
() -> {
|
||||
cacheHit.set(false);
|
||||
return loadBitmapIndex(ctx, bitmapKey, idx, revidx);
|
||||
});
|
||||
if (cacheHit.get()) {
|
||||
ctx.stats.bitmapCacheHit++;
|
||||
}
|
||||
PackBitmapIndex bmidx = idxref.get();
|
||||
if (bitmapIndex == null && bmidx != null) {
|
||||
bitmapIndex = bmidx;
|
||||
|
|
@ -225,10 +240,17 @@ PackReverseIndex getReverseIdx(DfsReader ctx) throws IOException {
|
|||
PackIndex idx = idx(ctx);
|
||||
DfsStreamKey revKey = new DfsStreamKey.ForReverseIndex(
|
||||
desc.getStreamKey(INDEX));
|
||||
AtomicBoolean cacheHit = new AtomicBoolean(true);
|
||||
DfsBlockCache.Ref<PackReverseIndex> revref = cache.getOrLoadRef(
|
||||
revKey,
|
||||
REF_POSITION,
|
||||
() -> loadReverseIdx(revKey, idx));
|
||||
() -> {
|
||||
cacheHit.set(false);
|
||||
return loadReverseIdx(ctx, revKey, idx);
|
||||
});
|
||||
if (cacheHit.get()) {
|
||||
ctx.stats.ridxCacheHit++;
|
||||
}
|
||||
PackReverseIndex revidx = revref.get();
|
||||
if (reverseIndex == null && revidx != null) {
|
||||
reverseIndex = revidx;
|
||||
|
|
@ -1031,9 +1053,12 @@ private DfsBlockCache.Ref<PackIndex> loadPackIndex(
|
|||
}
|
||||
|
||||
private DfsBlockCache.Ref<PackReverseIndex> loadReverseIdx(
|
||||
DfsStreamKey revKey, PackIndex idx) {
|
||||
DfsReader ctx, DfsStreamKey revKey, PackIndex idx) {
|
||||
ctx.stats.readReverseIdx++;
|
||||
long start = System.nanoTime();
|
||||
PackReverseIndex revidx = new PackReverseIndex(idx);
|
||||
reverseIndex = revidx;
|
||||
ctx.stats.readReverseIdxMicros += elapsedMicros(start);
|
||||
return new DfsBlockCache.Ref<>(
|
||||
revKey,
|
||||
REF_POSITION,
|
||||
|
|
@ -1064,8 +1089,8 @@ private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(
|
|||
bmidx = PackBitmapIndex.read(in, idx, revidx);
|
||||
} finally {
|
||||
size = rc.position();
|
||||
ctx.stats.readIdxBytes += size;
|
||||
ctx.stats.readIdxMicros += elapsedMicros(start);
|
||||
ctx.stats.readBitmapIdxBytes += size;
|
||||
ctx.stats.readBitmapIdxMicros += elapsedMicros(start);
|
||||
}
|
||||
bitmapIndex = bmidx;
|
||||
return new DfsBlockCache.Ref<>(
|
||||
|
|
|
|||
|
|
@ -19,18 +19,39 @@ public static class Accumulator {
|
|||
/** Number of times the reader explicitly called scanPacks. */
|
||||
long scanPacks;
|
||||
|
||||
/** Total number of cache hits for pack indexes. */
|
||||
long idxCacheHit;
|
||||
|
||||
/** Total number of cache hits for reverse indexes. */
|
||||
long ridxCacheHit;
|
||||
|
||||
/** Total number of cache hits for bitmap indexes. */
|
||||
long bitmapCacheHit;
|
||||
|
||||
/** Total number of complete pack indexes read into memory. */
|
||||
long readIdx;
|
||||
|
||||
/** Total number of complete bitmap indexes read into memory. */
|
||||
long readBitmap;
|
||||
|
||||
/** Total number of bytes read from indexes. */
|
||||
/** Total number of reverse indexes added into memory. */
|
||||
long readReverseIdx;
|
||||
|
||||
/** Total number of bytes read from pack indexes. */
|
||||
long readIdxBytes;
|
||||
|
||||
/** Total microseconds spent reading pack or bitmap indexes. */
|
||||
/** Total microseconds spent reading pack indexes. */
|
||||
long readIdxMicros;
|
||||
|
||||
/** Total microseconds spent creating reverse indexes. */
|
||||
long readReverseIdxMicros;
|
||||
|
||||
/** Total number of bytes read from bitmap indexes. */
|
||||
long readBitmapIdxBytes;
|
||||
|
||||
/** Total microseconds spent reading bitmap indexes. */
|
||||
long readBitmapIdxMicros;
|
||||
|
||||
/** Total number of block cache hits. */
|
||||
long blockCacheHit;
|
||||
|
||||
|
|
@ -74,6 +95,33 @@ public long getScanPacks() {
|
|||
return stats.scanPacks;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of pack index cache hits.
|
||||
*
|
||||
* @return total number of pack index cache hits.
|
||||
*/
|
||||
public long getPackIndexCacheHits() {
|
||||
return stats.idxCacheHit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of reverse index cache hits.
|
||||
*
|
||||
* @return total number of reverse index cache hits.
|
||||
*/
|
||||
public long getReverseIndexCacheHits() {
|
||||
return stats.ridxCacheHit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of bitmap index cache hits.
|
||||
*
|
||||
* @return total number of bitmap index cache hits.
|
||||
*/
|
||||
public long getBitmapIndexCacheHits() {
|
||||
return stats.bitmapCacheHit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of complete pack indexes read into memory.
|
||||
*
|
||||
|
|
@ -83,6 +131,15 @@ public long getReadPackIndexCount() {
|
|||
return stats.readIdx;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of times the reverse index was computed.
|
||||
*
|
||||
* @return total number of reverse index was computed.
|
||||
*/
|
||||
public long getReadReverseIndexCount() {
|
||||
return stats.readReverseIdx;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of complete bitmap indexes read into memory.
|
||||
*
|
||||
|
|
@ -93,23 +150,50 @@ public long getReadBitmapIndexCount() {
|
|||
}
|
||||
|
||||
/**
|
||||
* Get total number of bytes read from indexes.
|
||||
* Get total number of bytes read from pack indexes.
|
||||
*
|
||||
* @return total number of bytes read from indexes.
|
||||
* @return total number of bytes read from pack indexes.
|
||||
*/
|
||||
public long getReadIndexBytes() {
|
||||
return stats.readIdxBytes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total microseconds spent reading pack or bitmap indexes.
|
||||
* Get total microseconds spent reading pack indexes.
|
||||
*
|
||||
* @return total microseconds spent reading pack or bitmap indexes.
|
||||
* @return total microseconds spent reading pack indexes.
|
||||
*/
|
||||
public long getReadIndexMicros() {
|
||||
return stats.readIdxMicros;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total microseconds spent creating reverse indexes.
|
||||
*
|
||||
* @return total microseconds spent creating reverse indexes.
|
||||
*/
|
||||
public long getReadReverseIndexMicros() {
|
||||
return stats.readReverseIdxMicros;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of bytes read from bitmap indexes.
|
||||
*
|
||||
* @return total number of bytes read from bitmap indexes.
|
||||
*/
|
||||
public long getReadBitmapIndexBytes() {
|
||||
return stats.readBitmapIdxBytes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total microseconds spent reading bitmap indexes.
|
||||
*
|
||||
* @return total microseconds spent reading bitmap indexes.
|
||||
*/
|
||||
public long getReadBitmapIndexMicros() {
|
||||
return stats.readBitmapIdxMicros;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total number of block cache hits.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -0,0 +1,126 @@
|
|||
/*
|
||||
* Copyright (c) 2020 Julian Ruppel <julian.ruppel@sap.com>
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
* https://www.eclipse.org/org/documents/edl-v10.php.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
package org.eclipse.jgit.lib;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.IllegalCharsetNameException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.charset.UnsupportedCharsetException;
|
||||
import java.text.MessageFormat;
|
||||
import org.eclipse.jgit.annotations.Nullable;
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.Config.SectionParser;
|
||||
import org.eclipse.jgit.util.FS;
|
||||
import org.eclipse.jgit.util.IO;
|
||||
import org.eclipse.jgit.util.RawParseUtils;
|
||||
|
||||
/**
|
||||
* The standard "commit" configuration parameters.
|
||||
*
|
||||
* @since 5.13
|
||||
*/
|
||||
public class CommitConfig {
|
||||
/**
|
||||
* Key for {@link Config#get(SectionParser)}.
|
||||
*/
|
||||
public static final Config.SectionParser<CommitConfig> KEY = CommitConfig::new;
|
||||
|
||||
private final static Charset DEFAULT_COMMIT_MESSAGE_ENCODING = StandardCharsets.UTF_8;
|
||||
|
||||
private String i18nCommitEncoding;
|
||||
|
||||
private String commitTemplatePath;
|
||||
|
||||
private CommitConfig(Config rc) {
|
||||
commitTemplatePath = rc.getString(ConfigConstants.CONFIG_COMMIT_SECTION,
|
||||
null, ConfigConstants.CONFIG_KEY_COMMIT_TEMPLATE);
|
||||
i18nCommitEncoding = rc.getString(ConfigConstants.CONFIG_SECTION_I18N,
|
||||
null, ConfigConstants.CONFIG_KEY_COMMIT_ENCODING);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the path to the commit template as defined in the git
|
||||
* {@code commit.template} property.
|
||||
*
|
||||
* @return the path to commit template or {@code null} if not present.
|
||||
*/
|
||||
@Nullable
|
||||
public String getCommitTemplatePath() {
|
||||
return commitTemplatePath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the encoding of the commit as defined in the git
|
||||
* {@code i18n.commitEncoding} property.
|
||||
*
|
||||
* @return the encoding or {@code null} if not present.
|
||||
*/
|
||||
@Nullable
|
||||
public String getCommitEncoding() {
|
||||
return i18nCommitEncoding;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the content to the commit template as defined in
|
||||
* {@code commit.template}. If no {@code i18n.commitEncoding} is specified,
|
||||
* UTF-8 fallback is used.
|
||||
*
|
||||
* @return content of the commit template or {@code null} if not present.
|
||||
* @throws IOException
|
||||
* if the template file can not be read
|
||||
* @throws FileNotFoundException
|
||||
* if the template file does not exists
|
||||
* @throws ConfigInvalidException
|
||||
* if a {@code commitEncoding} is specified and is invalid
|
||||
*/
|
||||
@Nullable
|
||||
public String getCommitTemplateContent()
|
||||
throws FileNotFoundException, IOException, ConfigInvalidException {
|
||||
|
||||
if (commitTemplatePath == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
File commitTemplateFile;
|
||||
if (commitTemplatePath.startsWith("~/")) { //$NON-NLS-1$
|
||||
commitTemplateFile = FS.DETECTED.resolve(FS.DETECTED.userHome(),
|
||||
commitTemplatePath.substring(2));
|
||||
} else {
|
||||
commitTemplateFile = FS.DETECTED.resolve(null, commitTemplatePath);
|
||||
}
|
||||
|
||||
Charset commitMessageEncoding = getEncoding();
|
||||
return RawParseUtils.decode(commitMessageEncoding,
|
||||
IO.readFully(commitTemplateFile));
|
||||
|
||||
}
|
||||
|
||||
private Charset getEncoding() throws ConfigInvalidException {
|
||||
Charset commitMessageEncoding = DEFAULT_COMMIT_MESSAGE_ENCODING;
|
||||
|
||||
if (i18nCommitEncoding == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
commitMessageEncoding = Charset.forName(i18nCommitEncoding);
|
||||
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
|
||||
throw new ConfigInvalidException(MessageFormat.format(
|
||||
JGitText.get().invalidEncoding, i18nCommitEncoding), e);
|
||||
}
|
||||
|
||||
return commitMessageEncoding;
|
||||
}
|
||||
}
|
||||
|
|
@ -124,6 +124,13 @@ public final class ConfigConstants {
|
|||
*/
|
||||
public static final String CONFIG_COMMIT_SECTION = "commit";
|
||||
|
||||
/**
|
||||
* The "template" key
|
||||
*
|
||||
* @since 5.13
|
||||
*/
|
||||
public static final String CONFIG_KEY_COMMIT_TEMPLATE = "template";
|
||||
|
||||
/**
|
||||
* The "tag" section
|
||||
*
|
||||
|
|
@ -517,6 +524,13 @@ public final class ConfigConstants {
|
|||
*/
|
||||
public static final String CONFIG_SECTION_I18N = "i18n";
|
||||
|
||||
/**
|
||||
* The "commitEncoding" key
|
||||
*
|
||||
* @since 5.13
|
||||
*/
|
||||
public static final String CONFIG_KEY_COMMIT_ENCODING = "commitEncoding";
|
||||
|
||||
/**
|
||||
* The "logOutputEncoding" key
|
||||
*
|
||||
|
|
|
|||
|
|
@ -527,10 +527,12 @@ public boolean isMergedIntoAll(RevCommit commit, Collection<Ref> refs)
|
|||
private List<Ref> getMergedInto(RevCommit needle, Collection<Ref> haystacks,
|
||||
Enum returnStrategy, ProgressMonitor monitor) throws IOException {
|
||||
List<Ref> result = new ArrayList<>();
|
||||
List<RevCommit> uninteresting = new ArrayList<>();
|
||||
RevFilter oldRF = filter;
|
||||
TreeFilter oldTF = treeFilter;
|
||||
try {
|
||||
finishDelayedFreeFlags();
|
||||
reset(~freeFlags & APP_FLAGS);
|
||||
filter = RevFilter.ALL;
|
||||
treeFilter = TreeFilter.ALL;
|
||||
for (Ref r: haystacks) {
|
||||
|
|
@ -559,13 +561,14 @@ private List<Ref> getMergedInto(RevCommit needle, Collection<Ref> haystacks,
|
|||
}
|
||||
if(!commitFound){
|
||||
markUninteresting(c);
|
||||
uninteresting.add(c);
|
||||
if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
reset(~freeFlags & APP_FLAGS);
|
||||
roots.addAll(uninteresting);
|
||||
filter = oldRF;
|
||||
treeFilter = oldTF;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -254,6 +254,13 @@ public final class GitProtocolConstants {
|
|||
*/
|
||||
public static final String COMMAND_FETCH = "fetch"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* The server supports the object-info capability.
|
||||
*
|
||||
* @since 5.13
|
||||
*/
|
||||
public static final String COMMAND_OBJECT_INFO = "object-info"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* HTTP header to set by clients to request a specific git protocol version
|
||||
* in the HTTP transport.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
/*
|
||||
* Copyright (C) 2021, Google LLC. and others
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
||||
* https://www.eclipse.org/org/documents/edl-v10.php.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jgit.lib.ObjectId;
|
||||
|
||||
/**
|
||||
* object-info request.
|
||||
*
|
||||
* <p>
|
||||
* This is the parsed request for an object-info call, used as input to
|
||||
* {@link ProtocolV2Hook}.
|
||||
*
|
||||
* @see <a href=
|
||||
* "https://www.kernel.org/pub/software/scm/git/docs/technical/protocol-v2.html#_object_info">object-info
|
||||
* documentation</a>
|
||||
*
|
||||
* @since 5.13
|
||||
*/
|
||||
public final class ObjectInfoRequest {
|
||||
private final List<ObjectId> objectIDs;
|
||||
|
||||
private ObjectInfoRequest(List<ObjectId> objectIDs) {
|
||||
this.objectIDs = objectIDs;
|
||||
}
|
||||
|
||||
/** @return object IDs that the client requested. */
|
||||
public List<ObjectId> getObjectIDs() {
|
||||
return this.objectIDs;
|
||||
}
|
||||
|
||||
/** @return A builder of {@link ObjectInfoRequest}. */
|
||||
public static Builder builder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
/** A builder for {@link ObjectInfoRequest}. */
|
||||
public static final class Builder {
|
||||
private List<ObjectId> objectIDs = Collections.emptyList();
|
||||
|
||||
private Builder() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param value
|
||||
* @return the Builder
|
||||
*/
|
||||
public Builder setObjectIDs(List<ObjectId> value) {
|
||||
objectIDs = value;
|
||||
return this;
|
||||
}
|
||||
|
||||
/** @return ObjectInfoRequest */
|
||||
public ObjectInfoRequest build() {
|
||||
return new ObjectInfoRequest(
|
||||
Collections.unmodifiableList(objectIDs));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -55,4 +55,16 @@ default void onFetch(FetchV2Request req)
|
|||
throws ServiceMayNotContinueException {
|
||||
// Do nothing by default
|
||||
}
|
||||
|
||||
/**
|
||||
* @param req
|
||||
* the object-info request
|
||||
* @throws ServiceMayNotContinueException
|
||||
* abort; the message will be sent to the user
|
||||
* @since 5.13
|
||||
*/
|
||||
default void onObjectInfo(ObjectInfoRequest req)
|
||||
throws ServiceMayNotContinueException {
|
||||
// Do nothing by default
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,14 @@ public void onFetch(FetchV2Request req)
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onObjectInfo(ObjectInfoRequest req)
|
||||
throws ServiceMayNotContinueException {
|
||||
for (ProtocolV2Hook hook : hooks) {
|
||||
hook.onObjectInfo(req);
|
||||
}
|
||||
}
|
||||
|
||||
private ProtocolV2HookChain(List<? extends ProtocolV2Hook> hooks) {
|
||||
this.hooks = Collections.unmodifiableList(hooks);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.eclipse.jgit.errors.InvalidObjectIdException;
|
||||
import org.eclipse.jgit.errors.PackProtocolException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.ObjectId;
|
||||
|
|
@ -248,4 +249,38 @@ LsRefsV2Request parseLsRefsRequest(PacketLineIn pckIn)
|
|||
return builder.setRefPrefixes(prefixes).build();
|
||||
}
|
||||
|
||||
ObjectInfoRequest parseObjectInfoRequest(PacketLineIn pckIn)
|
||||
throws PackProtocolException, IOException {
|
||||
ObjectInfoRequest.Builder builder = ObjectInfoRequest.builder();
|
||||
List<ObjectId> objectIDs = new ArrayList<>();
|
||||
|
||||
String line = pckIn.readString();
|
||||
|
||||
if (PacketLineIn.isEnd(line)) {
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
if (!line.equals("size")) { //$NON-NLS-1$
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().unexpectedPacketLine, line));
|
||||
}
|
||||
|
||||
for (String line2 : pckIn.readStrings()) {
|
||||
if (!line2.startsWith("oid ")) { //$NON-NLS-1$
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().unexpectedPacketLine, line2));
|
||||
}
|
||||
|
||||
String oidStr = line2.substring("oid ".length()); //$NON-NLS-1$
|
||||
|
||||
try {
|
||||
objectIDs.add(ObjectId.fromString(oidStr));
|
||||
} catch (InvalidObjectIdException e) {
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().invalidObject, oidStr), e);
|
||||
}
|
||||
}
|
||||
|
||||
return builder.setObjectIDs(objectIDs).build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.UncheckedIOException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
|
@ -37,6 +38,8 @@
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.eclipse.jgit.annotations.Nullable;
|
||||
import org.eclipse.jgit.errors.InvalidObjectIdException;
|
||||
|
|
@ -441,7 +444,7 @@ public Map<String, Ref> getAdvertisedRefs() {
|
|||
*/
|
||||
public void setAdvertisedRefs(Map<String, Ref> allRefs,
|
||||
Set<ObjectId> additionalHaves) {
|
||||
refs = allRefs != null ? allRefs : db.getAllRefs();
|
||||
refs = allRefs != null ? allRefs : getAllRefs();
|
||||
refs = refFilter.filter(refs);
|
||||
advertisedHaves.clear();
|
||||
|
||||
|
|
@ -1295,6 +1298,21 @@ public ReceivedPackStatistics getReceivedPackStatistics() {
|
|||
return stats;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract the full list of refs from the ref-db.
|
||||
*
|
||||
* @return Map of all refname/ref
|
||||
*/
|
||||
private Map<String, Ref> getAllRefs() {
|
||||
try {
|
||||
return db.getRefDatabase().getRefs().stream()
|
||||
.collect(Collectors.toMap(Ref::getName,
|
||||
Function.identity()));
|
||||
} catch (IOException e) {
|
||||
throw new UncheckedIOException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Receive a list of commands from the input.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ static ProtocolVersion parse(@Nullable String name) {
|
|||
|
||||
private final boolean advertiseSidebandAll;
|
||||
private final boolean advertiseWaitForDone;
|
||||
private final boolean advertiseObjectInfo;
|
||||
|
||||
final @Nullable ProtocolVersion protocolVersion;
|
||||
final String[] hideRefs;
|
||||
|
|
@ -211,6 +212,8 @@ public TransferConfig(Config rc) {
|
|||
"advertisesidebandall", false);
|
||||
advertiseWaitForDone = rc.getBoolean("uploadpack",
|
||||
"advertisewaitfordone", false);
|
||||
advertiseObjectInfo = rc.getBoolean("uploadpack",
|
||||
"advertiseobjectinfo", false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -317,6 +320,14 @@ public boolean isAdvertiseWaitForDone() {
|
|||
return advertiseWaitForDone;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true to advertise object-info to all clients
|
||||
* @since 5.13
|
||||
*/
|
||||
public boolean isAdvertiseObjectInfo() {
|
||||
return advertiseObjectInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get {@link org.eclipse.jgit.transport.RefFilter} respecting configured
|
||||
* hidden refs.
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SERVER_OPTION;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_FETCH;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_LS_REFS;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_OBJECT_INFO;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_AGENT;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_REACHABLE_SHA1_IN_WANT;
|
||||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT;
|
||||
|
|
@ -1269,6 +1270,32 @@ private void fetchV2(PacketLineOut pckOut) throws IOException {
|
|||
}
|
||||
}
|
||||
|
||||
private void objectInfo(PacketLineOut pckOut) throws IOException {
|
||||
ProtocolV2Parser parser = new ProtocolV2Parser(transferConfig);
|
||||
ObjectInfoRequest req = parser.parseObjectInfoRequest(pckIn);
|
||||
|
||||
protocolV2Hook.onObjectInfo(req);
|
||||
|
||||
ObjectReader or = getRepository().newObjectReader();
|
||||
|
||||
// Size is the only attribute currently supported.
|
||||
pckOut.writeString("size"); //$NON-NLS-1$
|
||||
|
||||
for (ObjectId oid : req.getObjectIDs()) {
|
||||
long size;
|
||||
try {
|
||||
size = or.getObjectSize(oid, ObjectReader.OBJ_ANY);
|
||||
} catch (MissingObjectException e) {
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().missingObject, oid.name()), e);
|
||||
}
|
||||
|
||||
pckOut.writeString(oid.getName() + " " + size); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
pckOut.end();
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns true if this is the last command and we should tear down the
|
||||
* connection.
|
||||
|
|
@ -1295,6 +1322,10 @@ private boolean serveOneCommandV2(PacketLineOut pckOut) throws IOException {
|
|||
fetchV2(pckOut);
|
||||
return false;
|
||||
}
|
||||
if (command.equals("command=" + COMMAND_OBJECT_INFO)) { //$NON-NLS-1$
|
||||
objectInfo(pckOut);
|
||||
return false;
|
||||
}
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().unknownTransportCommand, command));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ private static void write(Path p, String body) throws IOException {
|
|||
}
|
||||
|
||||
private static String read(Path p) throws IOException {
|
||||
final byte[] body = IO.readFully(p.toFile());
|
||||
byte[] body = IO.readFully(p.toFile());
|
||||
return new String(body, 0, body.length, UTF_8);
|
||||
}
|
||||
|
||||
|
|
@ -766,7 +766,7 @@ private static void saveToConfig(FileStore s,
|
|||
}
|
||||
|
||||
private static String getConfigKey(FileStore s) {
|
||||
final String storeKey;
|
||||
String storeKey;
|
||||
if (SystemReader.getInstance().isWindows()) {
|
||||
Object attribute = null;
|
||||
try {
|
||||
|
|
@ -1164,7 +1164,7 @@ public void delete(File f) throws IOException {
|
|||
* platform does not require path name translation.
|
||||
*/
|
||||
public File resolve(File dir, String name) {
|
||||
final File abspn = new File(name);
|
||||
File abspn = new File(name);
|
||||
if (abspn.isAbsolute())
|
||||
return abspn;
|
||||
return new File(dir, name);
|
||||
|
|
@ -1257,7 +1257,7 @@ protected File userHomeImpl() {
|
|||
}
|
||||
|
||||
private File defaultUserHomeImpl() {
|
||||
final String home = AccessController.doPrivileged(
|
||||
String home = AccessController.doPrivileged(
|
||||
(PrivilegedAction<String>) () -> System.getProperty("user.home") //$NON-NLS-1$
|
||||
);
|
||||
if (home == null || home.length() == 0)
|
||||
|
|
@ -1267,7 +1267,8 @@ private File defaultUserHomeImpl() {
|
|||
|
||||
/**
|
||||
* Searches the given path to see if it contains one of the given files.
|
||||
* Returns the first it finds. Returns null if not found or if path is null.
|
||||
* Returns the first it finds which is executable. Returns null if not found
|
||||
* or if path is null.
|
||||
*
|
||||
* @param path
|
||||
* List of paths to search separated by File.pathSeparator
|
||||
|
|
@ -1277,14 +1278,15 @@ private File defaultUserHomeImpl() {
|
|||
* @since 3.0
|
||||
*/
|
||||
protected static File searchPath(String path, String... lookFor) {
|
||||
if (path == null)
|
||||
if (path == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
for (String p : path.split(File.pathSeparator)) {
|
||||
for (String command : lookFor) {
|
||||
final File file = new File(p, command);
|
||||
File file = new File(p, command);
|
||||
try {
|
||||
if (file.isFile()) {
|
||||
if (file.isFile() && file.canExecute()) {
|
||||
return file.getAbsoluteFile();
|
||||
}
|
||||
} catch (SecurityException e) {
|
||||
|
|
@ -1339,7 +1341,7 @@ protected static String readPipe(File dir, String[] command,
|
|||
protected static String readPipe(File dir, String[] command,
|
||||
String encoding, Map<String, String> env)
|
||||
throws CommandFailedException {
|
||||
final boolean debug = LOG.isDebugEnabled();
|
||||
boolean debug = LOG.isDebugEnabled();
|
||||
try {
|
||||
if (debug) {
|
||||
LOG.debug("readpipe " + Arrays.asList(command) + "," //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
|
@ -1806,11 +1808,11 @@ public String relativize(String base, String other) {
|
|||
* @since 5.0
|
||||
*/
|
||||
public Entry[] list(File directory, FileModeStrategy fileModeStrategy) {
|
||||
final File[] all = directory.listFiles();
|
||||
File[] all = directory.listFiles();
|
||||
if (all == null) {
|
||||
return NO_ENTRIES;
|
||||
}
|
||||
final Entry[] result = new Entry[all.length];
|
||||
Entry[] result = new Entry[all.length];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new FileEntry(all[i], this, fileModeStrategy);
|
||||
}
|
||||
|
|
@ -1840,10 +1842,9 @@ public Entry[] list(File directory, FileModeStrategy fileModeStrategy) {
|
|||
* @since 4.0
|
||||
*/
|
||||
public ProcessResult runHookIfPresent(Repository repository,
|
||||
final String hookName,
|
||||
String[] args) throws JGitInternalException {
|
||||
return runHookIfPresent(repository, hookName, args, System.out, System.err,
|
||||
null);
|
||||
String hookName, String[] args) throws JGitInternalException {
|
||||
return runHookIfPresent(repository, hookName, args, System.out,
|
||||
System.err, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1875,9 +1876,9 @@ public ProcessResult runHookIfPresent(Repository repository,
|
|||
* @since 5.11
|
||||
*/
|
||||
public ProcessResult runHookIfPresent(Repository repository,
|
||||
final String hookName,
|
||||
String[] args, OutputStream outRedirect, OutputStream errRedirect,
|
||||
String stdinArgs) throws JGitInternalException {
|
||||
String hookName, String[] args, OutputStream outRedirect,
|
||||
OutputStream errRedirect, String stdinArgs)
|
||||
throws JGitInternalException {
|
||||
return new ProcessResult(Status.NOT_SUPPORTED);
|
||||
}
|
||||
|
||||
|
|
@ -1911,7 +1912,7 @@ public ProcessResult runHookIfPresent(Repository repository,
|
|||
* @since 5.11
|
||||
*/
|
||||
protected ProcessResult internalRunHookIfPresent(Repository repository,
|
||||
final String hookName, String[] args, OutputStream outRedirect,
|
||||
String hookName, String[] args, OutputStream outRedirect,
|
||||
OutputStream errRedirect, String stdinArgs)
|
||||
throws JGitInternalException {
|
||||
File hookFile = findHook(repository, hookName);
|
||||
|
|
@ -2107,7 +2108,7 @@ public int runProcess(ProcessBuilder processBuilder,
|
|||
OutputStream outRedirect, OutputStream errRedirect,
|
||||
InputStream inRedirect) throws IOException,
|
||||
InterruptedException {
|
||||
final ExecutorService executor = Executors.newFixedThreadPool(2);
|
||||
ExecutorService executor = Executors.newFixedThreadPool(2);
|
||||
Process process = null;
|
||||
// We'll record the first I/O exception that occurs, but keep on trying
|
||||
// to dispose of our open streams and file handles
|
||||
|
|
|
|||
28
pom.xml
28
pom.xml
|
|
@ -152,17 +152,17 @@
|
|||
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
|
||||
|
||||
<jgit-last-release-version>5.12.0.202106070339-r</jgit-last-release-version>
|
||||
<apache-sshd-version>2.6.0</apache-sshd-version>
|
||||
<apache-sshd-version>2.7.0</apache-sshd-version>
|
||||
<jsch-version>0.1.55</jsch-version>
|
||||
<jzlib-version>1.1.1</jzlib-version>
|
||||
<javaewah-version>1.1.7</javaewah-version>
|
||||
<javaewah-version>1.1.12</javaewah-version>
|
||||
<junit-version>4.13</junit-version>
|
||||
<test-fork-count>1C</test-fork-count>
|
||||
<args4j-version>2.33</args4j-version>
|
||||
<commons-compress-version>1.19</commons-compress-version>
|
||||
<commons-compress-version>1.20</commons-compress-version>
|
||||
<osgi-core-version>4.3.1</osgi-core-version>
|
||||
<servlet-api-version>3.1.0</servlet-api-version>
|
||||
<jetty-version>9.4.42.v20210604</jetty-version>
|
||||
<jetty-version>9.4.43.v20210629</jetty-version>
|
||||
<japicmp-version>0.15.3</japicmp-version>
|
||||
<httpclient-version>4.5.13</httpclient-version>
|
||||
<httpcore-version>4.4.14</httpcore-version>
|
||||
|
|
@ -170,15 +170,17 @@
|
|||
<log4j-version>1.2.15</log4j-version>
|
||||
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
|
||||
<tycho-extras-version>1.7.0</tycho-extras-version>
|
||||
<gson-version>2.8.6</gson-version>
|
||||
<bouncycastle-version>1.65</bouncycastle-version>
|
||||
<spotbugs-maven-plugin-version>4.2.3</spotbugs-maven-plugin-version>
|
||||
<gson-version>2.8.7</gson-version>
|
||||
<bouncycastle-version>1.69</bouncycastle-version>
|
||||
<spotbugs-maven-plugin-version>4.3.0</spotbugs-maven-plugin-version>
|
||||
<maven-project-info-reports-plugin-version>3.1.2</maven-project-info-reports-plugin-version>
|
||||
<maven-jxr-plugin-version>3.1.1</maven-jxr-plugin-version>
|
||||
<maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
|
||||
<maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>
|
||||
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
|
||||
<plexus-compiler-version>2.8.8</plexus-compiler-version>
|
||||
<hamcrest-version>2.2</hamcrest-version>
|
||||
<assertj-version>3.20.2</assertj-version>
|
||||
|
||||
<!-- Properties to enable jacoco code coverage analysis -->
|
||||
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
|
||||
|
|
@ -688,7 +690,7 @@
|
|||
<dependency>
|
||||
<groupId>org.tukaani</groupId>
|
||||
<artifactId>xz</artifactId>
|
||||
<version>1.8</version>
|
||||
<version>1.9</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -767,7 +769,13 @@
|
|||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov-jdk15on</artifactId>
|
||||
<version>1.65.01</version>
|
||||
<version>${bouncycastle-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcutil-jdk15on</artifactId>
|
||||
<version>${bouncycastle-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -779,7 +787,7 @@
|
|||
<dependency>
|
||||
<groupId>org.assertj</groupId>
|
||||
<artifactId>assertj-core</artifactId>
|
||||
<version>3.14.0</version>
|
||||
<version>${assertj-version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
|
|
|||
Loading…
Reference in New Issue