aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JGit v6.10.0.202406032110-rv6.10.0.202406032110-rMatthias Sohn2024-06-0389-123/+123
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I3128b2e4bbbed97adde90f7a47e15175e63e97f5
* Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-06-0289-123/+123
| | | | Change-Id: I64f6d6a0599cbab462dca236c00e6f3314b2a810
* JGit v6.10.0.202405290101-rc1v6.10.0.202405290101-rc1Matthias Sohn2024-05-2989-123/+123
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ie3d08213e00fcfe1fc34a39021dd99f27e0abc1f
* Revert "Update tycho to 4.0.8"Matthias Sohn2024-05-291-1/+1
| | | | | | This reverts commit 76ce6d91a2e07fdfcbfc8df6970c9e98a98e36a0. Change-Id: I1f8df6562304c64b192da11538c02230f0084a43
* JGit v6.10.0.202405282244-rc1v6.10.0.202405282244-rc1Matthias Sohn2024-05-2989-123/+123
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ia525790e0b4c9011b29768d2b9727cb48b21ba84
* Merge branch 'master' into stable-6.10Matthias Sohn2024-05-2928-3503/+3669
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: PatchApplier.Result.Error: mark fields final Update tycho to 4.0.8 Update to org.assertj:assertj-core:3.26.0 PatchApplier: Set a boolean on the result if conflict markers were added PatchApplier: Add test for conflict markers on a deleted file Update org.apache.commons:commons-compress to 1.26.2 Remove version override of commons-codec Update spring-boot-maven-plugin to 2.7.18 Update jacoco-maven-plugin to 0.8.12 Update maven-source-plugin to 3.3.1 Update maven-shade-plugin to 3.5.3 Update maven-pmd-plugin to 3.22.0 Update cyclonedx-maven-plugin to 2.8.0 Update build-helper-maven-plugin to 3.6.0 Update maven-site-plugin to 4.0.0-M14 Update maven-jar-plugin to 3.4.1 Update maven-install-plugin to 3.1.2 Update maven-deploy-plugin to 3.1.2 Update maven-artifact-plugin to 3.5.1 Update tycho to 4.0.7 and set minimum maven version to 3.9.0 Update git-commit-id-maven-plugin to 8.0.2 Update spotbugs-maven-plugin to 4.8.5.0 Update japicmp-maven-plugin to 0.21.2 Update maven-compiler-plugin to 3.13.0 Update bytebuddy to 1.14.16 Update com.google.code.gson:gson to 2.11.0 Change-Id: I8245cb32a27329dfdd05e6cb80be846ecf62b800
| * PatchApplier.Result.Error: mark fields finalMatthias Sohn2024-05-282-11/+9
| | | | | | | | | | | | | | Fields of an Error instance shouldn't be modifiable after its creation. Adapt tests which were setting hh to null to skip asserting it. Change-Id: I0f55c1d5cd529aa510029054e6f05bd2637d1bca
| * Update tycho to 4.0.8Matthias Sohn2024-05-271-1/+1
| | | | | | | | Change-Id: Idc4c95e643ea46c2b2e33f9a60b0477185429588
| * Update to org.assertj:assertj-core:3.26.0Ed Merks2024-05-2719-3540/+3540
| | | | | | | | Change-Id: I3f0131cd168ba9c814341416198f955a6d5b340f
| * PatchApplier: Set a boolean on the result if conflict markers were addedPatrick Hiesel2024-05-272-8/+33
| | | | | | | | | | | | | | This will let callers show a different error message or mark the state as conflicting. Change-Id: Id8eea614b6b8d54c62b49ffbac90599e6f4c5efa
| * PatchApplier: Add test for conflict markers on a deleted filePatrick Hiesel2024-05-272-0/+20
| | | | | | | | | | | | | | | | For deleted files, we want to keep erroring out even if conflicts are allowed for the apply patch logic. The resulting file would otherwise only consist of the patch. Change-Id: I18defa627ad2223a3a917d2b0ee4189396732533
| * Update org.apache.commons:commons-compress to 1.26.2Ed Merks2024-05-2622-36/+160
| | | | | | | | | | | | | | commons-compress 1.26.0 added commons-lang3 as a transitive dependency. Hence add it to the target platform, p2 repository and bazel build. Change-Id: Iac5ca095d3e93176e21364a66a29c5e533168e16
| * Merge changes I075ae7fa,I5fb12281,I420f2408,I71d1fb6c,I9013309b, ...Matthias Sohn2024-05-252-23/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update spring-boot-maven-plugin to 2.7.18 Update jacoco-maven-plugin to 0.8.12 Update maven-source-plugin to 3.3.1 Update maven-shade-plugin to 3.5.3 Update maven-pmd-plugin to 3.22.0 Update cyclonedx-maven-plugin to 2.8.0 Update build-helper-maven-plugin to 3.6.0 Update maven-site-plugin to 4.0.0-M14 Update maven-jar-plugin to 3.4.1 Update maven-install-plugin to 3.1.2 Update maven-deploy-plugin to 3.1.2 Update maven-artifact-plugin to 3.5.1 Update tycho to 4.0.7 and set minimum maven version to 3.9.0 Update git-commit-id-maven-plugin to 8.0.2
| | * Update spring-boot-maven-plugin to 2.7.18Matthias Sohn2024-05-241-1/+1
| | | | | | | | | | | | Change-Id: I075ae7fa40e6c883897c8a7ec5ce422b4e808ef6
| | * Update jacoco-maven-plugin to 0.8.12Matthias Sohn2024-05-241-1/+1
| | | | | | | | | | | | Change-Id: I5fb1228199159c82d426dcb22aabd39411f381c7
| | * Update maven-source-plugin to 3.3.1Matthias Sohn2024-05-241-1/+1
| | | | | | | | | | | | Change-Id: I420f24086948b28328f7120c1b22f4de33da0e78
| | * Update maven-shade-plugin to 3.5.3Matthias Sohn2024-05-241-1/+1
| | | | | | | | | | | | Change-Id: I71d1fb6c6e7ce8ab121e77ffbc05b14fd47879f1
| | * Update maven-pmd-plugin to 3.22.0Matthias Sohn2024-05-241-1/+1
| | | | | | | | | | | | Change-Id: I9013309b218fafec7d1e70c98fb32a683ecc7a0b
| | * Update cyclonedx-maven-plugin to 2.8.0Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: If26a3d7f26d3e46bf22a23f590cd289baaaa167f
| | * Update build-helper-maven-plugin to 3.6.0Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I3bb8f751c8c7ab630eb8b4eab3e24f354d1a10e7
| | * Update maven-site-plugin to 4.0.0-M14Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I0487adb0d3c7fef0841e3fb200d9df78ee27e9e4
| | * Update maven-jar-plugin to 3.4.1Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I695e424a44cac2119656ceacfbe1a7abb5f4d7b5
| | * Update maven-install-plugin to 3.1.2Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: Id322cef408ce9ddac3febc8963794f5958c06d3e
| | * Update maven-deploy-plugin to 3.1.2Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I60d5aae001583671a01a8c38e98e36a7293b34eb
| | * Update maven-artifact-plugin to 3.5.1Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I845e101876543a6b5fb197eefa7e73029b9e4809
| | * Update tycho to 4.0.7 and set minimum maven version to 3.9.0Matthias Sohn2024-05-241-2/+2
| | | | | | | | | | | | | | | | | | which is required by tycho 4.0.7. Change-Id: I7ed1bda89c8712a0a1bb47bdf77e4b7f9f66c039
| | * Update git-commit-id-maven-plugin to 8.0.2Matthias Sohn2024-05-242-2/+2
| | | | | | | | | | | | Change-Id: I280b649a9d4bcaf829c7949a99c129d107eec822
| * | Remove version override of commons-codecThomas Wolf2024-05-252-2/+1
| |/ | | | | | | | | | | | | | | | | | | Since commit 8164155b the commons-codec version is pinned in the parent POM's dependency management. Remove the version specification in org.eclipse.jgit/pom.xml. Also give the package-import in the MANIFEST.MF an upper bound. Change-Id: I2785a87cf77d6df110f57a0cb939dbc9772b8ee6 Signed-off-by: Thomas Wolf <twolf@apache.org>
| * Update spotbugs-maven-plugin to 4.8.5.0Matthias Sohn2024-05-221-1/+1
| | | | | | | | Change-Id: Icc7d5840536dd9f4ef4137c8e5ec35f687c3de4a
| * Update japicmp-maven-plugin to 0.21.2Matthias Sohn2024-05-221-1/+1
| | | | | | | | Change-Id: Ifcab62d1ed7837258c257cac3a862668fe9db923
| * Update maven-compiler-plugin to 3.13.0Matthias Sohn2024-05-221-1/+1
| | | | | | | | Change-Id: I282498fee64bcfb542a063413b55821efc77302b
| * Update bytebuddy to 1.14.16Matthias Sohn2024-05-2219-3446/+3446
| | | | | | | | Change-Id: Iaf958d05f31cd03d1f4d7ba64610abdee85bf63d
| * Update com.google.code.gson:gson to 2.11.0Ed Merks2024-05-2219-3444/+3444
| | | | | | | | Change-Id: Ibbd8e1675e3b8c67af0e13de16c470db108d3a0f
* | Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-05-2289-123/+123
| | | | | | | | Change-Id: I5b6d5c23d504fac386ae04c42b735152fbbcd7ae
* | JGit v6.10.0.202405212237-m3v6.10.0.202405212237-m3Matthias Sohn2024-05-2289-123/+123
|/ | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I4efb1066ee4146d0455c39cc07879533b8933e43
* Update Apache commons-logging to 1.3.2Matthias Sohn2024-05-2120-38/+41
| | | | | | | Stop bundling the source bundle since the upstream artifact doesn't have a valid OSGi manifest. Change-Id: I819685f7f6d6ebcf8f179dd3133e7fc809bba392
* Update jetty to 10.0.21Matthias Sohn2024-05-2019-151/+151
| | | | Change-Id: I1d7bf0fb66d329aad24b512bed082e3f74a5b2a8
* Update Apache commons-io to 2.16.1Matthias Sohn2024-05-2019-35/+41
| | | | Change-Id: Ia8dec10b4d487611a9cad2268764fa53fcd35c47
* Update Apache commons-codec to 1.17.0Matthias Sohn2024-05-2019-36/+42
| | | | Change-Id: Ife807c38cd163a75a70e91610127b01807be2f68
* WalkFetchConnection: Remove marked packs on all function exitsIvan Frade2024-05-161-6/+15
| | | | | | | | | | | | | [1] replaces Iterator.remove() with a list of "toRemove" that gets processed when returning at the end. There are two others returns in the function where the list is not processed. Let the method report the broken packages and wrap it so the caller can clean them up in any case. [1] https://review.gerrithub.io/c/eclipse-jgit/jgit/+/1194812 Change-Id: I1ffb7829039f644df03b0b3ea1e5d10408ce19b7
* Merge "Do not use ArrayList when there will be deletions"Ivan Frade2024-05-163-27/+30
|\
| * Do not use ArrayList when there will be deletionsjackdt@google.com2024-05-163-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gerrithub.io/c/eclipse-jgit/jgit/+/1194015, LinkedList was replaced with ArrayList in DfsReader and WalkFetchConnection. In this case, the Iterator.remove() method of List is called, which is an O(n) operation for ArrayList. This results in an O(n^2) algorithm. Instead of reverting to LinkedList, use a HashSet and LinkedHashmap instead. This maintains O(1) removal, and is less likely to be treated as an antipattern than LinkedList. A likely innocuous usage of Iterator.remove() in UnionInputStream was also fixed. Change-Id: I57d884440c726b2fc80c1b8b2bec9bd7e2e6e3fe
* | Merge changes I12e4d0fd,I082ffb20Matthias Sohn2024-05-163-45/+6
|\ \ | | | | | | | | | | | | | | | * changes: Remove unused API problem filters Fix warning "Redundant specification of type arguments <Object>"
| * | Remove unused API problem filtersMatthias Sohn2024-05-141-19/+0
| | | | | | | | | | | | Change-Id: I12e4d0fd48b5b7420d421874c8d63caed9628266
| * | Fix warning "Redundant specification of type arguments <Object>"Matthias Sohn2024-05-142-26/+6
| | | | | | | | | | | | | | | | | | Use a lambda to fix this and make the code easier to read. Change-Id: I082ffb2073f86d21deb4b51a24e53de9371b765e
* | | PatchApplierTest: remove unused importMatthias Sohn2024-05-151-1/+0
| |/ |/| | | | | Change-Id: Ie3ac82a8160c605e27ee3167e3640cd76b1b2a76
* | Merge "Allow applying a patch with conflicts"Matthias Sohn2024-05-158-21/+234
|\ \
| * | Allow applying a patch with conflictsPatrick Hiesel2024-05-148-21/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some settings, we want to let users apply a patch that does not cleanly apply and add conflict markers. In Gerrit, this is useful when cherry picking (via Git patches) from one host to another. This commit takes a simple approach: If a hunk doesn't apply, go to the pre-image line, treat all lines in pre-image length as left side of the conflict and all context and newly added lines as right side of the conflict. Change-Id: I01411d7a32b3f3207097b26231909aae6b835650
* | | Add 4.32 target platformMatthias Sohn2024-05-145-3/+316
| |/ |/| | | | | | | | | | | | | and - add orbit-4.32 - update objenesis to 3.4 Change-Id: Ia9df427eb3c97f867caaffbc92674fb750433aad
* | Merge "sshd: fix IdentiesOnly if SSH agent is enabled and has keys"Matthias Sohn2024-05-141-6/+7
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 11:29:24 +0000