root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
54,338 Commits 23 Branches 348 Tags 287 MiB
Commit Graph

1844 Commits

Author SHA1 Message Date
Andy Wilkinson 31f967723d Fix Mongo health indicators when using the strict V1 API 
Closes gh-41101
 2024-06-14 17:05:09 +01:00
Moritz Halbritter e1aef9db6f Rename parameter 
See gh-40904
 2024-06-14 08:32:38 +02:00
Phillip Webb 147240aa0c Merge branch '3.2.x' 
Closes gh-41080
 2024-06-11 13:32:30 -07:00
Phillip Webb dcccb3b2b1 Polish "Use method references when possible" 
See gh-40974
 2024-06-11 12:57:59 -07:00
Ahmed Ashour 507229eef8 Use method references when possible 
See gh-40974
 2024-06-11 12:57:55 -07:00
Moritz Halbritter 3c37e4557c Use properties from Prometheus config in PrometheusScrapeEndpoint 
Closes gh-40904
 2024-06-11 14:38:18 +02:00
Moritz Halbritter c470ce2247 Add resource hints for SBOM endpoint 
Closes gh-40939
 2024-06-11 11:42:46 +02:00
Moritz Halbritter 550433e6c3 Merge branch '3.2.x' 
Closes gh-40976
 2024-06-03 14:13:43 +02:00
Khan, C M Abdullah 570522d876 Fix typos in method names and javadoc 
See gh-40971
 2024-06-03 14:05:52 +02:00
Phillip Webb 6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07:00
Phillip Webb 38af8cd362 Merge branch '3.1.x' into 3.2.x 2024-04-18 12:52:54 -07:00
Phillip Webb 20db2b54c7 Update copyright year of changed files 2024-04-18 12:52:29 -07:00
Moritz Halbritter f896ce711f Merge branch '3.2.x' 
Closes gh-40387
 2024-04-17 16:41:50 +02:00
Moritz Halbritter 3db23624e0 Merge branch '3.1.x' into 3.2.x 
Closes gh-40386
 2024-04-17 16:40:50 +02:00
Spencer Gibb 6f3c30bf74 Fix javadoc for correct operation annotation 
ReadOperation was the text for WriteOperation and DeleteOperation.

See gh-40385
 2024-04-17 16:39:30 +02:00
Brian Clozel 647a5ec6be Deprecate framework-specific @*Endpoint annotations 
Prior to this commit, applications could declare Actuator Endpoints
using web framework-specific annotations, such as `@ServletEndpoint`,
@ControllerEndpoint and @RestControllerEndpoint.

Such annotations are closely tied to the programming model of specific
web technologies, such as Servlet or Spring MVC. Unlike other
`@Endpoint` support, they are not portable and will not work
transparently over blocking/reactive and transports.

Because of the strong adherence of this support with the underlying
infrastructure, it makes it impossible to evolve the implementation of
Actuator support without breaking this use case. The reference
documentation has been advocating for using `@Endpoint` and
`@*Operation` for custom endpoints for a long time now.

This commit deprecates this specific support in favor of the recommended
approach.

Closes gh-31768
 2024-04-15 18:58:52 +02:00
Andy Wilkinson 12e004f131 Revert "Exclude unwanted javax.inject dependency from Data Couchbase" 
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
 2024-04-12 11:19:16 +01:00
Andy Wilkinson 1ea6f2f51f Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase"" 
This reverts commit 3b76165f4e.

Turns out, the exclude's still needed for now? with Data Couchbase
5.1.x.

See gh-40200
 2024-04-11 17:06:03 +01:00
Andy Wilkinson 93c8513a78 Merge branch '3.2.x' 
See gh-40224
 2024-04-11 16:56:41 +01:00
Andy Wilkinson 7d3ea3f06f Merge branch '3.1.x' into 3.2.x 
See gh-40212
 2024-04-11 16:56:22 +01:00
Andy Wilkinson 3b76165f4e Revert "Exclude unwanted javax.inject dependency from Data Couchbase" 
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
 2024-04-11 16:55:24 +01:00
Andy Wilkinson 3699bcfb87 Merge branch '3.2.x' 
See gh-40224
 2024-04-09 09:09:12 +01:00
