summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/v3.1.10-based' into v3.1.12-basedv3.1.12-basedJukka Jokiniva2021-02-0321-20/+144
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/v3.1.10-based: Add integrating and staged to search autocompletion Make chip colors visible for integrating and staged changes Add integrating section to change dashboard Fix state handling: integrating, staged and deferred must be closed In dark mode, use a dark header bar Add QtStage permission Fix warnings when compiling with error_prone_warnings_toolchain Fix submodule urls Add new status values: staged, integrating and deferred Top level dropdown menu extension point for plugin customization Modify Gerrit version string to indicate that this is a Qt fork Change-Id: Ia5153adec09bca27f76e85a36650caaef78a193c
| * Merge remote-tracking branch 'origin/v3.1.8-based' into v3.1.10-basedv3.1.10-basedJukka Jokiniva2020-11-2321-20/+144
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/v3.1.8-based: Add integrating and staged to search autocompletion Make chip colors visible for integrating and staged changes Add integrating section to change dashboard Fix state handling: integrating, staged and deferred must be closed In dark mode, use a dark header bar Add QtStage permission Fix warnings when compiling with error_prone_warnings_toolchain Fix submodule urls Add new status values: staged, integrating and deferred Top level dropdown menu extension point for plugin customization Modify Gerrit version string to indicate that this is a Qt fork Change-Id: Ic4abc25b09adbb8bbb50d2c95601af49b2417c2a
| | * Add integrating and staged to search autocompletionv3.1.8-basedFrederik Gladhorn2020-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | In the web ui, the search field does otherwise not complete our custom states. Change-Id: I1c863ad20b998608dbbfde40aa61fa5692e5833c (cherry picked from commit 3eea477349b9bd953d36e333fa9442953a072c70) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Make chip colors visible for integrating and staged changesFrederik Gladhorn2020-09-221-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also for deferred, although that's arguably less important. Fixes: QTQAINFRA-2996 Change-Id: I73263dafe6bc5ee715708d9f06113fc89bcbc847 (cherry picked from commit 43b3c2bac0996657aaeb907ba39b39d717fc39a0) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Add integrating section to change dashboardJukka Jokiniva2020-09-221-1/+8
| | | | | | | | | | | | | | | | | | | | | Fixes: QTQAINFRA-2970 Change-Id: I7448c32b8bbbdd15975eb8518c9bd65fd3f3d7de (cherry picked from commit ff93582e16edfc833ef2197215636b76a823ae33) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Fix state handling: integrating, staged and deferred must be closedFrederik Gladhorn2020-09-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This is currently how we prevent making changes to them. Change-Id: I7ea146b66eb9f10a2936be89ffa943b71f1ef6c5 (cherry picked from commit b1a8d24cbf39ca79bc0899fee8fa3f714e99debd) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * In dark mode, use a dark header barFrederik Gladhorn2020-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blue is hard on the eyes in any case, with the green logo of ours, it becomes horrible. Use some grey that is already in use for the side-bar and everything looks better. I don't think there is an easy way to override this in the plugin. Fixes: QTQAINFRA-2997 Change-Id: I39664697f6c25c9bbd1fdce9eb9d21f6654940fe (cherry picked from commit 46edaadfb6c826cf74a1bc381b2c06b851cf5cc0) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Add QtStage permissionJukka Jokiniva2020-09-226-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | QtStage permission controls stage and unstage functionality. Change-Id: Iea161ee5c2f86c48421c50ee8c6b87d8094d3c68 (cherry picked from commit 3bf45d6f5b4fb0419c5a82a049b00a70d74883de) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Fix warnings when compiling with error_prone_warnings_toolchainPaul Wicking2020-09-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bazel build --java_toolchain //tools:error_prone_warnings_toolchain gerrit Produces warnings that not all enum values are handled in these functions. While these are not critical, we might as well be low on warnings. Change-Id: I08a06bf3c4dd3558c6fc95b23cc7ab58b9682480 (cherry picked from commit 2bc3643c321b47c524927f7657eb6312adfdc19e) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Fix submodule urlsFrederik Gladhorn2020-09-221-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to mirror all plugins. Make it convenient to work on gerrit. Change-Id: I686e9952292ddcdf5036c3eba5be8ed934a11b44 (cherry picked from commit bd73e96897fa5dceb3e2c3f0debf81383ac88cf7) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Add new status values: staged, integrating and deferredJukka Jokiniva2020-09-225-3/+63
| | | | | | | | | | | | | | | | | | Change-Id: I38c18e98219b9e28863f57e6e70887f25d6c9dfa (cherry picked from commit 2020fc379ebbb578ca42b8f79001932e3a257af3) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Top level dropdown menu extension point for plugin customizationJukka Jokiniva2020-09-224-0/+12
| | | | | | | | | | | | | | | | | | Change-Id: I8c50c8b42b4340ba305efe25865a8c765f52af78 (cherry picked from commit 4ca4a4adc12b2580d488a47c5573556f32c53358) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * Modify Gerrit version string to indicate that this is a Qt forkJukka Jokiniva2020-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also: Use postfix for QtFork in version number There are tools parsing the version number and using QtFork-version breaks them. It's generally against conventions (semver). To make maintaining these changes easier, Ie1b91539c2fcb8fe66a7da119e4277a88ef4d291 was merged into this change. Change-Id: I2248e110a327ffc1bb1cf033a6c319117df12d26 (cherry picked from commit 906b52982263ec5fa06aa4d3a1d94ace9f529e5d) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | | Set version to 3.1.12v3.1.12David Ostrovsky2021-01-265-5/+5
| | | | | | | | | | | | Change-Id: I286b1536120852d4a05b0581e03da3fde04bc299
* | | Avoid creating HTTP Sessions for Git-over-HTTPLuca Milanesio2021-01-265-16/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Change-Id: Iffcd0fbd7 has involuntarily triggered the creation of a new HTTP Session for every invocation a Git-over-HTTP request. All came from the mistake of tracing the HTTP session instead of the Gerrit session in the audit record. The HTTP Servlet API specs say that any attempt to access the current session of an incoming request would result in the creation of a brand-new session. The session involuntarily created also had an expiry time equal to zero, which prevented the session housekeeper to reclaim them later on, even though they were unused. The consequence of creating an empty session for every Git-over-HTTP request isn't immediately tangible, because the session is empty and doesn't occupy a significant amount of memory. However, longer-term, the in-memory hashtable that records all the sessions, each one using 750 bytes on average, will be causing the overload of the JVM heap and the crash of the process because of lack of available memory. Use the correct Gerrit session-id, retrieving from the Provider<WebSession> the proper session, if active and logged in, and make sure in tests that no HTTP sessions are created as a result of a Git-over-http request. Bug: Issue 13858 Change-Id: I8c086fed54b196c3f46fa88ac78c127784524d30
* | | e2e-tests: Init executable README for local setup testingMarco Miller2021-01-211-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add this README as local supplemental instructions, to quickly validate one's local development setup. Make this an executable script that way. As an executable, the README already runs a generally working and safe set of default commands. It also contains usage instructions, based on steps gradually leading to locally configuring scripted test runs. Such commands are expected to run towards a locally running Gerrit test site, with admin (default) test user credentials provisioned as per README. Complements the official e2e-tests documentation [1], as well as [1]'s companion presentations, under [2]'s "End-to-end tests" section. Both [1] and [2] reciprocally refer to each other. They mention the use of this directory (now containing this README) already. [1] https://gerrit-review.googlesource.com/Documentation/dev-e2e-tests.html [2] https://www.gerritcodereview.com/presentations.html#list-of-presentations Change-Id: I4cb3574354ee845853c22ce3d4bdb34145020612
* | | Merge "Fix badly formatted error message shown in error dialog" into stable-3.1Matthias Sohn2021-01-151-10/+0
|\ \ \
| * | | Fix badly formatted error message shown in error dialogMatthias Sohn2021-01-141-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since [1] error messages which look like html are encoded as json to workaround some limitations of old MSIE versions. This led to badly formatted error messages shown in an error dialog. Fix this by removing this json encoding. [1] https://gerrit-review.googlesource.com/c/gerrit/+/39653 Bug: Issue 13936 Change-Id: I1bb7ddfc006d77b7a55727b5512dce6b67054aee
* | | | Merge "Update highlightjs to 10.5.0" into stable-3.1David Ostrovsky2021-01-142-642/+3624
|\ \ \ \ | |/ / / |/| | |
| * | | Update highlightjs to 10.5.0David Ostrovsky2021-01-112-642/+3624
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upgrades currently used version 10.0.2 from May 2020. Build process is amended to use terser minification, as it provides better result as closure-compiler: [1] Terser (5.3.8): $ ls -all build/highlight.min.js -rw-r--r-- 1 davido users 977775 Jan 10 10:04 build/highlight.min.js Closure-Compiler (v20210106): $ ls -all build/highlight.min.js -rw-r--r-- 1 davido users 994034 Jan 9 12:10 build/highlight.min.js So, terser produces minified build that is 16259 bytes smaller. Moreover, in latest gerrit releases terser is also used for gr-app.js minification, so it appears to be consistent to also use terser for highlight.js minification. [1] https://github.com/highlightjs/highlight.js/issues/2956 Change-Id: I3a67dc05eb9c4fdac1bf578eacd777dfefb2a360
* | | | Merge "AccountResolver: limit number of ambiguous accounts in error message" ↵Matthias Sohn2021-01-142-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | into stable-3.1
| * | | | AccountResolver: limit number of ambiguous accounts in error messageMatthias Sohn2021-01-132-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't list more than 3 ambiguous accounts in error message of UnresolvableAccountException in order to prevent flooding the log and displaying a lot of sensitive account data in an error dialog. Bug: Issue 13803 Change-Id: I95fe697988f3d900cce29ca93114a725b1c17ca6
* | | | | Update git submodulesSven Selberg2021-01-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update plugins/replication from branch 'stable-3.1' to 141f223240b15d3576f2d45525ed12b6ce7bc9bf - Document that authGroup must have Access Database Bug: Issue 13786 Change-Id: Iaf65252b25b9c40e5cfd1ac25d55fbf70536f83e
* | | | | Update jetty version to 9.4.35.v20201120David Ostrovsky2021-01-123-10/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a fix for CVE-2020-27218 [1] that affects versions prior to 9.4.35.v20201120. As of: [2] new dependency was added to jetty-servlet: jetty-util-ajax. [1] https://nvd.nist.gov/vuln/detail/CVE-2020-27218 [2] https://github.com/eclipse/jetty.project/issues/5539 Change-Id: I51549c9588f5748f36e145f8c4b347f97c08b4d8
* / / / Add shadow-selection-polyfillLuca Milanesio2021-01-114-4/+440
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selection on shadow-DOM is not implemented in Safari and the document.getSelection() fallback is not suitable for use. The GoogleChromeLabs provided a library to solve the problem: shadow-selection-polyfill. What the library does is to manage the selection change events and calculate and cache the results for the shadow root elements, creating a custom event '-shadow-selectionchange' once the selection has been completed. There is one gotcha that makes things slightly more complicated: what the library provides is a Range and not a Selection object. There are a couple of adjustments needed in gr-diff and gr-diff-highlight to use the range directly instead of getting it from the selection. NOTE: Even though the shadow-selection-polyfill could also manage Chrome and Firefox, keep the existing logic to avoid any possible regression, which is not desireable on a stable branch. On stable-3.1, because of the problems related to the inclusion of the dependency via Bower, shadow.js has been removed from its exports and used as pure JS file included in the gr-diff.html. This change needs would not be applied to stable-3.2 where, thanks to the npm package mangement, it would be consumed from the NPM registry directly. Bug: Issue 11811 Change-Id: I41c4e94343010972c8a9f0f1ba3a059ca7af5292
* | | Merge "Revert "Upgrade soy to 2020-08-24"" into stable-3.1David Ostrovsky2021-01-091-2/+2
|\ \ \
| * | | Revert "Upgrade soy to 2020-08-24"Matthias Sohn2020-12-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bcdbc45e85efe98ea820f5024c5ca566ba0576d5. Han-Wen reported this soy version to show performance issues in Gerrit: "Google is tracking this internally as b/176094888; hopefully we can get it fixed in Soy proper. The problem is that template rendering went from 9ms to 30ms. We render quite a few templates for a single email, so adds ~120ms to each operation that sends out an email. It looks like this caused a significant slowdown on the benchmark under contrib/benchmark-createchange.go (using reftable as refstorage)." Hence reverting this update until it's fixed upstream. See https://gerrit-review.googlesource.com/c/gerrit/+/280196 Change-Id: Id98a5d93e316268e086cf6aa2be514a586dd3eee
* | | | Update git submodulesAntonio Barone2021-01-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update plugins/replication from branch 'stable-3.1' to 22ca0b406a4efb9aebbbfcac8d2d986812423f01 - Split integration tests to different targets Running all integration tests as part of one single 'replication_it' target does not cope well with the addition of extra tests, because it is bound to take longer and longer, eventually hitting any test timeout threshold. Splitting integration tests into different targets avoids timeout failures and also provides additional benefits, such as: - Better understanding of test failures - More efficient utilization of bazel build outputs and remote caching, effectively making tests execution faster. Bug: Issue 13909 Change-Id: Ifc6cce9996d3a8a23ec2a66c377978205fb6680f
* | | | Add script for incremental reindexing during upgradeMatthias Sohn2021-01-076-0/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to shorten the downtime needed to reindex changes during a Gerrit upgrade the following strategy can be used: - index preparation - create a full consistent backup - note down the timestamp when the backup was created (backup-time) - create a complete copy of the production system from the backup - upgrade this copy to the new Gerrit version - online reindex this copy - upgrade of the production system - make system unavailable so that users can't reach it anymore e.g. by changing port numbers (downtime starts) - take a full backup - run $ ./reindex.py -u gerrit-url -s backup-time to write the list of changes which have been created or modified since the backup for the index preparation was created to a file "changes-to-reindex.list" - upgrade the production system to the new gerrit version skipping reindexing - copy the bulk of the new index from the copy system to the production system - run $ ./reindex.py -u gerrit-url this reindexes all changes which have been created or modified after the backup was taken reading these changes from the file "changes-to-reindex.list" - smoketest the system - make the production system available to the users again (downtime ends) Change-Id: Ie736e0dc32180329ca6ed31bcb49eb6b96bf2b91
* | | | Add query option allowing administrators to skip visibility filteringMatthias Sohn2021-01-053-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an administrator wants to reindex changes which were created or updated in a given period based on a query for that period the query results are subject to visibility filtering. This can have the effect that e.g. private changes are missed. Add a query option "skip-visibility" to allow administrators to skip visibility filtering. Change-Id: I66c13659587b9459eb7cc585697c1655926ceac3
* | | | Fix 'is:submittable' query on multiple submit recordsLuke Alonso2020-12-312-6/+108
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project has multiple submit rules, which produce multiple submit records, the 'is:submittable' query stops working as the documentation indicates it should. Rather than returning changes that are ready to be submitted, it returns any change where at least one submit record is OK, despite the overall change not being submittable. For example, with the code-owners plugin, which uses a java-based submit rule, 'is:submittable' will return changes that are passing owners checks, but might have CodeReview:-2 or Verified:-1. For projects with a single submit rule, the behavior is exactly the same as before, since we simply check that *any* of the submit records is OK, exactly as before, AND that *none* of them are NOT_READY or RULE_ERROR. Bug: Issue 13884 Change-Id: I4878ce13c6673852916d6891253d5e62b46f3db5
* | | Update git submodulesSven Selberg2020-12-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update plugins/replication from branch 'stable-3.1' to 0995fe0445f507279c05cb5ee60a9413671be400 - Don't check read permission when authgroup isn't set It's unnecessary to check read permission when authGroup isn't set since the then the user is a RemoteSiteUser that is-an InternalUser that has read access to everything. Change-Id: Ie6985250b0acb50c08fdcae75cc608222b1add35
* | | Set version to 3.1.12-SNAPSHOTLuca Milanesio2020-12-235-5/+5
| | | | | | | | | | | | Change-Id: I4894bba96a34d5c5da8570d3d3a5bf04b77e70ee
* | | Set version to 3.1.11v3.1.11Luca Milanesio2020-12-235-5/+5
| | | | | | | | | | | | Change-Id: I6c87be906a961c2b938d8260390ed4255fcd5102
* | | Fix httpcore dependency needed by httpclientLuca Milanesio2020-12-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | httpcore has removed annotations used by httpclient and therefore it would fail to execute the annotation processor. E.g. the high-availability plugin, which uses the httpclient, won't compile anymore because is failing to find the missing annotation removed from httpcore from v4.4.5 onwards. The wrong httpcore dependency was introduced yesterday with the merge of Change-Id: I1fc91bce. Change-Id: I2d45001995806074534c11fc5230765e4c99e5a2
* | | Revert "Add support for Elasticsearch version 7.9.*"Luca Milanesio2020-12-2310-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert submission 291062 Reason for revert: requires an httpclient that Google cannot support Reverted Changes: I1fc91bce9:Align http dependencies with elasticsearch-rest-cl... Ifb941eea6:Add support for Elasticsearch version 7.10.* I7d76ece60:Add support for Elasticsearch version 7.9.* Change-Id: Ib95a8c053fa7f046596458e7eb719a409847cb82
* | | Revert "Add support for Elasticsearch version 7.10.*"Luca Milanesio2020-12-2310-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert submission 291062 Reason for revert: requires an httpclient that Google cannot support Reverted Changes: I1fc91bce9:Align http dependencies with elasticsearch-rest-cl... Ifb941eea6:Add support for Elasticsearch version 7.10.* I7d76ece60:Add support for Elasticsearch version 7.9.* Change-Id: I740e06058469a0ab12b14c7c616940bf429d0de7
* | | Merge "ForRef#check should permit internal users to read all refs" into ↵Sven Selberg2020-12-212-0/+14
|\ \ \ | | | | | | | | | | | | stable-3.1
| * | | ForRef#check should permit internal users to read all refsSven Selberg2020-12-212-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79d24d4 Make PermissionBackend#ForRef authoritative Introduced a regression where InternalUsers where not taken into consideration when checking READ permission. Bug: Issue 13786 Change-Id: I3f18507f65044ac96321c1efecf1f2688f36859f
* | | | Merge changes Ifb941eea,I7d76ece6,I1fc91bce into stable-3.1Marco Miller2020-12-2111-17/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add support for Elasticsearch version 7.10.* Add support for Elasticsearch version 7.9.* Align http dependencies with elasticsearch-rest-client
| * | | | Add support for Elasticsearch version 7.10.*Marco Miller2020-12-1710-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade elasticsearch-rest-client to 7.10.1. Add V7_10 to the version manager and use it for all the V7 tests. Change-Id: Ifb941eea63b90e107ae37c6a08ab1815d6c0f22b
| * | | | Add support for Elasticsearch version 7.9.*Marco Miller2020-12-1710-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade elasticsearch-rest-client to 7.9.3, which is the currently latest 7.9 minor version available. Add V7_9 to the version manager and use it for all the V7 tests. Change-Id: I7d76ece60d3ed7400bcf28bcd45d0e2e02870ccd
| * | | | Align http dependencies with elasticsearch-rest-clientMarco Miller2020-12-172-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address the upstream issue [1] which is caused by the lack of upgrades done in this change. While waiting for Elastic to potentially provide shaded dependencies [1,2] for these, upgrade them herein still for now. Meaning, do not consider trying [2] this time around either. Favor the upgrade approach which is still simpler and likelier to succeed today. Base these new versions on [3]'s dependencies, even though the issue ([1]) didn't fail the build as such for version 7.8.1 of the client. This issue's fix starts becoming necessary from client versions 7.9.x, as shown by the follow-up upgrade change to 7.9.0 which requires this. The most downstream branch of gerrit to include this change determines from which Gerrit version the Elasticsearch versions 7.9.x can be supported. Set HTTPCOMP_VERS to the earlier 4.5.2, to comply with Google's currently deployed internal version. [1] https://github.com/elastic/elasticsearch/issues/61664 [2] https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low-usage-shading.html [3] https://search.maven.org/artifact/org.elasticsearch.client/elasticsearch-rest-client/7.8.1/jar Change-Id: I1fc91bce95d9e8094c19ad4044bd08b6285524af
* | | | | Add Jacek Centkowski to developersMarco Miller2020-12-184-0/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: If92e2efd75b8e8230f6ffc47f550a8cc92edea3b
* | | | | Merge "Upgrade testcontainers to 1.15.1" into stable-3.1Marco Miller2020-12-171-7/+7
|\| | | |
| * | | | Upgrade testcontainers to 1.15.1Marco Miller2020-12-171-7/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to [1], "focuses on the stability and compatibility". Includes bug fixes and an update of docker-java to 3.2.7, which gets reflected in this change just as well. This change is currently necessary to successfully execute all the elastic core tests on macOS, with Docker Desktop, locally. [1] https://github.com/testcontainers/testcontainers-java/releases/tag/1.15.1 Change-Id: I9a7c443c69e3d054a6c52451b3aa3cf57a7933d3
* | | | Merge branch 'stable-3.0' into stable-3.1David Ostrovsky2020-12-171-43/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | * stable-3.0: SshDaemonIT: Perform some refactoring Change-Id: I4e684a5b8c26f8c2c6b2f70e82b369999b4d1848
| * | | SshDaemonIT: Perform some refactoringDavid Ostrovsky2020-12-151-43/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the code, remove unused variables and make use of JUnit assumption violation feature to avoid running graceful tests in SSH daemon without activated sshd.gracefulStopTimeout configuration option. This is a preparation change to switch to using Apache MINA sshd client. Change-Id: I80bb97ac4c15a3af6bff86b0b3d0dcc7887e8314
* | | | Merge branch 'stable-3.0' into stable-3.1Marco Miller2020-12-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Update git submodules Update git submodules Change-Id: I11eb2fa2c7cb70fede26b9635272667261042c41
| * | | Merge branch 'stable-2.16' into stable-3.0Marco Miller2020-12-150-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Update git submodules Change-Id: Ic71835d9ad79bd2d22cc0dd4a8ee3717d15e6980
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 04:27:39 +0000