aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* JGit v6.10.0.202405282244-rc1v6.10.0.202405282244-rc1Matthias Sohn2024-05-2989-123/+123
* Merge branch 'master' into stable-6.10Matthias Sohn2024-05-2928-3503/+3669
|\
| * PatchApplier.Result.Error: mark fields finalMatthias Sohn2024-05-282-11/+9
| * Update tycho to 4.0.8Matthias Sohn2024-05-271-1/+1
| * Update to org.assertj:assertj-core:3.26.0Ed Merks2024-05-2719-3540/+3540
| * PatchApplier: Set a boolean on the result if conflict markers were addedPatrick Hiesel2024-05-272-8/+33
| * PatchApplier: Add test for conflict markers on a deleted filePatrick Hiesel2024-05-272-0/+20
| * Update org.apache.commons:commons-compress to 1.26.2Ed Merks2024-05-2622-36/+160
| * Merge changes I075ae7fa,I5fb12281,I420f2408,I71d1fb6c,I9013309b, ...Matthias Sohn2024-05-252-23/+23
| |\
| | * Update spring-boot-maven-plugin to 2.7.18Matthias Sohn2024-05-241-1/+1
| | * Update jacoco-maven-plugin to 0.8.12Matthias Sohn2024-05-241-1/+1
| | * Update maven-source-plugin to 3.3.1Matthias Sohn2024-05-241-1/+1
| | * Update maven-shade-plugin to 3.5.3Matthias Sohn2024-05-241-1/+1
| | * Update maven-pmd-plugin to 3.22.0Matthias Sohn2024-05-241-1/+1
| | * Update cyclonedx-maven-plugin to 2.8.0Matthias Sohn2024-05-242-2/+2
| | * Update build-helper-maven-plugin to 3.6.0Matthias Sohn2024-05-242-2/+2
| | * Update maven-site-plugin to 4.0.0-M14Matthias Sohn2024-05-242-2/+2
| | * Update maven-jar-plugin to 3.4.1Matthias Sohn2024-05-242-2/+2
| | * Update maven-install-plugin to 3.1.2Matthias Sohn2024-05-242-2/+2
| | * Update maven-deploy-plugin to 3.1.2Matthias Sohn2024-05-242-2/+2
| | * Update maven-artifact-plugin to 3.5.1Matthias Sohn2024-05-242-2/+2
| | * Update tycho to 4.0.7 and set minimum maven version to 3.9.0Matthias Sohn2024-05-241-2/+2
| | * Update git-commit-id-maven-plugin to 8.0.2Matthias Sohn2024-05-242-2/+2
| * | Remove version override of commons-codecThomas Wolf2024-05-252-2/+1
| |/
| * Update spotbugs-maven-plugin to 4.8.5.0Matthias Sohn2024-05-221-1/+1
| * Update japicmp-maven-plugin to 0.21.2Matthias Sohn2024-05-221-1/+1
| * Update maven-compiler-plugin to 3.13.0Matthias Sohn2024-05-221-1/+1
| * Update bytebuddy to 1.14.16Matthias Sohn2024-05-2219-3446/+3446
| * Update com.google.code.gson:gson to 2.11.0Ed Merks2024-05-2219-3444/+3444
* | Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-05-2289-123/+123
* | JGit v6.10.0.202405212237-m3v6.10.0.202405212237-m3Matthias Sohn2024-05-2289-123/+123
|/
* Update Apache commons-logging to 1.3.2Matthias Sohn2024-05-2120-38/+41
* Update jetty to 10.0.21Matthias Sohn2024-05-2019-151/+151
* Update Apache commons-io to 2.16.1Matthias Sohn2024-05-2019-35/+41
* Update Apache commons-codec to 1.17.0Matthias Sohn2024-05-2019-36/+42
* WalkFetchConnection: Remove marked packs on all function exitsIvan Frade2024-05-161-6/+15
* 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
* | Merge changes I12e4d0fd,I082ffb20Matthias Sohn2024-05-163-45/+6
|\ \
| * | Remove unused API problem filtersMatthias Sohn2024-05-141-19/+0
| * | Fix warning "Redundant specification of type arguments <Object>"Matthias Sohn2024-05-142-26/+6
* | | PatchApplierTest: remove unused importMatthias Sohn2024-05-151-1/+0
| |/ |/|
* | Merge "Allow applying a patch with conflicts"Matthias Sohn2024-05-158-21/+234
|\ \
| * | Allow applying a patch with conflictsPatrick Hiesel2024-05-148-21/+234
* | | Add 4.32 target platformMatthias Sohn2024-05-145-3/+316
| |/ |/|
* | Merge "sshd: fix IdentiesOnly if SSH agent is enabled and has keys"Matthias Sohn2024-05-141-6/+7
|\ \
| * | sshd: fix IdentiesOnly if SSH agent is enabled and has keysThomas Wolf2024-05-131-6/+7
* | | Update mina-sshd to 2.12.1Matthias Sohn2024-05-1318-51/+51
* | | Update byte-buddy to 1.14.15Matthias Sohn2024-05-1318-51/+51
* | | Update org.apache.commons:commons-compress to 1.26.1Matthias Sohn2024-05-1318-34/+34