Andy Wilkinson 3bb7baf90f Merge branch '3.1.x' into 3.2.x 
See gh-40212
 2024-04-09 09:07:52 +01:00
Andy Wilkinson 06f5ab162f Exclude unwanted javax.inject dependency from Data Couchbase 
See gh-40200
 2024-04-09 09:07:13 +01:00
Moritz Halbritter ce358c601b Polish "Auto-config support for latest Prometheus client and simpleclient" 
See gh-40023
 2024-04-05 10:45:14 +02:00
Tommy Ludwig 7f26b67e61 Auto-config support for latest Prometheus client and simpleclient 
Deprecates the support for simpleclient but ensures that it can work in
conjunction with support for the latest Prometheus client
auto-configuration.

This involves breaking changes to update public classes to support the
latest Prometheus client. Deprecated support for Prometheus simpleclient
is provided in renamed classes.

See gh-40023
 2024-04-05 10:12:52 +02:00
Moritz Halbritter de150daf12 Upgrade Cassandra driver to 4.18.0 and change coordinates 
Closes gh-39090
 2024-03-26 08:58:22 +01:00
Moritz Halbritter 4047c00aa5 Implement SBOM actuator endpoint 
Closes gh-39799
 2024-03-21 18:06:48 -07:00
Phillip Webb 4849f8f273 Polish asciidoc formatting 2024-03-20 15:10:39 -07:00
Andy Wilkinson a01e068059 Start building against Micrometer 1.13.0 snapshots 
See gh-39889
 2024-03-12 09:28:27 +00:00
Phillip Webb f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb 12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Moritz Halbritter 7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter 4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter 8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Scott Frederick c05942d616 Merge branch '3.2.x' 
Closes gh-39445
 2024-02-07 15:05:48 -06:00
Scott Frederick 89354f3d0f Merge branch '3.1.x' into 3.2.x 
Closes gh-39444
 2024-02-07 14:41:32 -06:00
Scott Frederick 2374e7d4eb Fix invalid request handling for WebFlux actuator endpoints 
Fixes gh-39236
 2024-02-07 14:31:04 -06:00
Wzy19930507 dae3952144 Include the environment default profiles in the env endpoint's response 
See gh-39257
 2024-01-30 13:51:17 +01:00
Phillip Webb ddb769bf7f Polish 'Simplify conditionals' 
See gh-39259
 2024-01-23 09:47:07 -08:00
Tobias Lippert 65a1ff84e6 Simplify conditionals 
See gh-39259
 2024-01-23 09:07:40 -08:00
Phillip Webb a0a804cfdf Merge branch '3.2.x' 2024-01-22 12:20:41 -08:00
Phillip Webb 088b313ae5 Polish 2024-01-22 11:57:37 -08:00
Moritz Halbritter 6e3d4ed878 Use ReactiveFindByIndexNameSessionRepository 
See gh-32046
 2024-01-22 12:55:37 +01:00
Moritz Halbritter de76ef1b3b Polish "Provide an Actuator endpoint for non-indexed session repositories" 
See gh-32046
 2024-01-22 12:55:37 +01:00
Vedran Pavic 6a9eb7754f Provide an Actuator endpoint for non-indexed session repositories 
At present, Actuator sessions endpoint is supported only on a Servlet stack and also requires an indexed session repository. With Spring Session moving to non-indexed session repositories as a default for some session stores, this means that sessions endpoint won't be available unless users opt into a (non-default) indexed session repository.

This commit updates SessionEndpoint so that it is able to work with a non-indexed session repository. In such setup, it exposes operations for fetching session by id and deleting the session.

Additionally, this also adds support for reactive stack by introducing ReactiveSessionEndpoint and its auto-configuration support.

See gh-32046
 2024-01-22 12:55:37 +01:00
Andy Wilkinson a09cc22841 Allow a WebEndpointTest to only run against certain infrastructure 
Closes gh-32054
 2024-01-22 12:54:31 +01:00
Andy Wilkinson 7e382e7bf6 Merge branch '3.2.x' 
Closes gh-39123
 2024-01-12 17:08:36 +00:00
