summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-5.13'Matthias Sohn2021-11-037-13/+13
|\ | | | | | | | | | | | | * stable-5.13: Fix target platforms Change-Id: Iabbbacd6acde07a2e0ff156842b928a3ba18b4c6
| * Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2021-11-0318-35/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: Fix target platforms - jetty 9.4.43 moved to archive.eclipse.org - use the final release p2 repo instead of staging for 2021-09 Change-Id: I35c1264b8e9c63874663141288dca03b47f263ed
| | * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-11-0318-40/+40
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Fix target platforms - jetty 9.4.41 moved to archive.eclipse.org - use the final release p2 repo instead of staging for 2021-06 Change-Id: I7a02b1fe271910dd82acf45242d8425aba2f52f9
| | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-11-0317-38/+38
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Fix target platforms - jetty 9.4.36 moved to archive.eclipse.org - use the final release p2 repo instead of staging for 2021-03 Change-Id: I6ce2294bb150fedf8ded7fe6c1e23019d9c178d6
| | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-11-0315-36/+36
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Fix target platforms Change-Id: Ib1876923ba98252682f41a03877792fd22b418d6
| | | | | * Fix target platformsMatthias Sohn2021-11-0314-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - jetty 9.4.30 moved to archive.eclipse.org - use the final release p2 repo instead of staging for 2020-09 Change-Id: Ia096200e5983f0022c6c0da4dae035433e852807
* | | | | | Merge branch 'stable-5.13'Matthias Sohn2021-10-151-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Fix missing peel-part in lsRefsV2 for loose annotated tags Fix RevWalk.getMergedInto() ignores annotated tags Optimize RevWalk.getMergedInto() reftable: drop code for truncated reads reftable: pass on invalid object ID in conversion Update eclipse-jarsigner-plugin to 1.3.2 Fix running benchmarks from bazel Update eclipse-jarsigner-plugin to 1.3.2 Add org.bouncycastle.bcutil to p2 repository Change-Id: I789e3c84045cc9dcd8a26de34d09fc1e3ccc41e7
| * | | | | Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2021-10-151-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: Fix missing peel-part in lsRefsV2 for loose annotated tags Fix RevWalk.getMergedInto() ignores annotated tags Optimize RevWalk.getMergedInto() reftable: drop code for truncated reads reftable: pass on invalid object ID in conversion Update eclipse-jarsigner-plugin to 1.3.2 Fix running benchmarks from bazel Update eclipse-jarsigner-plugin to 1.3.2 Change-Id: Ie5da8d2d07f39ab5aaeca560040637635d4eb04c
| | * | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-10-151-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Fix missing peel-part in lsRefsV2 for loose annotated tags reftable: drop code for truncated reads reftable: pass on invalid object ID in conversion Update eclipse-jarsigner-plugin to 1.3.2 Fix running benchmarks from bazel Update eclipse-jarsigner-plugin to 1.3.2 Change-Id: I2122b3966bddb10d43d439eb8c5d6cc4583c6ba6
| | | * | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-10-151-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Fix missing peel-part in lsRefsV2 for loose annotated tags reftable: drop code for truncated reads reftable: pass on invalid object ID in conversion Update eclipse-jarsigner-plugin to 1.3.2 Fix running benchmarks from bazel Update eclipse-jarsigner-plugin to 1.3.2 Change-Id: I23ccb89306263ce042ce782d881812d4b5187672
| | | | * | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-10-151-1/+1
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Fix missing peel-part in lsRefsV2 for loose annotated tags reftable: drop code for truncated reads reftable: pass on invalid object ID in conversion Update eclipse-jarsigner-plugin to 1.3.2 Fix running benchmarks from bazel Update eclipse-jarsigner-plugin to 1.3.2 Change-Id: I4e7c7727ebfa9a7748477f2300bd66d775548ad6
| | | | | * Update eclipse-jarsigner-plugin to 1.3.2Matthias Sohn2021-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5d05d96c392913de7b4451421c2ffb7b63ab83f
| | | | | * Prepare 5.9.1-SNAPSHOT buildsMatthias Sohn2020-09-0822-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9006e7961111982943ffef496d15bd525959b3e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v5.9.0.202009080501-rv5.9.0.202009080501-rMatthias Sohn2020-09-0822-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic98ae61b3f327ef72256fd9b2e28510e3a481de7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | Prepare 5.11.2-SNAPSHOT buildsMatthias Sohn2021-05-1422-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfd81bd3bbcd99034f69fffb1a562bf07b0f8209 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | JGit v5.11.1.202105131744-rv5.11.1.202105131744-rMatthias Sohn2021-05-1322-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id74eecbde63edbc58b6262ae01ef34d8bebc0f88 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Add org.bouncycastle.bcutil to p2 repositoryMatthias Sohn2021-09-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 575621 Change-Id: I57de7af9f9b236cac570d9c10c3d1c3886720868
| * | | | | Prepare 5.13.1-SNAPSHOT buildsMatthias Sohn2021-09-0822-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2f689d8d13eab022da5b5e83d6d6bebc1bb81d3
| * | | | | JGit v5.13.0.202109080827-rv5.13.0.202109080827-rMatthias Sohn2021-09-0822-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3b2d4256712cc7e577c23e75c0d4ad940870e72 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-0122-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a1d7ab24d5ca718348f4ce3cda351553e48cd1f
| * | | | | JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-0122-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8d0970102f18e61a2fc7cf941267c9089d71c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Delete old target platforms and corresponding Orbit releasesMatthias Sohn2021-09-2927-1504/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We updated the baseline target platform to jgit-4.17 corresponding to Eclipse 4.17 (2020-09). Delete all target platforms older than this version and the corresponding Orbit releases. Change-Id: I93b2d8585bdc3c3312264d34657ceaf3f4a27bd5
* | | | | | Update tycho to 2.5.0 and target platform to jgit-4.17Matthias Sohn2021-09-291-62/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jgit-4.17 corresponds to Eclipse 2020-09, which is the first Eclipse version that required Java 11, and which is JGit's new baseline as of JGit 6.0. Remove pack200 which is deprecated in Java 11 and isn't supported by tycho 2.5.0 anymore. It was specified in JSR 200 (J2SE 1.5) [1], deprecated in JEP 336 (Java SE 11) [2] and removed in JEP 367 (Java SE 14) [3]. [1] https://www.jcp.org/en/jsr/detail?id=200 [2] https://openjdk.java.net/jeps/336 [3] https://openjdk.java.net/jeps/367 Change-Id: I12c196586397779d2be81d2374207703e3fc5dbf
* | | | | | Enable compiler option --releaseMatthias Sohn2021-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the compiler compiles against the public, supported and documented API for a specific VM version (here 11) [1]. This also means that we don't need EE descriptors in Eclipse anymore in order to ensure that only supported APIs of the selected Java version can be used. According to [2] if option --release is used --source and --target options can't be used. While we are at it also add default value for all new jdt core options added in Eclipse 4.21. [1] https://docs.oracle.com/en/java/javase/11/tools/javac.html [2] https://docs.oracle.com/en/java/javase/14/docs/specs/man/javac.html#option-release Change-Id: I852a5d7b0a3210751c15d79ec91915b4c01c41e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Bump minimum required Java version to 11Matthias Sohn2021-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 569917 Change-Id: Ifdcdb022a3f29321b4d10da1cc34acca68ed7b03 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Update maven pluginsMatthias Sohn2021-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - maven-enforcer-plugin 3.0.0 - maven-javadoc-plugin 3.3.1 - maven-pmd-plugin 3.15.0 - org.eclipse.cbi.maven.plugins:eclipse-jarsigner-plugin 1.3.2 - org.springframework.boot:spring-boot-maven-plugin 2.5.4 Change-Id: I377732b651f3718060c58ca48993e0c3ac79fa8b
* | | | | | Merge branch 'master' into nextMatthias Sohn2021-09-1335-702/+923
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | Update orbit to R20210825222808 for 2021-09Matthias Sohn2021-08-2633-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a98f2134d19c3495d7d39cccfd7cf6f07640bd5
| * | | | | Update Orbit to S20210817231813Matthias Sohn2021-08-2317-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and org.apache.ant to 1.10.11.v20210720-1445 Change-Id: Ic9c2f42628e47fffc99a07d591bc465b4e24b86e
| * | | | | Update orbit to I20210713220109Matthias Sohn2021-07-1633-186/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update - org.apache.commons.compress to 1.20.0.v20210713-192 - org.bouncycastle.bcpg to 1.69.0.v20210713-1924 - org.bouncycastle.bcpkix to 1.69.0.v20210713-1924 - org.bouncycastle.bcprov to 1.69.0.v20210713-1924 - add org.bouncycastle.bcutil 1.69.0.v20210713-1924 In bazel build don't expose bouncycastle to org.eclipse.jgit since it's not used there anymore since code depending on bouncycastle was moved to org.eclipse.jgit.gpg.bc. CQ: 21771 CQ: 23471 CQ: 23472 CQ: 23473 CQ: 23474 Change-Id: Id3d94c00c39bbc57e3f49a61150841249dc3985c
| * | | | | Update orbit to I20210711110031Matthias Sohn2021-07-1634-102/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update - assertj to 3.20.2.v20210706-1104 - hamcrest to 2.2.0.v20210711-0821 - classes which were in org.hamcrest.core 1.3 and org.hamcrest.library 1.3 were all moved to org.hamcrest in 2.2 - the annotation org.hamcrest.Factory was removed and is no longer needed - junit 4.13 requires hamcrest-core and hamcrest-library 1.3 therefore keep them in the target platform CQ: 23501 Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95
| * | | | | Update orbit to S20210705204906Matthias Sohn2021-07-0834-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4ec9f80a8a346fa8c709e58f8076372d14eca64
| * | | | | Update jetty to 9.4.43.v20210629Matthias Sohn2021-07-0817-339/+339
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ceea58cb0a04d041ca4e698e096a00ccd12bfc0
| * | | | | Update target platform to I20210626190330Thomas Wolf2021-07-0634-209/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update - com.google.gson to 2.8.7.v20210624-1215 - javaewah to 1.1.12.v20210622-2206 - org.apache.sshd.osgi to 2.7.0.v20210623-0618 - org.apache.sshd.sftp to 2.7.0.v20210623-0618 - org.tukaani.xz to 1.9.0.v20210624-1259 - Apache MINA sshd to 2.7.0 - Remove work-arounds for problems resolved upstream since 2.6.0, and adapt to upstream API changes. - update DEPENDENCIES. CQ: 23469 CQ: 23470 CQ: 23496 CQ: 23497 CQ: 23498 Bug: 574220 Change-Id: I898b216c3492f8488fbf25fa4b49f1250f86f3c8 Also-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Add 4.21 target platformMatthias Sohn2021-07-012-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88d32956fd7ad5c23aa395abd88f35359b519b79
| * | | | | Update 4.20 target platform to use final 4.20 releaseMatthias Sohn2021-07-013-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d6a1617a7713faf5186cfb5b2a084d0f1f9e63f
* | | | | | Merge branch 'master' into nextMatthias Sohn2021-06-2916-319/+319
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: searchForReuse might impact performance in large repositories Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Upgrade maven-dependency-plugin to 3.2.0 Upgrade jacoco-maven-plugin to 0.8.7 Upgrade maven-jxr-plugin to 3.1.1 Fix garbage collection failing to delete pack file Fix PathSuffixFilter: can decide only on full paths Update jetty to 9.4.42.v20210604 [sshd] Log the full KEX negotiation result [releng] japicmp: update last release version CONTRIBUTING: add explicit link to ECA CONTRIBUTING: Use standard markdown format Add Eclipse code of conduct and security policy Change-Id: I9e31cb6e22f5398db6e220f71693e87475c598bd
| * | | | | Update jetty to 9.4.42.v20210604Matthias Sohn2021-06-2116-319/+319
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0abae5686064ccfeb34e8af0d98471162036b00
* | | | | | Merge branch 'master' into nextMatthias Sohn2021-06-1532-383/+383
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (47 commits) Fix @since from commit 64d0aaa2 Prepare 5.13.0-SNAPSHOT builds Prepare 5.12.1-SNAPSHOT builds Teach independent negotiation (no pack file) using an option "wait-for-done" JGit v5.12.0.202106070339-r [license-check] Update list of project dependencies [errorprone] Fix warning InputStreamSlowMultibyteRead [errorprone] Make operator precedence explicit in OpenSshConfigFile Update jetty to 9.4.41.v20210516 Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r Update Orbit to R20210602031627 Prepare 5.12.0-SNAPSHOT builds Fixing visibility for HostEntry constructors. JGit v5.12.0.202106021050-rc1 Prepare 5.12.0-SNAPSHOT builds JGit v5.12.0.202106011439-rc1 Clarify operator precedence to fix errorprone error Prepare 5.12.0-SNAPSHOT builds Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926 ... Change-Id: I76a1f155201648a62df11a41a9e02d97f522d00f
| * | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-1422-33/+33
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
| * | | | Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-1322-33/+33
| | | | | | | | | | | | | | | | | | | | Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
| * | | | JGit v5.12.0.202106070339-rv5.12.0.202106070339-rMatthias Sohn2021-06-0722-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fbfea2c83f1ce83f75130cc97591547032f1104 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Update jetty to 9.4.41.v20210516Matthias Sohn2021-06-0716-319/+319
| | | | | | | | | | | | | | | | | | | | Change-Id: I98d569ce9a69c48c3c99b9b5f500d6419c943094
| * | | | Update Orbit to R20210602031627Matthias Sohn2021-06-0331-47/+47
| | | | | | | | | | | | | | | | | | | | Change-Id: I480093d9da393dae0c3b608762d38cba3db2f2b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-0322-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc72d3f3ac84b9c4055b95ec0093d877ffb09ab0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | JGit v5.12.0.202106021050-rc1v5.12.0.202106021050-rc1Matthias Sohn2021-06-0222-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I622ee049f14f37504ff4a062f03d6fc25465d0ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-0222-23/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I25e4efc9b40ae4e7168b37385445c73992c5beb0
| * | | | JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-0122-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieac1d02879defe0f4791062448d4efc328a2f652 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926Matthias Sohn2021-06-0131-94/+94
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87df882d4434c4fb107b8bd662ce63749078f1bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Merge branch 'master' into nextMatthias Sohn2021-05-1233-328/+498
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (34 commits) Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 LockFile: create OutputStream only when needed Add a cgit interoperability test for LockFile Add TemporaryBuffer.toString(int limit) LockFile: create OutputStream only when needed Prepare 5.12.0-SNAPSHOT builds JGit v5.12.0.202105051250-m2 Update jetty to 9.4.40.v20210413 [releng] Update eclipse-jarsigner-plugin to 1.3.1 Implement ours/theirs content conflict resolution ssh: ensure list is modifiable before using Iterator.remove(). Update orbit to S20210406213021 and add 4.20-staging target Fix typo in test method name Allow file mode conflicts in virtual base commit on recursive merge. sshd: don't lock the known_hosts files on reading Allow info messages in UsernamePasswordCredentialsProvider ssh config: do environment variable replacement sshd: implement server-sig-algs SSH extension (client side) Upgrade ecj to 3.25.0 ... Change-Id: Ibc39a9c4e431d15b67ab4a307241f47a7f3740a9