aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* RebaseCommand: fix stopping on root commit conflictsThomas Wolf2024-01-282-5/+43
| | | | | | | | | If rebasing runs into a conflict when applying a root commit from an independent branch, there is no parent commit. Write an empty patch file in that case like C git does. Bug: jgit-6 Change-Id: I315313673d2abf29639d7d96c958d599961ba276 Signed-off-by: Thomas Wolf <twolf@apache.org>
* Improve handling of NFS stale handle errorsDariusz Luksza2024-01-281-1/+13
| | | | | | | | | | | | | Mark packfile as invalid when NFS stale handle error occurs. This should fix broken fetch operations when the repo is located on the NFS system and is GC'ed on a separate system (or process). Which may result in the index, pack or bitmap file being removed when they are accessed from the fetch operation. Bug: 573770 Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com> Change-Id: I70217bfb93bf7421ea2c1d74cbe4f15c76d9c098
* Fix handling of missing pack index fileDariusz Luksza2024-01-283-6/+6
| | | | | | | | | | | | | | | | | | | | As demonstrated in `UploadPackHandleDeletedPackFile.testV2IdxFileRemovedDuringUploadPack` the fetch operation will fail when the pack index file is removed. This is due to a wrapping of `FileNotFoundException` (which is a subclass of `IOExeption`) in an `IOException` at PackIndex L#68. This is then changing the behaviour of error handling in `Pack.file.getBitmapIndex()` where the `FileNotFoundException` is swallowed and allows the fetch process to continue. With FNFE being wrapped in IOE, this blows up and breaks the fetch operation. Simply rethrowing `FileNotFoundException` from `PackFile.open()` fixes the broken fetch operation. This will also mark the whole pack as invalid in the `IOException` handler in `Pack.idx()` method. Change-Id: Ibe321aa1af21d26500e1cb2eb3464cc99a6dbc62 Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
* CherryPick: add ability to customise cherry-picked commit messageDmitrii Naumenko2024-01-285-1/+309
| | | | | | | | | | | | | | | | | Originally I wanted to support a feature similar to `-x` options from https://git-scm.com/docs/git-cherry-pick#_options. The idea was to append original commit hash in this format: ``` my original commit message (cherry picked from commit 75355897dc28e9975afed028c1a6d8c6b97b2a3c) ``` This can be useful information in some integrations. I decided to make it in a more generic way and pass custom `CherryPickCommitMessageProvider` implementation. One of the two default implementations can append original commit hash Change-Id: Id664e8438b0b76c5cb9b58113887eec04aa6f611
* RawParseUtils: Add missing @since tag for new API methodMatthias Sohn2024-01-231-0/+1
| | | | | | This method was introduced in 8116f66b9c. Change-Id: Ifd3341a03464a1d7164c176cf3a6cf83f45a2747
* Silence API warning for new constantMatthias Sohn2024-01-231-19/+1
| | | | | | and remove unused API problem filters. Change-Id: Ia6f4fcc98b786e3e4b65f9e42cc60bbf6ca7c289
* [ssh] Bump Apache MINA sshd 2.11.0 -> 2.12.0Thomas Wolf2024-01-2021-141/+141
| | | | | | | | | | | This includes the upstream fix for CVE-2023-48795[1] ("strict KEX" protocol extension mitigating the "Terrapin attack"[2]) in JGit. [1] https://nvd.nist.gov/vuln/detail/CVE-2023-48795 [2] https://www.terrapin-attack.com/ Bug: jgit-16 Change-Id: Ie9aa5b903ea6795bd1511afea0bebdb537b56148 Signed-off-by: Thomas Wolf <twolf@apache.org>
* Merge branch 'stable-6.8'Matthias Sohn2024-01-2011-40/+448
|\ | | | | | | | | | | | | | | | | * stable-6.8: Introduce a PriorityQueue sorting RevCommits by commit timestamp Remove org.eclipse.jgit.benchmark/.factorypath Update jmh to 1.37 for org.eclipse.jgit.benchmark Change-Id: Ifdd88eed34be3a1f4897b468392fd86bbc3f3a64
| * Merge branch 'stable-6.7' into stable-6.8Matthias Sohn2024-01-2011-41/+449
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.7: Introduce a PriorityQueue sorting RevCommits by commit timestamp Remove org.eclipse.jgit.benchmark/.factorypath Update jmh to 1.37 for org.eclipse.jgit.benchmark Change-Id: I5d49a9dc7da17b83243229d4d8d3b9ee0a063e65
| | * Merge branch 'stable-6.6' into stable-6.7Matthias Sohn2024-01-2013-87/+463
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.6: Introduce a PriorityQueue sorting RevCommits by commit timestamp Remove org.eclipse.jgit.benchmark/.factorypath Update jmh to 1.37 for org.eclipse.jgit.benchmark Change-Id: I76ebca527e523f124bfe81c821169c790eddccb6
| | | * Introduce a PriorityQueue sorting RevCommits by commit timestampLuca Milanesio2024-01-1910-17/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DateRevQueue uses a tailor-made algorithm to keep RevCommits sorted by reversed commit timestamp, which has a O(n*n/2) complexity and caused the explosion of the Git fetch times to tens of seconds. The standard Java PriorityQueue provides a O(n*log(n)) complexity and scales much better with the increase of the number of RevCommits. Introduce a new implementation DateRevPriorityQueue of the DateRevQueue based on PriorityQueue. Enable usage of the new DateRevPriorityQueue implementation by setting the system property REVWALK_USE_PRIORITY_QUEUE=true. By default the old implementation DateRevQueue is used. Benchmark results: ``` (numCommits) (usePriorityQueue) Mode Cnt Score Error Units 5 true avgt 10 39,4 ± 6,1 ns/op 5 false avgt 10 14,1 ± 2,2 ns/op 10 true avgt 10 29,7 ± 3,5 ns/op 10 false avgt 10 13,2 ± 2,0 ns/op 50 true avgt 10 50,4 ± 5,3 ns/op 50 false avgt 10 18,6 ± 0,2 ns/op 100 true avgt 10 58,3 ± 5,0 ns/op 100 false avgt 10 20,5 ± 0,8 ns/op 500 true avgt 10 51,7 ± 2,6 ns/op 500 false avgt 10 43,3 ± 0,5 ns/op 1000 true avgt 10 49,2 ± 2,4 ns/op 1000 false avgt 10 62,7 ± 0,2 ns/op 5000 true avgt 10 48,8 ± 1,5 ns/op 5000 false avgt 10 228,3 ± 0,5 ns/op 10000 true avgt 10 44,2 ± 0,9 ns/op 10000 false avgt 10 377,6 ± 2,7 ns/op 50000 true avgt 10 50,3 ± 1,6 ns/op 50000 false avgt 10 637,0 ± 111,8 ns/op 100000 true avgt 10 61,8 ± 4,4 ns/op 100000 false avgt 10 965,1 ± 268,0 ns/op 500000 true avgt 10 127,2 ± 7,9 ns/op 500000 false avgt 10 9610,2 ± 184,8 ns/op ``` Memory allocation results: ``` Number of commits loaded: 850 000 Custom implementation: 378 245 120 Bytes Priority queue implementation: 340 495 616 Bytes ``` Bug: 580137 Change-Id: I8b33df6e9ee88933098ecc81ce32bdb189715041 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | * Remove org.eclipse.jgit.benchmark/.factorypathMatthias Sohn2024-01-191-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's outdated and seems to be unused. Change-Id: I4ac0f6d6427ee9f76a59296e991e4e03b25bcf05
| | | * Update jmh to 1.37 for org.eclipse.jgit.benchmarkMatthias Sohn2024-01-193-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and - fix org.eclipse.jgit.benchmark/.classpath Change-Id: I66f81228f17ede5732fa43aa693b4cfddb5a71f6
* | | | Add tests for handling pack files removal during fetchDariusz Luksza2024-01-181-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although this could sound like a corner case, it really can occur out there in the real world. Especially in the Gerrit world where the repositories could be GC'ed on a separate process or system. The `FileNotFoundException` seems to be handled correctly in `PackFile#doOpen` (line 671) and it will mark the pack as invalid. But triggering that code path was not an easy task. First of all, we need to add a new commit to the `master` branch of the test repository after `UploadPack` object is created. Secondly, in the refspec for fetch, commit id instead of "regular" refspec must be used. With both in place, we can see a warning log statement about deleted pack file. And the fetch succeeds! Also, tests for the removal of *.idx and *.bitmap files were added. This unveiled a corner for the *.idx file deletion while fetching, as the test will fail with "Unreachable pack index" IOException only when the HEAD commit is empty. Change-Id: If26c83f9b12993d1ab7d6bad6bd863c29520b062 Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
* | | | Merge "Remove invalid/unnecessary Maven settings"Matthias Sohn2024-01-163-42/+0
|\ \ \ \
| * | | | Remove invalid/unnecessary Maven settingsMichael Keppler2023-12-233-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove jgit.target POM and remove it from the module list. This was only necessary when the target file had to be referenced as an artifact. Meanwhile we reference it directly by its path, and can remove the Maven build around it. * Remove tycho configuration options that are no longer valid (resolved was removed very early, probably before 1.0; includePackedArtifacts was removed in 3.0). Also remove duplicate version specification. Change-Id: Ifa69065dd73bf586b8359541375e065f5f60aa03
* | | | | Merge "PackWriterBitmapPreparer: Set limit on excessive branch count"Ivan Frade2024-01-123-5/+88
|\ \ \ \ \
| * | | | | PackWriterBitmapPreparer: Set limit on excessive branch countJackson Toeniskoetter2024-01-123-5/+88
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are too many branches then the bitmap indexing selects only the tip commits of the least active branches to reduce the amount of bitmaps to load on request. This can still be a problem if the number of inactive branches rival or exceed the total number of commits selected for the active branches. Limit the number of branches that receive only-tip bitmaps. This reduces the memory pressure of loading all the bitmaps, and allows us to model the size of the bitmap index without considering the number of branches. Bitmaps are generated for branches in order of most recent commit, and follow these rules: * The first {@code DEFAULT_BITMAP_EXCESSIVE_BRANCH_COUNT} most active branches have full bitmap coverage. * The {@code DEFAULT_BITMAP_EXCESSIVE_BRANCH_COUNT} to {@code DEFAULT_BITMAP_EXCESSIVE_BRANCH_TIP_COUNT} most active branches have only the tip commit covered. * The remaining branches have no bitmap coverage. To prevent effecting existing repositories, the default value is set at Integer.MAX_VALUE. Change-Id: I7cc53c898cdc04953b95669be0b069543e10c6f8
* | | | | Update jna to 5.14.0Matthias Sohn2024-01-1218-52/+54
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie60f618fabd1c35815a7fe2775b7fe059baba8b4
* | | | | Merge "DfsInserter/PackParser: keep min size for index in the inserter"Ivan Frade2024-01-112-13/+26
|\ \ \ \ \
| * | | | | DfsInserter/PackParser: keep min size for index in the inserterIvan Frade2024-01-112-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both, inserter and packparser read the minimum size for the object size index. The writing is invoked from both classes but done only by the inserter. Let the inserter read and handle the conf. Do this in the constructor and allow override so some paths can hardcode a value. Change-Id: I890cadd29678a53738761f4b0ab13020d6353f3e
* | | | | | Merge branch 'stable-6.8'Matthias Sohn2024-01-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * stable-6.8: Silence API warnings Make sure ref to prune is in packed refs Checkout: better directory handling Change-Id: Ief6e4d6cd3fcea327f28c32643b8323f5d0c6936
| * | | | Merge branch 'stable-6.7' into stable-6.8Matthias Sohn2024-01-101-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.7: Silence API warnings Make sure ref to prune is in packed refs Checkout: better directory handling Change-Id: Ie8c433e14d025055aa6ce674d6d1220fe1354785
| | * | | Merge branch 'stable-6.6' into stable-6.7Matthias Sohn2024-01-102-1/+102
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.6: Silence API warnings Make sure ref to prune is in packed refs Checkout: better directory handling Change-Id: Id3b01c7a583d45b4e67e3f993006a5646f77a41d
| | | * | Merge branch 'stable-6.5' into stable-6.6Matthias Sohn2024-01-100-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.5: Checkout: better directory handling Change-Id: I1712191514b8c1b9ea048974376a6765ff7970c7
| | | | * \ Merge branch 'stable-6.4' into stable-6.5Matthias Sohn2024-01-100-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.4: Checkout: better directory handling Change-Id: I68e11fb06a354961f4146de51d326b69be5b69d3
| | | | | * \ Merge branch 'stable-6.3' into stable-6.4Matthias Sohn2024-01-100-0/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.3: Checkout: better directory handling Change-Id: Ie0fefa8afc07f638ee05a46d272db7b7b0f8d464
| | | | | | * \ Merge branch 'stable-6.2' into stable-6.3Matthias Sohn2024-01-100-0/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: Checkout: better directory handling Change-Id: Id27612578f822cabc1a38ad1f8e859ae354045a9
| | | | | | | * \ Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2024-01-100-0/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Checkout: better directory handling Change-Id: I2f8e5410f4962d38bc6e822b5cda42df68aef32b
| | | | | | | | * \ Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2024-01-100-0/+0
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Checkout: better directory handling Change-Id: Ide9fb318b5fe413d73d73a19943c6dacdcf07f3d
| | | | | | | | | * \ Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2024-01-100-0/+0
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Checkout: better directory handling Revert commit 170244d05977491271a1cc234583d2e5ba75145d "Checkout: better directory handling" which is the downport of the original fix Ie12864c54c9f901a2ccee7caddec73027f353111 which was done on stable-6.6. Merging this up to stable-6.6 would be a lot of work and these branches aren't maintained anymore hence revert this change here. This way the fix is available on stable-5.13 for those who still need Java 8 and everybody else should upgrade to 6.6.1 or higher. Change-Id: Iffe50a5e62c6655814265d9cc6c5c2996baa1a31
| | | | | | | | | | * | Checkout: better directory handlingThomas Wolf2023-10-2218-142/+1061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the upstream security fix to downstream stable-5.13 branch. (cherry picked from commit 9072103f3b3cf64dd12ad2949836ab98f62dabf1) When checking out a file into the working tree ensure that all parent directories of the file below the working tree root are actually directories and do exist before we try to create the file. When multiple files are to be checked out (or even a whole tree), this may check the same directories over and over again. Asking the file system every time for file attributes is a potentially expensive operation. As a remedy, introduce an in-memory cache of directory states for a particular check-out operation. Apply the same fix also in the ResolveMerger, which may also check out files, and also in the PatchApplier. In PatchApplier, also validate paths. Change-Id: Ie12864c54c9f901a2ccee7caddec73027f353111 Signed-off-by: Thomas Wolf <twolf@apache.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | | | | Silence API warningsMatthias Sohn2024-01-081-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44084c45ed2c5e642021d1de4f37af769e4b317f
| | | * | | | | | | | | Make sure ref to prune is in packed refsFabio Ponciroli2023-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RefDirectory:pack might raise an NPE when deleting loose refs as final part of the RefDirectory.pack(). This is what the code does: 1) packed ref update: update the list of refs which will be persisted in packed-refs 2) persit packed-refs: flush on file the refs computed in #1 3) prune loose refs: prune loose refs that have been packed in #2 The code correctly locks the packed-refs file during phases 1 to 3. However, it makes the wrong assumption of considering the loose refs set as immutable between phases 1 and 3. The number and values of loose refs on the filesystem can mutate at any time whilst the RefDirectory.pack() is in progress. Assuming the contrary can lead to an NPE when retrieving refs from the mutable loose refs list during phase #3. Make sure that the ref is not null before dereferencing its object-id value. Bug: jgit-4 Change-Id: I2cd01f8a880f3c6561ad978a389ec2db45b6018b
* | | | | | | | | | | | Merge "FooterLines: handle extraction from messages without headers"Ivan Frade2024-01-093-8/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | FooterLines: handle extraction from messages without headersNitzan Gur-Furman2024-01-093-8/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, long subjects of messages with no headers were treated as headers, and therefore were skipped. In a message of the form `<long subject>\n\n<footers>`, the footers would then get parsed as a message, meaning no footers were returned. After this change, the first lines are skipped only if they match any of the known headers. The first line ofter the optional headers is then assumed to be the subject line. `FooterLineTest` had a few test cases for extracting footers from messages with no headers. However, there were all with short messages, so the "skip this line" logic in `RawParseUtils` was never triggered. Added test case to catch this issue. Change-Id: I971a1dddf1a9aea094360c3c8fc3b9a8b011bbf9 Issue: Google b/287891316
* | | | | | | | | | | | Update maven pluginsMatthias Sohn2023-12-231-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - com.github.siom79.japicmp:japicmp-maven-plugin to 0.18.3 - com.github.spotbugs:spotbugs-maven-plugin to 4.8.2.0 - io.github.git-commit-id:git-commit-id-maven-plugin to 7.0.0 - org.apache.maven.plugins:maven-clean-plugin to 3.3.2 - org.apache.maven.plugins:maven-compiler-plugin to 3.12.0 - org.apache.maven.plugins:maven-dependency-plugin to 3.6.1 - org.apache.maven.plugins:maven-enforcer-plugin to 3.4.1 - org.apache.maven.plugins:maven-javadoc-plugin to 3.6.3 - org.apache.maven.plugins:maven-jxr-plugin to 3.3.1 - org.apache.maven.plugins:maven-pmd-plugin to 3.21.2 - org.apache.maven.plugins:maven-project-info-reports-plugin to 3.5.1 - org.apache.maven.plugins:maven-shade-plugin to 3.5.1 - org.apache.maven.plugins:maven-site-plugin to 4.0.0-M13 - org.apache.maven.plugins:maven-surefire-plugin to 3.2.3 - org.codehaus.mojo:build-helper-maven-plugin to 3.5.0 - org.cyclonedx:cyclonedx-maven-plugin to 2.7.10 - org.eclipse.cbi.maven.plugins:eclipse-jarsigner-plugin to 1.4.3 - org.jacoco:jacoco-maven-plugin to 0.8.11 Change-Id: Ie146085f567f0bcfe0124627939382fe5a764e6c
* | | | | | | | | | | | Update org.eclipse.dash:license-tool-plugin to 1.1.0Matthias Sohn2023-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I039e10fc6790d54c30cfd85a53c05604351996e0
* | | | | | | | | | | | Enable using slf4j 2.xMatthias Sohn2023-12-229-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse platform moved to sfl4j 2.x. Hence relax version constraint so that both 1.7 and 2.x are allowed. Bug: egit-5 Change-Id: Ie0b00310d8f3f2553457c8668a38978a67b8febe
* | | | | | | | | | | | Update Tycho to 4.0.4Matthias Sohn2023-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d087b5a62ab3d474d894a2276572156c14dad4e
* | | | | | | | | | | | Update mockito to 5.8.0Matthias Sohn2023-12-2218-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70d33b7af25fcb4754fb048dd9054eef7356f00c
* | | | | | | | | | | | Add 4.31 target platform and update orbit to 4.31Matthias Sohn2023-12-2220-48/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update bytebuddy to 1.14.10. Change-Id: I145776a31d806f7e6dcc90263650109b3eb19067
* | | | | | | | | | | | Update ecj to 3.36.0Matthias Sohn2023-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I803de19e8086239ebbae9877121946fdddfbaa89
* | | | | | | | | | | | Renormalize line endings based on .gitattributesMatthias Sohn2023-12-229-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes line endings of all text files to use LF in the repository. Change-Id: I4df6fd7aaf9db9cdaa953a0d1062981b4612056c
* | | | | | | | | | | | Configure .gitattributes to manage line endingsMatthias Sohn2023-12-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark test resources as binary to prevent line ending normalization Some of the test resources are used to test handling of line endings in JGit. Change-Id: Idd9ba604945797d1cd1f3af1a1987aee3188e1d6
* | | | | | | | | | | | Normalize line endings to LF for all text filesMatthias Sohn2023-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69753494e4c7db4c0a8e6eca3b3e63d3ff561117
* | | | | | | | | | | | Merge "Remove invalid spotbugs configuration"Matthias Sohn2023-12-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove invalid spotbugs configurationMichael Keppler2023-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * findbugsXmlOutput was renamed to spotbugsXmlOutput long ago * spotbugsXmlOutput has a default value of true and is deprecated, therefore removing the entire line seems most reasonable See https://spotbugs.github.io/spotbugs-maven-plugin/check-mojo.html#spotbugsXmlOutput Change-Id: I83c0bbce1fb3622accb13978319b4313b0121655
* | | | | | | | | | | | | Merge "Fix PMD plugin configuration"Matthias Sohn2023-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix PMD plugin configurationMichael Keppler2023-12-171-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration element has been renamed in release 3.18, see https://github.com/apache/maven-pmd-plugin/releases/tag/maven-pmd-plugin-3.18.0 Change-Id: Ia6ec6992c4348d77d4b61f34190a57775cc30cec