Andy Wilkinson 145fe15daf Merge branch '3.1.x' into 3.2.x 
Closes gh-39122
 2024-01-12 17:08:23 +00:00
Andy Wilkinson 3df77c67ec Fix request mapping of endpoint path-mapped to / 
Closes gh-35426
 2024-01-12 17:07:48 +00:00
teacmity c6c7fbc15f Change log messages to use singular or plural instead of "noun(s)" 
See gh-37017
 2024-01-11 14:35:49 +00:00
Andy Wilkinson 17e9f0cb8e Merge branch '3.2.x' 
Closes gh-39093
 2024-01-11 11:36:38 +00:00
Andy Wilkinson 7087897507 Merge branch '3.1.x' into 3.2.x 
Closes gh-39091
 2024-01-11 10:33:57 +00:00
Andy Wilkinson 45c32854a5 Fix Checkstyle upgrade 
Closes gh-38746
 2024-01-10 15:37:38 +00:00
Jonatan Ivanov 820396fdff Add ProcessInfoContributor 
This InfoContributor exposes information about
the process of the application.

See gh-38371
 2024-01-10 08:45:49 +01:00
Andrei Navrotski 49e9fe66a7 Align Health.down with Health.Builder.down 
See gh-38550
 2024-01-05 15:41:50 +00:00
Andy Wilkinson a1c7c0bccc Upgrade to AssertJ 3.25.1 
Closes gh-38997
 2024-01-04 17:26:35 +00:00
Phillip Webb 5354ad15b3 Merge branch '3.1.x' 
Closes gh-38877
 2023-12-19 22:51:48 -08:00
Yanming Zhou 8599e5a986 Remove unnecessary `toString()` calls 
See gh-38739
 2023-12-19 22:38:34 -08:00
Yanming Zhou ac18e3015c Use `.isEmpty()` where feasible 
See gh-38739
 2023-12-19 22:38:05 -08:00
Moritz Halbritter f613ab89b9 Auto-configure observations for RestClients 
Closes gh-38500
 2023-11-23 09:28:09 +01:00
Johnny Lim 175b6473c7 Polish 
See gh-38389
 2023-11-22 10:16:19 +01:00
Claudio Nave 61aecdedd6 Remove Liquibase javax.activation excludes 
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487) so we
can now remove our exclusions.

See gh-38274
 2023-11-09 11:44:31 -08:00
Scott Frederick efb5cb0bcd Merge branch '3.1.x' 
Closes gh-38044
 2023-10-25 13:53:19 -05:00
Scott Frederick 16c975a9c7 Merge branch '3.0.x' into 3.1.x 
Closes gh-38043
 2023-10-25 13:53:06 -05:00
Scott Frederick 627c93adcf Merge branch '2.7.x' into 3.0.x 
Closes gh-38042
 2023-10-25 13:52:54 -05:00
Scott Frederick eae95f8d17 Handle null host value in MailHealthIndicator 
If both the host and port are omitted from the mail properties, the
`location` field will be omitted from the health indicator details.

Fixes gh-38007
 2023-10-25 13:52:36 -05:00
Phillip Webb d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb 548b0ea91f Fix failing exception assertion 
See gh-37964
 2023-10-19 22:05:59 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson 5280cfeec0 Adapt to breaking API change in Micrometer 
See gh-37703
 2023-10-10 17:56:56 +01:00
Andy Wilkinson f6c88662b4 Merge branch '3.1.x' 
Closes gh-37144
 2023-08-30 13:36:01 +01:00
Andy Wilkinson e6fcde4af5 Merge branch '3.0.x' into 3.1.x 
Closes gh-37143
 2023-08-30 13:35:40 +01:00
Andy Wilkinson a8e37b5cc5 Merge branch '2.7.x' into 3.0.x 
Closes gh-37142
 2023-08-30 13:34:12 +01:00
