summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Documentation/technical/reftable: improve repo layoutHan-Wen Nienhuys2020-02-111-23/+30
| | | | | | | | | | | | | | | Previously, the list of tables was in .git/refs. This makes repo detection fail in older clients, which is undesirable. This is proposal was discussed and approved on the git@vger list at https://lore.kernel.org/git/CAFQ2z_PvKiz==GyS6J1H1uG0FRPL86JvDj+LjX1We4-yCSVQ+g@mail.gmail.com/ For backward compatibility, JGit could detect a file under .git/refs and use it as a reftable list. Change-Id: Ic0b974fa250cfa905463b811957e2a4fdd7bbc6b Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* Merge branch 'stable-5.6'Matthias Sohn2020-02-114-6/+49
|\ | | | | | | | | | | | | | | | | | | | | * stable-5.6: reftable: don't check deadline on the first try reftable: clarify comment reftable: clear cache on full compaction reftable: remove outdated comment reftable: clarify that LogCursor may return a null ReflogEntry Change-Id: I9458a746311984fa687b3da964805e2568ed37f3
| * reftable: don't check deadline on the first tryHan-Wen Nienhuys2020-02-111-1/+6
| | | | | | | | | | | | | | This helps debug stepping. Change-Id: I020dafab4ffac75e6df0dbcde0ed4805c7867f72 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * reftable: clarify commentHan-Wen Nienhuys2020-02-111-1/+1
| | | | | | | | | | Change-Id: I16e32aeb325b604eb31f84db18a214f792395941 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * reftable: clear cache on full compactionHan-Wen Nienhuys2020-02-112-0/+39
| | | | | | | | | | | | | | | | | | The merged table contains handles to open files. A full compaction causes those files to be closed, and so further lookups would fail with EBADF. Change-Id: I7bb74f7228ecc7fec9535b00e56a617a9c18e00e Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * reftable: remove outdated commentHan-Wen Nienhuys2020-02-101-3/+0
| | | | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I41a7d9934d53553b5f81f40ff9d663378676ac5d
| * reftable: clarify that LogCursor may return a null ReflogEntryHan-Wen Nienhuys2020-02-101-1/+3
| | | | | | | | | | Change-Id: I1a4d5c262cd196dca37876aec00bb974a45e9fcd Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* | Merge branch 'stable-5.6'Matthias Sohn2020-02-102-16/+81
|\| | | | | | | | | | | | | | | * stable-5.6: Restore behavior of CloneCommand Change-Id: I3092bf214c41436b57e0ede9d2202f8aabf15471 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Restore behavior of CloneCommandThomas Wolf2020-02-042-16/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6216b0de changed the behavior of the setMirror(), setCloneAllBranches(), and setBranchesToClone() operations. Before that commit, these could be set and reset independently and only in call() it would be determined what exactly to do. Since that commit, the last of these calls would determine the operation. This means that the sequence cloneCommand.setCloneAllBranches(true); cloneCommand.setBranchesToClone(/* some list of refs */); would formerly do a "clone all" giving a fetch refspec with wildcards +refs/heads/*:refs/remotes/origin/* which picks up new upstream branches, whereas since commit 6216b0de individual non-wildcard fetch refspecs would be generated and new upstream branches would not be fetched anymore. Undo this behavioral change. Make the operations independently settable and resettable again, and determine the exact operation only in call(): mirror=true > cloneAll=true > specific refs, where ">" means "takes precedence over", and if none is set assume cloneAll=true. Note that mirror=true implies setBare(true). Bug: 559796 Change-Id: I7162b60e99de5e3e512bf27ff4113f554c94f5a6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | Use lambdas where possibleLars Vogel2020-02-052-40/+38
| | | | | | | | | | | | | | Using the batch cleanup operation via Source -> Cleanup -> "Use lambdas where possible" from standard JDT. Change-Id: I5452bd94fdccc920ade071228aeed3a8b9fdbe62 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
* | Merge "Include org.apache.commons.codec 1.13 in the JGit http.apache.feature"David Pursehouse2020-02-041-0/+7
|\ \
| * | Include org.apache.commons.codec 1.13 in the JGit http.apache.featureThomas Wolf2020-02-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | We do include httpcomponents.httpclient, but that depends on commons.codec. By including it here we can ensure that the version needed is indeed available. Bug: 559735 Change-Id: I16ef830cfe4f8e3b8a8ca08476fd655f41eee51b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Upgrade maven-pmd-plugin to 3.13.0David Pursehouse2020-02-041-1/+1
| | | | | | | | | | | | | | | Change-Id: I6e20b77db743cd8578aa1f8688f893b746e861d1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Update Maven pluginsMatthias Sohn2020-02-021-2/+2
|/ / | | | | | | | | | | | | - maven-surefire-plugin to 3.0.0-M4 - japicmp-maven-plugin to 0.14.3 Change-Id: I9191620825e15b03a58c41cf3d3e64c6a58faf0f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | AmazonS3: Speed up fetch, try recent packs firstJoshua Redstone2020-02-022-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching remote objects, WalkFetchConnection searches remote packs in the order provided by WalkRemoteObjectDatabase:getPackNames. Previously, for TransportAmazonS3, the packs were in no particular order. This resulted in potential many extra calls to get pack idx files. This change modifies TransportAmazonS3 and AmazonS3 so that getPackNames returns a list sorted with the most recently modified packs first. In the case of fetching recent changes to a repo, this dramatically reduces the number of packs searched and speeds up fetch. Note: WalkRemoteObjectDatabase::getPackNames does not specify the order of the returned names. Testing: did "mvn clean install" in root dir and all tests passed. And manually constructed some S3 repos and using jgit.sh confirmed that the freshest pack was checked first. Change-Id: I3b968fee825e793be55566e28c2d69d0cbe53807 Signed-off-by: Joshua Redstone <redstone@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-5.7'Matthias Sohn2020-02-0110-107/+540
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I0538bcba259f7229790a602ac9de120464a1260d
| * | Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2020-02-0110-107/+540
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.6: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I79d615dff66493b60d3a4bcbdc57b9455e8d6673
| | * Merge branch 'stable-5.5' into stable-5.6Matthias Sohn2020-02-0110-107/+540
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.5: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I73d16b53df02bf735c2431588143efe225a4b5b4
| | | * Merge branch 'stable-5.4' into stable-5.5Matthias Sohn2020-02-0110-115/+540
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.4: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I76a62da98182f0c504b1ea8b7d37cecdf4eea7e0
| | | | * Merge branch 'stable-5.3' into stable-5.4Matthias Sohn2020-02-0110-107/+540
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.3: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I12002dbfed9dff14fc6d2df9787d92eab5b1fa78
| | | | | * Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2020-02-0110-107/+540
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I790098be00ff3f9b8278d54ae4fb7c11311816e9
| | | | | | * Merge branch 'stable-5.1' into stable-5.2David Pursehouse2020-02-018-86/+466
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix string format parameter for invalidRefAdvertisementLine WindowCache: add metric for cached bytes per repository pgm daemon: fallback to user and system config if no config specified WindowCache: add option to use strong refs to reference ByteWindows Change-Id: I741059a1d0d5950ab5bc16ec70352655ee926a24 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Fix string format parameter for invalidRefAdvertisementLineDavid Pursehouse2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The externalized error message added in f4fc640 ("BasePackConnection: Check for expected length of ref advertisement", Dec 18, 2019) uses a malformed string format. Since there is only one formatting argument, it should be referenced with '{0}' rather than '{1}'. Change-Id: Ibda864dfb0bb902fe07ae4bba73117b212046e8a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | * WindowCache: add metric for cached bytes per repositoryMatthias Sohn2020-01-282-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ObjectDatabase and PackFile don't know their repository use the packfile's grand-grand-parent directory as an identifier for the repository the packfile resides in. Remove metric for a repository if the number of cached bytes for the repository drops to 0 in order to ensure the map of cached bytes per repository doesn't contain repositories which have no data cached in the WindowCache. Change-Id: I969ab8029db0a292e7585cbb36ca0baa797da20b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * pgm daemon: fallback to user and system config if no config specifiedMatthias Sohn2020-01-281-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a config file is passed via option --config-file then use only the options defined in that file. This helps to concisely configure the daemon without side effects from global and system level git configs. Otherwise fallback to user and system level configs. Change-Id: I242de248f257579874ad0bfe4882a22502353b1f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * WindowCache: add option to use strong refs to reference ByteWindowsMatthias Sohn2020-01-205-70/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java GC evicts all SoftReferences when the used heap size comes close to the maximum heap size. This means peaks in heap memory consumption can flush the complete WindowCache which was observed to have negative impact on performance of upload-pack in Gerrit. Hence add a boolean option core.packedGitUseStrongRefs to allow using strong references to reference packfile pages cached in the WindowCache. If this option is set to true Java gc can no longer flush the WindowCache to free memory if the used heap comes close to the maximum heap size. On the other hand this provides more predictable performance. Bug: 553573 Change-Id: I9de406293087ab0fa61130c8e0829775762ece8d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | Merge branch 'stable-5.1' into stable-5.2David Pursehouse2020-01-175-21/+74
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Replace usage of ArrayIndexOutOfBoundsException in treewalk Add config constants for WindowCache configuration options Change-Id: I17da3c5183eca536aa2be3972bc5df45c9d75f1b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Replace usage of ArrayIndexOutOfBoundsException in treewalkPatrick Hiesel2020-01-092-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using exceptions during normal operations - for example with the desire of expanding an array in the failure case - can have a severe performance impact. When exceptions are instantiated, a stack trace is collected. Generating stack trace can be expensive. Compared to that, checking an array for length - even if done many times - is cheap since this is a check that can run in just a handful of CPU cycles. Change-Id: Ifaf10623f6a876c9faecfa44654c9296315adfcb Signed-off-by: Patrick Hiesel <hiesel@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Add config constants for WindowCache configuration optionsMatthias Sohn2020-01-093-12/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc5265f87ae58aa1e667ed1827075c4a30f75c32 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update orbit to S20200128200239 for 2020-03 M2Matthias Sohn2020-01-2919-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update org.junit to 4.13.0.v20200128-1312 Change-Id: Iaf4010f1d33635e5c69688874669d540e056b287 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | FS: re-order fields and use all uppercase for true constantsThomas Wolf2020-01-281-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49fb77d6a12ae9083b5bf5779dc74a3dc49d7594 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | FS: Don't use innocuous threads for CompletableFutureAlex Jitianu2020-01-282-4/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default threads from the ForkJoinPool run without any privileges when a SecurityManager is installed, leading to SecurityExceptions when trying to create the probe file even if the application otherwise has write privileges in the directory. Use a dedicated ThreadPoolExecutor using daemon threads instead. Bug: 551690 Change-Id: Id5376f09f0d7da5ceea367e1f0dfc70f823d62d3 Signed-off-by: Alex Jitianu <alex_jitianu@sync.ro> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | ErrorProne: Enable and fix UnusedException checkDavid Pursehouse2020-01-2752-94/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable UnusedException at ERROR level which causes the build to fail in many places with: [UnusedException] This catch block catches an symbol and re-throws another, but swallows the caught symbol rather than setting it as a cause. This can make debugging harder. Fix it by setting the caught exception as cause on the subsequently thrown exception. Note: The grammatically incorrect error message is copy-pasted as-is from the version of ErrorProne currently used in Bazel; it has been fixed by [1] in the latest version. [1] https://github.com/google/error-prone/commit/d57a39c Change-Id: I11ed38243091fc12f64f1b2db404ba3f1d2e98b5 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update Orbit to I20200126235943 and org.junit to 4.13.0.v20200126-2018Matthias Sohn2020-01-2719-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2eb4d34512d169aa7ec9b6437b49c6a43b4a8e38 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Fix SshSessionFactory#setInstance to use service loaderMatthias Sohn2020-01-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If setInstance(SshSessionFactory) is called with parameter null set default session factory using the newly introduced service loader instead of hard-coding the default factory class. Change-Id: I86b5932333cc53b706534a2822e0fd96e12e6e47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Use ServiceLoader to define the default SSH session factory.Emmanuel Hugonnet2020-01-253-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ServiceLoader and define org.eclipse.jgit.transport.DefaultSshSessionFactory in META-INF/services/org.eclipse.jgit.transport.SshSessionFactory so that the legacy behavior is still the same. Bug: 553625 Change-Id: Id1a65506140d921ed76d83699e3817f0d2ca08ed Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Remove Error-Prone ExpectedExceptionCheckerDavid Pursehouse2020-01-243-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The checker only checks for misuse of ExpectedException. Since we've moved to JUnit 4.13 and assertThrows, ExpectedException won't be used at all, so now we can get rid of that setting. Change-Id: Ia9189936ae215110f1f5fc6459c5dbc944404ade Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | ReceivePack: enable overriding filterCommands and executeCommandsMatthias Sohn2020-01-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib923e137f0fadd876434bcc49ebd0c9a4d90b45c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Replace ExpectedException which was deprecated in junit 4.13Matthias Sohn2020-01-2421-279/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64b0c057dd0a12aef2f3d56fa0c8a10e3b23fffd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Add org.assertj 3.14.0.v20200120-1926 to target platformMatthias Sohn2020-01-2410-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used by JGit based NIO2 filesystem implementation in Ic8712a091e3941634c80b19ba0e316d9c98dae3e. CQ: 21437 Change-Id: I64f8415826e95bff7cf93e7fd28e00f0809b500c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Replace deprecated junit assertion methods with hamcrestMatthias Sohn2020-01-2214-39/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icebe8071eeefbc13d3bdbc231c568209cdc26195 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update to Orbit I20200120214610 and JUnit to 4.13David Pursehouse2020-01-2234-129/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since version 4.13 JUnit has an assertThrows method. Remove the implementation in MoreAsserts and use the one from JUnit. CQ: 21439 Change-Id: I086baa94aa3069cebe87c4cbf91ed1534523c6cb Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update to Tycho 1.6.0Michael Keppler2020-01-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not many changes, but might lead to shorter build times. Change-Id: I5d629e49e8bbdef7a5b116d4f28cdbf8a8528cf0 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Extract method refactoring in class DirCacheCheckoutAndre Bossert2020-01-201-60/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added new public method getContent() * changed checkoutEntry() to use the new getContent() method * changed runExternalFilterCommand() parameter "entry" to "path" to be independent from DirCacheEntry type * removed runExternalFilterCommand() parameter "fs" as it can be derived from repo Bug: 356832 Change-Id: If8991b74870e0d8728093e98a990f93f1871b76a Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* | | | | | | | Update Orbit to I20200115225246 and update dependenciesMatthias Sohn2020-01-1621-144/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update - javaewah to 1.1.7.v20200107-0831 - org.apache.commons.codec to 1.13.0.v20200108-0001 - org.apache.commons.compress to 1.19.0.v20200106-2343 - org.apache.httpcomponents.httpclient to 4.5.10.v20200114-1512 - org.apache.httpcomponents.httpcore to 4.4.12.v20200108-1212 CQ: 21194 CQ: 21195 CQ: 21199 CQ: 21346 CQ: 21347 Change-Id: I1943f1c3bf1bb5d71b666cb6aea6083e80ff82dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Update bazlets and bazel versionMatthias Sohn2020-01-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bazlets need to be updated to react on Maven central no longer supporting http protocol but only https - update bazel to 2.0 Change-Id: I07f5f050f3b1db2014a5198a28b6bbf893434814 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | Merge branch 'stable-5.7'Matthias Sohn2020-01-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: Prepare 5.7.0-SNAPSHOT builds JGit v5.7.0.202001151323-m1 Change-Id: Ic4294957bdf409e4bfcb104132e724e7e5c4843e
| * | | | | | | Prepare 5.7.0-SNAPSHOT buildsMatthias Sohn2020-01-1574-105/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I106098e85db05bb0142f9fb406e3aef3cf0238b4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | JGit v5.7.0.202001151323-m1v5.7.0.202001151323-m1Matthias Sohn2020-01-1574-105/+105
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7701bee6f05d66012c59092126eb4d52f828dc24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | Upgrade jetty to 9.4.25.v20191220Matthias Sohn2020-01-1521-192/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a14c2beec3075eac5807cd639f55f38ae8c9c49 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>