summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JGit v6.6.1.202309021850-rv6.6.1.202309021850-rMatthias Sohn2023-09-0391-125/+125
| | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I4f173dc9d634e0c9f31305961400b6b35a0a332f
* Checkout: better directory handlingThomas Wolf2023-09-0318-149/+1044
| | | | | | | | | | | | | | | | | | | | 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>
* Merge branch 'stable-6.5' into stable-6.6Matthias Sohn2023-08-033-6/+35
|\ | | | | | | | | | | | | | | | | | | | | * stable-6.5: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: Id2e49252a9dc268210c9439848e77604885371aa
| * Merge branch 'stable-6.4' into stable-6.5Matthias Sohn2023-08-033-6/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.4: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: Idb6dd6160e023673e3650653a15f6b1c540de96e
| | * Merge branch 'stable-6.3' into stable-6.4Matthias Sohn2023-08-033-6/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.3: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: I0bccc36d9cc9a36f1be9b1562df35ce3a0e95eee
| | | * Merge branch 'stable-6.2' into stable-6.3Matthias Sohn2023-08-033-6/+35
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: I589ed444b5cbfc5b073cac91323e2cc97ab98087
| | | | * Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2023-08-033-6/+35
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: I5b16c3b613a95b7f28c8f6ac0b20c4c593759cea
| | | | | * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2023-08-033-6/+35
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: Ib08037f6055dac1776e38cfb4ff8c88a50ad3e60
| | | | | | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2023-08-033-6/+35
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Add verification in GcKeepFilesTest that bitmaps are generated Express the explicit intention of creating bitmaps in GC GC: prune all packfiles after the loosen phase Prepare 5.13.3-SNAPSHOT builds JGit v5.13.2.202306221912-r Change-Id: I1f50995d9d9c592ec0e02a04e0e409440b49f9f3
| | | | | | | * Add verification in GcKeepFilesTest that bitmaps are generatedLuca Milanesio2023-07-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packfiles with the .keep extensions are meant to prevent a packfile from being processed or removed during GC. From the point of view of the GC process then, the associated packfile should be completely transparent: - it should not included in the repacked file - it should not pruned - its objects should be left untouched, even if unreachable - the GC process, including the bitmap generation should continue as usual, as the the packfiles with .keep file did not exist Add one explicit test for making sure that the management of .keep file is also transparent to the generation of bitmaps, which are still generated if a .keep file exists. Bug: 582039 Change-Id: I14f6adc3f961c606fbc617e51ea6ed6e2ef8604f
| | | | | | | * Express the explicit intention of creating bitmaps in GCLuca Milanesio2023-07-052-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an explicit flag to PackWriter for allowing the GC.repack() phase to explicitly generate bitmaps only for the heads packfile and not for the others. Previously the bitmap generation was conditioned to the presence of object ids exclusion from the PackWriter. The introduction of the bitmap generation in the PackWriter done in Icdb0cdd66 has accidentally made the .keep files not completely transparent, because their presence have disabled the generation of the bitmap index, even if the generation of bitmaps is enabled. This bug has been an accidental consequence of the intention of the bitmap generator to avoid generating bitmaps for the non-heads packfile, however the implementation done by Colby decided to use the excludeInPacks variable (see [1]) which is unfortunately also used for excluding the packfiles having an associated .keep file (see [2]). [1] https://git.eclipse.org/r/c/jgit/jgit/+/7940/18/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java#1617 [2] https://git.eclipse.org/r/plugins/gitiles/jgit/jgit/+/dafcb8f6db82b899c917832768f1c240d273190c/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/GC.java#506 Bug: 582039 Change-Id: Id722e68d9ff4ac24e73bf765ab11017586b6766e
| | | | | | | * GC: prune all packfiles after the loosen phaseLuca Milanesio2023-07-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loosening the objects inside the packfiles to be pruned, make sure that the packfile list is stable and prune all the files after the loosening is done. This prevents a series of exceptions previously thrown when loosening the packfiles, due to the too early pruning of the packfiles that were still in the pack list. Bug: 581532 Change-Id: I776776e2e083f1fa749d53f965bf50f919823b4f
| | | | | | | * Prepare 5.13.3-SNAPSHOT buildsMatthias Sohn2023-06-2290-503/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02b9388c8bc1c266bb29b4502504d137dd42142f
| | | | | | | * JGit v5.13.2.202306221912-rv5.13.2.202306221912-rMatthias Sohn2023-06-2288-121/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Id0ee779fba85a6d5557f6319969adb2c74feebcf
* | | | | | | | Update to Tycho 4.0.1Matthias Sohn2023-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tycho 4.0.0-SNAPSHOT is no longer available and it's a bad practice to depend on any snapshot version (we had to since this was the only way to get gpg signing to work in time for releasing 6.6.0). Change-Id: I1d4af5f69965b4cad50b379fd81f6f442b38c8d0
* | | | | | | | Update Orbit to R20230531010532 for 2023-06Matthias Sohn2023-06-0925-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I844efc4bec153931f0a7b3c694bade4f5b166295
* | | | | | | | Merge "Merge branch 'stable-6.5' into stable-6.6" into stable-6.6Matthias Sohn2023-06-080-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'stable-6.5' into stable-6.6Luca Milanesio2023-06-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.5: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: Ia2f6f41f27ab430c31871a2cf2cd99dfcbfd9b61 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | * | | | | | | Merge branch 'stable-6.4' into stable-6.5Luca Milanesio2023-06-081-16/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.4: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: I7d922a92b7674723cbf6a93fb7c9bc5c0cdb8206 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | * | | | | | Merge branch 'stable-6.3' into stable-6.4Luca Milanesio2023-06-081-16/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.3: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: I33049e70595f097a66e8f4a63b3d8d1c147e878e Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | * | | | | Merge branch 'stable-6.2' into stable-6.3Luca Milanesio2023-06-081-16/+1
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: I70db1bc8529eb6a66610946946da5447a578bffa Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | * | | | Merge branch 'stable-6.1' into stable-6.2Luca Milanesio2023-06-081-16/+1
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: I1a98e293ef10917b2d8ad64e88be9e82c7bcf693 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | * | | Merge branch 'stable-6.0' into stable-6.1Luca Milanesio2023-06-081-16/+1
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: Idc0d1f8ab4524868b7e9754799f70acc1d24f2cb Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | | * | Merge branch 'stable-5.13' into stable-6.0Luca Milanesio2023-06-081-16/+1
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Revert "RefDirectory: Throw exception if CAS of packed ref list fails" Change-Id: I883b21b00317cc6d9951a8a5f9505078ddd2a3a7 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | | | * Revert "RefDirectory: Throw exception if CAS of packed ref list fails"Martin Fick2023-06-071-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9c33f7364d41956240818ba12d8b79d5ea846162. Reason for revert: This change was based on the false claim that the packedrefs file lock is held while the CAS is being done, but it is actually released before the CAS (the in memory lock is still held, however that does not prevent external actors from updating the packedrefs files and then another thread from subsequently re-reading it and updating the in memory packedRefList). Although reverting this change can cause the CAS to fail, it should not actually matter since the failure would indicate that another thread has already updated the in memory packedRefList to either the same version this thread was trying to update it too, or to a more recent version. Either way, failing the CAS is then appropriate and should not be problematic. Although this change reverts the code in the RefDirectory class, it keeps the "improvements" to the test so that it continues to pass reliably. The reason for the quotes around the word "improvements" is because I believe the test alteration actually dramatically changes the intent of the test, and that the original intent of the test is untestable with the GC and RefDirectory classes as is. Bug: 582044 Change-Id: I3acee7527bb542996dcdfaddfb2bdb45ec444db5 Signed-off-by: Martin Fick <quic_mfick@quicinc.com> (cherry picked from commit c5617711a1b4d5d0807cc7eed702b78d114d46b3)
* | | | | | | | | Bazel: Fix remote build execution for Java 17David Ostrovsky2023-05-312-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bazel build and test with remote17 configuration was actually executed locally, and not remotely. Rename remote configuration setting for Java 11 from remote to remote11 and derive the common remote configuration settings for remote11 and remote17 configurations. Also remove deprecated --host_javabase and --javabase options. Test Plan: Verify that the remote build for Java 17 is actually executed remotely: $ bazel test --config=remote17 --remote_instance_name=$PROJECT_NAME \ org.eclipse.jgit.test/... Change-Id: I10ad8c1d28c92fed9e465c2d36770ed4fb2940c3
* | | | | | | | | Bump bazel vesion to 6.2.0David Ostrovsky2023-05-313-8/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also demote severity level for bug pattern: PreferredInterfaceType, aka MutableConstantField: [1] from error to warning. Also fix DoubleBraceInitialization error prone bug pattern [2]. [1] https://errorprone.info/bugpattern/PreferredInterfaceType [2] https://errorprone.info/bugpattern/DoubleBraceInitialization Change-Id: I04b7d0792e67cbc51e3939bd47c2ea13a685cf0d (cherry picked from commit 0f071a7bcee1f551652b2ae017f3e0e134c7eb74)
* | | | | | | | Prepare 6.6.1-SNAPSHOT buildsMatthias Sohn2023-05-3091-533/+533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0036999e2be076d4ad8231410faeff51bf9cbf52
* | | | | | | | JGit v6.6.0.202305301015-rv6.6.0.202305301015-rMatthias Sohn2023-05-3091-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I33b45b0cf36835b289ecbb5a1a9fc4ad7fc200cd
* | | | | | | | Update to Orbit S20230516204213Matthias Sohn2023-05-2425-60/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4daae47b8d2e244b78dff5ca072e41153e7e6734
* | | | | | | | Prepare 6.6.0-SNAPSHOT buildsMatthias Sohn2023-05-2491-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0e4e8ce5f3e2f5170f313fb9b26b4ec0e34dab9
* | | | | | | | JGit v6.6.0.202305241045-m3v6.6.0.202305241045-m3Matthias Sohn2023-05-2491-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I204708812b9cb6f98f9c29e28548b91da0d88d91
* | | | | | | | Merge branch 'master' into stable-6.6Matthias Sohn2023-05-2444-709/+1679
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: GraphObjectIndex: fix search in findGraphPosition Update to Tycho 4.0.0-SNAPSHOT PGP sign p2 artefacts Revert 'Use net.i2p.crypto:eddsa directly from Maven Central' Update dash license-tool-plugin to 1.0.2 Also add suppressed exception if unchecked exception occurs in finally Candidate: use "Objects.equals" instead of "==" Use hamcrest 2.2 directly from Maven Central Use commons-logging directly from Maven Central Update jna to 5.13.0 Use bytebuddy directly from Maven Central Use jna directly from Maven Central Use net.i2p.crypto:eddsa directly from Maven Central Use org.tukaani:xz directly from Maven Central Use args4j directly from Maven Central Use gson directly from Maven Central Remove unused $NON-NLS-1$ Remove unused API filters Switch to Apache MINA sshd 2.10.0 [releng] API filter for PackIndex.DEFAULT_WRITE_REVERSE_INDEX PackExt: add a #getTmpExtension method UploadPack: Record negotiation stats on fetchV2 call RewriteGeneratorTest: Introduce test cases for the RewriteGenerator PackWriter: write the PackReverseIndex file Change-Id: I6c7760a32545320862abcdcc8761c9b728e78182
| * \ \ \ \ \ \ \ Merge changes Ib0f18147,I2a9308c0,Ica15a5ddMatthias Sohn2023-05-2316-146/+81
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update to Tycho 4.0.0-SNAPSHOT PGP sign p2 artefacts Revert 'Use net.i2p.crypto:eddsa directly from Maven Central'
| | * | | | | | | | Update to Tycho 4.0.0-SNAPSHOTMatthias Sohn2023-05-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to update to Tycho in order to force PGP signing of the bouncycastle libraries which isn't supported by earlier Tycho versions. For that we need to run Maven on Java 17 or higher. In order to run tests on Java 11 add a `toolchain.xml` file into the `~/.m2` directory providing the path to Java installations: <?xml version='1.0' encoding='UTF-8'?> <toolchains> <toolchain> <type>jdk</type> <provides> <id>JavaSE-11</id> <version>11</version> </provides> <configuration> <jdkHome>/path/to/java-11</jdkHome> </configuration> </toolchain> <toolchain> <type>jdk</type> <provides> <id>JavaSE-17</id> <version>17</version> </provides> <configuration> <jdkHome>/path/to/java-17</jdkHome> </configuration> </toolchain> </toolchains> Change-Id: Ib0f18147826e5b4a7fa1f41590772516269de702
| | * | | | | | | | PGP sign p2 artefactsMatthias Sohn2023-05-232-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures bundles directly pulled from Maven Central are PGP signed by Tycho. See https://docs.google.com/document/d/1MnDBvOUwKvKacB-QKnH_PzK88dUlHkjs-D-DWEKmvkY Change-Id: I2a9308c091e602d40a1c143edb506a3e43dd0dc2
| | * | | | | | | | Revert 'Use net.i2p.crypto:eddsa directly from Maven Central'Thomas Wolf2023-05-2314-145/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e094c6cf32d6b6c2e49c72d506149427e97c5ab. Reason: the maven artifact has a broken MANIFEST.MF with a mandatory dependency to sun.security.x509, which is an internal package in the JDK and moreover not needed by the bundle except for one test class that isn't in the bundle at all. This extra dependency makes the JGit tycho packaging build fail when Tycho 4 is used. We must keep using the Orbit re-packaging of this artifact, which does not have this unnecessary mandatory dependency. Change-Id: Ica15a5ddcada09686de3055b2b3daf081e3c5ffc Signed-off-by: Thomas Wolf <twolf@apache.org>
| * | | | | | | | | Merge "GraphObjectIndex: fix search in findGraphPosition"Jonathan Tan2023-05-232-2/+30
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | GraphObjectIndex: fix search in findGraphPositionJonathan Tan2023-05-232-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In findGraphPosition, when there is no object whose OID starts with the first byte of the sought OID, low equals high. This violates an invariant of the loop, and when the sought OID is lexicographically greater than every other OID in the repository, causes an ArrayIndexOutOfBoundsException (because we're trying to read outside the list of OIDs). Therefore, check the "low < high" condition at the start of the loop, not only after the first iteration. Change-Id: Ic8ac198c151bd161c4996b9e7cb6e6660f151733 Helped-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
| * | | | | | | | | Update dash license-tool-plugin to 1.0.2Matthias Sohn2023-05-201-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9708d918f4610503d7a16f55cea3aa3931dcd2cc
| * | | | | | | | | Merge "Also add suppressed exception if unchecked exception occurs in finally"Matthias Sohn2023-05-193-3/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Also add suppressed exception if unchecked exception occurs in finallyMatthias Sohn2023-05-183-3/+9
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a method called in a finally block throws an exception we should add exceptions caught earlier to the exception we throw in the finally block not regarding if it's a checked or unchecked exception. Change-Id: I4c6be9a3a08482b07659ca31d6987ce719d81ca5
| * / / / / / / / / Candidate: use "Objects.equals" instead of "=="Fabio Ponciroli2023-05-181-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errorprone raises the following warning: "[ReferenceEquality] Comparison using reference equality instead of value equality". Change-Id: Iacb207ef0625bb987a08406d4e7461e48fade97f
| * | | | | | | | Use hamcrest 2.2 directly from Maven CentralMatthias Sohn2023-05-1714-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4039b56b1cdc54ff1886c2a4973d857d785989c2
| * | | | | | | | Use commons-logging directly from Maven CentralMatthias Sohn2023-05-1714-38/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I08e51450f70f941761539d3f08dd65c5d706dcdc
| * | | | | | | | Update jna to 5.13.0Matthias Sohn2023-05-1716-45/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87d65e66e1cac64ccb744632ea45d06f8b8637fe
| * | | | | | | | Use bytebuddy directly from Maven CentralMatthias Sohn2023-05-1714-64/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e24a31b78ef3758e1ce84e3b0eacaff1608fcd9
| * | | | | | | | Use jna directly from Maven CentralMatthias Sohn2023-05-1714-64/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c2576648748a6c6020c13a604cf5fcd4864aeb8
| * | | | | | | | Use net.i2p.crypto:eddsa directly from Maven CentralMatthias Sohn2023-05-1714-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e864380fa5eb3006943b78b19f6cbe7ae9f8111
| * | | | | | | | Use org.tukaani:xz directly from Maven CentralMatthias Sohn2023-05-1714-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ab835cee694778eedaa125cc372be8b6c876133