hakan-krgn 6d9ce8a3b5 Polish code and javadoc 
See gh-37112
 2023-08-30 13:31:58 +01:00
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Moritz Halbritter 62fb45f75f Replace contains/put/get pattern with computeIfAbsent 2023-08-08 13:12:47 +02:00
Moritz Halbritter ed9169501e Polish 2023-08-08 13:12:47 +02:00
Stephane Nicoll 37d8760652 Merge branch '3.1.x' 
Closes gh-36739
 2023-08-04 14:36:27 +02:00
Stephane Nicoll 1df70c9f9b Merge branch '3.0.x' into 3.1.x 
Closes gh-36738
 2023-08-04 14:36:15 +02:00
Stephane Nicoll 6ee002456d Merge branch '2.7.x' into 3.0.x 
Closes gh-36737
 2023-08-04 14:36:04 +02:00
Stephane Nicoll 747dbc35fe Warmup connection pool in ConnectionPoolMetricsTests 
Closes gh-36474
 2023-08-04 14:29:59 +02:00
Moritz Halbritter 02a7c22f40 Revert "Use virtual threads in JmsHealthIndicator if enabled" 
This reverts commit 6fc585c5d2.
 2023-08-03 17:25:28 +02:00
Moritz Halbritter a843aca821 Revert "Polish" 
This reverts commit 25eb3c8c18.
 2023-08-03 17:25:15 +02:00
Moritz Halbritter 25eb3c8c18 Polish 2023-08-03 11:16:16 +02:00
Moritz Halbritter 6fc585c5d2 Use virtual threads in JmsHealthIndicator if enabled 
Closes gh-36694
 2023-08-03 10:32:42 +02:00
Johnny Lim 5a205dbfd1 Polish 
See gh-36620
 2023-07-28 11:35:33 +01:00
Stephane Nicoll 746cb00833 Merge branch '3.1.x' 
Closes gh-36517
 2023-07-24 13:00:57 +02:00
Stephane Nicoll 48622f2b7d Merge branch '3.0.x' into 3.1.x 
Closes gh-36516
 2023-07-24 13:00:47 +02:00
Stephane Nicoll 74349d1192 Merge branch '2.7.x' into 3.0.x 
Closes gh-36515
 2023-07-24 13:00:38 +02:00
fzyzcjy e67bca121b Fix description of started and ready time metrics 
See gh-36507
 2023-07-24 12:57:06 +02:00
Andy Wilkinson 3affb3342e Deprecate auto-configuration for InfluxDB 
Closes gh-35190
 2023-07-20 13:31:10 +01:00
Stephane Nicoll 289d458a60 Start building against Spring Framework 6.1.0-M3 snapshots 
See gh-36443
 2023-07-18 15:04:42 +02:00
Stephane Nicoll 783bfb62e2 Merge branch '3.1.x' 
Closes gh-36420
 2023-07-17 10:04:14 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files 
See gh-36306
 2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos 
See gh-36306
 2023-07-17 09:40:16 +02:00
Andy Wilkinson 3b2551619f Merge branch '3.1.x' 2023-07-07 12:19:23 +01:00
Andy Wilkinson 1085c1707e Merge branch '3.0.x' into 3.1.x 2023-07-07 12:19:15 +01:00
Andy Wilkinson 732424f7cb Polish 2023-07-07 12:19:05 +01:00
Andy Wilkinson 8ed2ef5640 Merge branch '3.1.x' 
Closes gh-36277
 2023-07-07 12:07:25 +01:00
Andy Wilkinson c4157bb515 Merge branch '3.0.x' into 3.1.x 
Closes gh-36276
 2023-07-07 12:07:07 +01:00
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x 
Closes gh-36275
 2023-07-07 12:06:51 +01:00
Andy Wilkinson 52f732920b Support multiple health groups with an additional path with Jersey 
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
 2023-07-07 11:21:56 +01:00
Andy Wilkinson ce8253ea95 Merge branch '3.1.x' 
Closes gh-36238
 2023-07-05 09:51:35 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x 
Closes gh-36237
 2023-07-05 09:47:43 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList() 
See gh-36167
 2023-07-05 09:38:19 +01:00
Phillip Webb 1cced11ea3 Merge branch '3.1.x' 
Closes gh-36161
 2023-07-02 14:01:26 +01:00
Phillip Webb dcde1fac7e Merge branch '3.0.x' into 3.1.x 
Closes gh-36160
 2023-07-02 14:01:08 +01:00
