aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* Support cherry-picking a root commitThomas Wolf2023-04-292-37/+75
| | | | | | | | | | | | | Handle the case of the commit to be picked not having any parents. Since JGit implements cherry-pick as a 3-way-merge between the commit to be picked and the target commit, using the parent of the picked commit as merge base, this is super simple: just don't set a base tree. The merger will not find any merge base and will supply an empty tree iterator for the base. Bug: 581832 Change-Id: I88985f1b1723db5b35ce58bf228bc48d23d6fca3 Signed-off-by: Thomas Wolf <twolf@apache.org>
* AddCommand: ability to switch off renormalizationThomas Wolf2023-04-286-28/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit's AddCommand always renormalizes tracked files. C git does so only on git add --renormalize. Especially for git add . and the JGit equivalent git.add().addFilepattern(".").call() this can make a big difference if there are many files, or large files. Add a "renormalize" option to AddCommand. To maintain compatibility with existing uses, this option is "true" by default, and the behavior of AddCommand is as it has always been in JGit. If set to "false", use an IndexDiffFilter (in addition to a path filter, if any). This skips any unchanged files (that are not racily clean) from content checks. Note that changes in CRLF settings or in filters will be ignored for such files if renormalize == false. Add the "--renormalize" option to the Add command in the JGit command line program. For the command-line program, the default is as in C git: renormalize is off by default and enabled only if the option is given. Note that --renormalize implies --update in the command line program, as in C git. In AddCommand, the two settings are independent. Additionally, avoid opening input streams unnecessarily in WorkingTreeIterator.getEntryContentLength() and fix some bogus indentation. Add a simple test that adds 1000 files of 10kB in 10 directories twice and that fails if the second invocation (without any changes) with renormalize=false is not significantly faster. Locally, I observe for that second invocation * git.add().addFilepattern(".").call() ~660ms * git.add().addFilepattern(".").setRenormalize(false).call() ~16ms Bug: 494323 Change-Id: I30f9d518563fa55d7058a48c27c425f3b60aeb4c Signed-off-by: Thomas Wolf <twolf@apache.org>
* Update jetty to 10.0.15 and use it from Maven central directlyMatthias Sohn2023-04-2824-205/+597
| | | | | | and update servlet-api to 4.0.1 Change-Id: Id17aad56fc6f10dd64ce088c4b5a0532f5f0c588
* Update bouncycastle to 1.73Matthias Sohn2023-04-2813-66/+66
| | | | | | | | | | | | Review requests were created for maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7892 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7893 maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.73 https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/7894 Change-Id: I389cdd7500d7d9292d7ea5eee142492dd1db7112
* [errorprone] Fix MissingOverride errorMatthias Sohn2023-04-281-0/+1
| | | | | see https://errorprone.info/bugpattern/MissingOverride Change-Id: Iec8833eb52d91a4ef117160407b9151f25617cb5
* Merge "Merge branch 'stable-6.5'"Matthias Sohn2023-04-289-18/+174
|\
| * Merge branch 'stable-6.5'Matthias Sohn2023-04-289-18/+174
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.5: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings Parse pull.rebase=preserve as alias for pull.rebase=merges UploadPack: Fix NPE when traversing a tag chain Change-Id: I16e8553d187a8ef541f578291f47fc39c3da4ac0
| | * Merge branch 'stable-6.4' into stable-6.5Matthias Sohn2023-04-277-16/+111
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.4: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I6d20fea3a417e4361b61e81756253343668eb5de
| | | * Merge branch 'stable-6.3' into stable-6.4Matthias Sohn2023-04-277-16/+111
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.3: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I463f8528e623316add204848d551c44d44d04858
| | | | * Merge branch 'stable-6.2' into stable-6.3Matthias Sohn2023-04-277-16/+111
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.2: [bazel] Move ToolTestCase to src folder (6.2) GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I736c7d0ed9c6e9718fa98976c3dc5a25ab8cda85
| | | | | * [bazel] Move ToolTestCase to src folder (6.2)Matthias Sohn2023-04-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bazel barks at the abstract ToolTestCase not containing any test. Move it from the tst/ source folder to the src/ source folder so that bazel knows this is a helper class which doesn't contain tests. Change-Id: Ie353c27526644ea9b47437b9bd9cd730a432ab29
| | | | | * Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2023-04-276-16/+111
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Fix after_open config and Snapshotting RefDir tests to work with bazel [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory Demote severity of some error prone bug patterns to warnings UploadPack: Fix NPE when traversing a tag chain Change-Id: I9863cbce95d845efc891724898954b0b2f8dbf7b
| | | | | | * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2023-04-271-0/+2
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Change-Id: I9c622de39200c6ee248d600736dc5db477f6bf9f
| | | | | | | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2023-04-271-0/+2
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: GcConcurrentTest: @Ignore flaky testInterruptGc Fix CommitTemplateConfigTest Adapt GcConcurrentTest to changed FileRepositoryBuilder API. Change-Id: I8906662a6391ceed20ab29cfbe238daf13e1be63
| | | | | | | | * GcConcurrentTest: @Ignore flaky testInterruptGcJonathan Tan2023-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During my development of Id7721cc5b7ea650e77c2db47042715487983cae6, I have found this test to be flaky when run by CI. As a speculative fix, mark this test as @Ignore so it won't be run. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Change-Id: Idfe04d7f1fb72a772d4c8d249ca86a9c2eec0b1a
| | | | | | | | * Fix CommitTemplateConfigTestMatthias Sohn2023-04-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cherry-picked 61d4e313 doesn't match 5.13 APIs which changed in newer versions. Change-Id: I61ed0242472ed822028d86d3038f956f6bd5735c
| | | | | | * | | Fix after_open config and Snapshotting RefDir tests to work with bazelPrudhvi Akhil Alahari2023-04-262-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes I1db6fcf414b and I634b92877f added tests which were failing with errors [1] and [2] with "bazel test //...". This was not caught because we don't have CI running with bazel. Fix bazel build file so that these errors are no longer thrown when run with bazel. [1] error: cannot find symbol FileRepositoryBuilderTest [2] error: cannot find symbol RefDirectoryTest Bug: 581816 Signed-off-by: Prudhvi Akhil Alahari <quic_prudhvi@quicinc.com> Change-Id: I1e57111662825f5f14f373bc4f8d24cce1fec0b8
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 09:18:18 +0000