summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next'Matthias Sohn2024-06-04179-801/+936
|\
| * Bump jetty version to 12.0.9 and servlet-api to 6.0nextDavid Ostrovsky2024-05-0855-367/+490
| * Bump jetty version to 11.0.20David Ostrovsky2024-05-0282-481/+505
| * Update minimum Java version to 17Matthias Sohn2024-05-0289-170/+144
| * Merge branch 'master' into nextMatthias Sohn2024-05-0284-289/+331
| |\
| * \ Merge branch 'master' into nextMatthias Sohn2024-04-2672-1084/+2839
| |\ \
| * \ \ Merge branch 'master' into nextMatthias Sohn2024-02-211129-7952/+2038373
| |\ \ \
| * \ \ \ Merge branch 'master' into nextMatthias Sohn2022-07-06295-2412/+16694
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into nextMatthias Sohn2021-12-313-5/+62
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into nextThomas Wolf2021-12-2719-46/+801
| |\ \ \ \ \ \
| * | | | | | | Prepare 7.0.0-SNAPSHOT buildsMatthias Sohn2021-12-0491-522/+522
| * | | | | | | Merge branch 'master' into nextMatthias Sohn2021-12-04449-4081/+12155
| |\ \ \ \ \ \ \
* | | | | | | | | Prepare 7.0.0-SNAPSHOT buildsMatthias Sohn2024-06-0489-534/+534
* | | | | | | | | Merge branch 'stable-6.10'Matthias Sohn2024-06-0489-535/+535
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prepare 6.10.1-SNAPSHOT buildsMatthias Sohn2024-06-0489-534/+534
| * | | | | | | | | JGit v6.10.0.202406032230-rv6.10.0.202406032230-rMatthias Sohn2024-06-0489-123/+123
| * | | | | | | | | JGit v6.10.0.202406032110-rv6.10.0.202406032110-rMatthias Sohn2024-06-0389-123/+123
| * | | | | | | | | Prepare 6.10.0-SNAPSHOT buildsMatthias Sohn2024-06-0289-123/+123
| * | | | | | | | | JGit v6.10.0.202405290101-rc1v6.10.0.202405290101-rc1Matthias Sohn2024-05-2989-123/+123
| * | | | | | | | | Revert "Update tycho to 4.0.8"Matthias Sohn2024-05-291-1/+1
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
* | | | | | | | | | | CommitGraphWriter: use ANY_DIFF instead of idEquals inside next()Ivan Frade2024-05-312-3/+10
* | | | | | | | | | | CommitGraphWriter: Move path diff calculation to its own classIvan Frade2024-05-312-33/+63
* | | | | | | | | | | RepoCommand: Copy manifest upstream into .gitmodules ref fieldIvan Frade2024-05-304-0/+137
* | | | | | | | | | | RepoProject: read the "upstream" attribute of a projectIvan Frade2024-05-303-0/+67
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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
|/ / / / / / / / / /