Phillip Webb 566549021b Merge branch '2.7.x' into 3.0.x 
Closes gh-36159
 2023-07-02 14:00:47 +01:00
Phillip Webb 51ee702dac Allow configprops endpoint stringify primitive wrappers 
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.

Fixes gh-36076
 2023-07-02 13:59:30 +01:00
Andy Wilkinson ea73203219 Merge branch '3.1.x' 
Closes gh-36130
 2023-06-30 08:48:51 +01:00
Andy Wilkinson f0fee86b62 Merge branch '3.0.x' into 3.1.x 
Closes gh-36129
 2023-06-30 08:48:40 +01:00
Andy Wilkinson fa72f90a10 Avoid NPE when a PeriodicTrigger has no initial delay 
Closes gh-36081
 2023-06-30 08:47:34 +01:00
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2 
Closes gh-36034
 2023-06-23 18:14:22 +01:00
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36044
 2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x 
Closes gh-36043
 2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking" 
See gh-35915
 2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking 
See gh-35915
 2023-06-23 12:16:26 +01:00
Andy Wilkinson 1e17d8eeea Upgrade to Liquibase 4.22.0 
Closes gh-35956
 2023-06-19 16:30:52 +01:00
Phillip Webb 1de7edb615 Remove accidentally committed code 2023-06-16 15:21:03 -07:00
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb c192fb85b2 Merge branch '3.0.x' into 3.1.x 
Closes gh-35922
 2023-06-15 14:26:55 -07:00
Phillip Webb 4c8b93b37d Merge branch '2.7.x' into 3.0.x 
Closes gh-35920
 2023-06-15 14:26:36 -07:00
Phillip Webb 137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint 
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
 2023-06-15 14:03:22 -07:00
Moritz Halbritter ebbb4d319d Polish 2023-06-07 10:53:03 +02:00
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Phillip Webb e9c4a5d663 Polish 2023-05-12 13:01:30 -07:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Andy Wilkinson 8494ad82cd Merge branch '3.0.x' 
Closes gh-35255
 2023-05-03 17:45:17 +01:00
Andy Wilkinson 0776d01f16 Merge branch '2.7.x' into 3.0.x 
Closes gh-35254
 2023-05-03 17:44:49 +01:00
Andy Wilkinson fad24d5ced Fix handling of default port in mail health indicator 
Fixes gh-35247
 2023-05-03 17:33:37 +01:00
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb 6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac 
See gh-35228
 2023-05-02 13:40:59 +02:00
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x' 
Closes gh-35173
 2023-04-26 12:48:50 +01:00
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x 
Closes gh-35172
 2023-04-26 12:48:16 +01:00
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization 
Closes gh-35164
 2023-04-26 11:47:03 +01:00
Stephane Nicoll 2dcb849c0f Merge branch '3.0.x' 
Closes gh-34939
 2023-04-11 16:39:00 +02:00
Stephane Nicoll 320db790e7 Merge branch '2.7.x' into 3.0.x 
Closes gh-34938
 2023-04-11 16:38:46 +02:00
Stephane Nicoll 4b8829364e Polish "Use removeIf rather than Iterator-based removal" 
See gh-34762
 2023-04-11 16:32:26 +02:00
SeasonPan 0d13e31827 Use removeIf rather than Iterator-based removal 
See gh-34762
 2023-04-11 16:20:43 +02:00
Stephane Nicoll 6876556b60 Upgrade to Json Path 2.8.0 
Closes gh-34878
 2023-04-06 16:25:23 +02:00
Phillip Webb 3dbc3a1943 Merge branch '3.0.x' 2023-03-23 23:01:32 -07:00
Mortitz Halbritter 42187e7bff Polish 2023-03-23 23:00:58 -07:00
Phillip Webb da925242f3 Polish 'Add SanitizableData.withSanitizedValue method' 
See gh-34615
 2023-03-15 15:17:52 -07:00
Rohan Goyal f789c9a56e Add SanitizableData.withSanitizedValue method 
See gh-34615
 2023-03-15 15:10:51 -07:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00