summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Use args4j directly from Maven CentralMatthias Sohn2023-05-1714-38/+145
| | | | | | | | Change-Id: I91c7c42c1fc779278fe30294638edef182e88347
| * Use gson directly from Maven CentralMatthias Sohn2023-05-1714-38/+145
| | | | | | | | Change-Id: I4741f733aa7ca219296ed788d4dc93df77cc65ff
| * Remove unused $NON-NLS-1$Matthias Sohn2023-05-171-1/+1
| | | | | | | | Change-Id: I3314e5106d873c03903562f9798de6af2ae588a7
| * Remove unused API filtersMatthias Sohn2023-05-171-148/+0
| | | | | | | | Change-Id: I1971b31753fd4c3568016e7db955cce8e391a1e0
| * Switch to Apache MINA sshd 2.10.0Thomas Wolf2023-05-1625-273/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump the version numbers in pom.xml and in MANIFESTs, and in the bazel WORKSPACE file. Update the target platforms. Remove work-arounds in org.eclipse.jgit.ssh.apache that are no longer necessary. The release notes for Apache MINA sshd are at [1]. [1] https://github.com/apache/mina-sshd/blob/master/docs/changes/2.10.0.md Bug: 581770 Change-Id: Id27e73e9712b7865353c9b32b5b768f6e998b05e Signed-off-by: Thomas Wolf <twolf@apache.org>
| * [releng] API filter for PackIndex.DEFAULT_WRITE_REVERSE_INDEXThomas Wolf2023-05-152-26/+2
| | | | | | | | | | | | | | | | | | | | | | New static final constant is a (very minor) API break that needs to be suppressed explicitly despite @since 6.6. Remove a number of no longer needed API filters, and fix a broken $NON-NLS-1$. Change-Id: Ie4b0c45e8bd1f3067b6ff81c07d4b21b50bb8685 Signed-off-by: Thomas Wolf <twolf@apache.org>
| * Merge "UploadPack: Record negotiation stats on fetchV2 call"Ivan Frade2023-05-111-1/+3
| |\
| | * UploadPack: Record negotiation stats on fetchV2 callRonald Bhuleskar2023-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | ServiceV2 is not collecting wants/have in PackStatistics. This records the stats for fetch and push-negotiation. Change-Id: Iefd79f36b3d7837195e8bd9fc7007de352089e66
| * | PackExt: add a #getTmpExtension methodAnna Papitto2023-05-112-5/+18
| |/ | | | | | | | | | | | | | | | | | | | | During garbage collection, extensions for temporary files for indices are formatted manually. Add a method to PackExt to generate the temporary file extensions for each type of index file programmatically. Change-Id: I210bc2702e750bf0aea643b1a9a8536adebef179 Signed-off-by: Anna Papitto <annapapitto@google.com>
| * RewriteGeneratorTest: Introduce test cases for the RewriteGeneratorSimon Sohrt2023-05-091-0/+63
| | | | | | | | | | | | Bug: 577948 Signed-off-by: Simon Sohrt <sohrt@his.de> Change-Id: I5af1a43d49379e2417611eaacdd5f06be8147bc4
| * Merge "PackWriter: write the PackReverseIndex file"Ivan Frade2023-05-085-3/+117
| |\
| | * PackWriter: write the PackReverseIndex fileAnna Papitto2023-05-085-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackWriter offers the ability to write out the pack file and its various index files, except for the newly introduced file-based reverse index. Now that PackReverseIndexWriter can write reverse index files, PackWriter#writeReverseIndex will write one for a pack if the corresponding config flag PackConfig#writeReverseIndex is on. Change-Id: Ib75dd2bbfb9ee9366d5aacb46700d8cf8af4823a Signed-off-by: Anna Papitto <annapapitto@google.com>
* | | Prepare 6.6.0-SNAPSHOT buildsMatthias Sohn2023-05-0491-125/+125
| | | | | | | | | | | | Change-Id: Id2414c9f30d159c4f65a3c267373f7417c8ca65a
* | | JGit v6.6.0.202305031100-m2v6.6.0.202305031100-m2Matthias Sohn2023-05-0391-125/+125
|/ / | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I30077529655918f44479f4abca36aab4d677ea33
* | Merge "Fix inProcessPackedRefsLock not shared with copies of the instance"Matthias Sohn2023-05-031-1/+3
|\ \
| * | Fix inProcessPackedRefsLock not shared with copies of the instanceNasser Grainawi2023-05-021-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | The in process lock is intended to manage contention on locking the packed-refs file within a single process without acquiring the file system lock. Not sharing it across RefDirectory instances of the same repository undermines that intent and results in more contention at the file system level. Change-Id: I68f11856aa0b4b1524f43554d7391a322a0a6897 Signed-off-by: Nasser Grainawi <quic_nasserg@quicinc.com>
* | Update Maven pluginsMatthias Sohn2023-05-032-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - com.github.siom79.japicmp:japicmp-maven-plugin to 0.17.2 - com.github.spotbugs:spotbugs-maven-plugin to 4.7.3.4 - maven-clean-plugin to 3.2.0 - maven-compiler-plugin to 3.11.0 - maven-deploy-plugin to 3.1.1 - maven-enforcer-plugin to 3.3.0 - maven-javadoc-plugin to 3.5.0 - maven-project-info-reports-plugin to 3.4.3 - maven-resources-plugin to 3.3.1 - maven-surefire-plugin to 3.0.0 - maven-surefire-report-plugin to 3.0.0 - org.codehaus.mojo:build-helper-maven-plugin to 3.3.0 - org.jacoco:jacoco-maven-plugin to 0.8.10 - org.springframework.boot:spring-boot-maven-plugin to 2.7.11 Change-Id: I42f3a09362a3b1afef65981cd3a862780f592af2
* | Add TransportHttp#getAdditionalHeadersMatthias Sohn2023-05-032-1/+20
| | | | | | | | | | | | | | to enable inspecting which additional HTTP headers have been set on the transport. Change-Id: I0771be9cb7c837de7c203b7f044109b9b2a7d7ad
* | Add 4.27 (2023-03) and 4.28 (2023-06) target platformsMatthias Sohn2023-05-034-0/+396
| | | | | | | | Change-Id: I81cfba607e000a107348006785ff374db960ea6d
* | Update slf4j to 1.7.36 and consume it directly from Maven CentralMatthias Sohn2023-05-0218-66/+200
| | | | | | | | | | | | | | | | BundleSymbolicNames changed to the names used upstream: - slf4j.api - slf4j.simple Change-Id: Ibcaafae282d3a6fa013bc39d879def1b66073bca
* | Update assertj-core to 3.24.2Matthias Sohn2023-05-0115-35/+129
| | | | | | | | | | | | | | | | and consume it directly from Maven Central. Add the bundle to the jgit p2 repository. Change-Id: I95f07a6d3ea645c4f56350d4b0facbaa84988440
* | Update Apache commons-codec to 1.15Matthias Sohn2023-05-0114-36/+79
| | | | | | | | | | | | | | | | | | and consume it directly from Maven Central. Its BundleSymbolicName changes to "org.apache.commons.commons-codec" which is defined upstream. Change-Id: Id9c366b3be0b97f4b191ba78f02001306f0e5035
* | Update org.apache.commons:commons-compress to 1.23.0Matthias Sohn2023-05-0115-37/+129
| | | | | | | | | | | | | | | | | | and consume it directly from Maven Central. Its BundleSymbolicName changes to "org.apache.commons.commons-compress" which is defined upstream. Change-Id: I691f5f49491dd2c9ba577ebe0c6f7cdd462c047a
* | Update javaEWAH to 1.2.3 and use it directly from Maven centralMatthias Sohn2023-05-0115-37/+128
|/ | | | | | | | This changes its BundleSymbolicName from "javaewah" (name in Orbit) to com.googlecode.javaewah.JavaEWAH (name in upstream artefact from Maven Central). Change-Id: I8dee6909d496e3d05b2de938515dde831518be24
* Update plexus-compiler to 2.13.0Matthias Sohn2023-05-011-1/+1
| | | | Change-Id: I2e0665a5b5b41f501ab617220678d3a93fa43718
* Update org.eclipse.jdt:ecj to 3.33.0Matthias Sohn2023-05-011-1/+1
| | | | Change-Id: I0f310762313d6ccafe3ea410bf9d4c03731f0866
* Add missing @since tag to IntComparatorMatthias Sohn2023-05-011-0/+2
| | | | Change-Id: Ic190ab404ccb3af675cdd90cac231ce6e856ea68
* Update to jakarta.servlet:jakarta.servlet-api:4.0.4Matthias Sohn2023-05-0115-52/+52
| | | | Change-Id: I892b44e7886f5c30be7b2003ca048e3e22aa75f6
* Support rebasing independent branchesThomas Wolf2023-04-292-11/+160
| | | | | | | | | With completely independent branches, there is no merge base. In this case, the list of commits must include the root commit of the branch to be rebased. Bug: 581832 Change-Id: I0f5bdf179d5b07ff09f1a274d61c7a0b1c0011c6 Signed-off-by: Thomas Wolf <twolf@apache.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 23:44:08 +0000