Commit Graph

16180 Commits

Author SHA1 Message Date
Stephane Nicoll 78d0db7ff0 Upgrade to Infinispan 12.1.12.Final
Closes gh-31412
2022-06-17 10:30:16 +02:00
Stephane Nicoll 623a48fb03 Upgrade to Groovy 3.0.11
Closes gh-31411
2022-06-17 10:30:14 +02:00
Stephane Nicoll ae1b47c245 Upgrade to AppEngine SDK 1.9.97
Closes gh-31410
2022-06-17 10:30:12 +02:00
Phillip Webb ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
2022-06-16 15:35:32 -07:00
Lars Grefer e8a1a0399a Upgrade to Bouncycastle 1.71
Closes gh-31400
2022-06-16 12:14:06 +01:00
Stephane Nicoll 7e6acfd2ab Upgrade to Micrometer 1.8.7
Closes gh-31347
2022-06-16 11:03:51 +02:00
Phillip Webb b42f056ddb Don't close jar files early
Update `JarFile` and related classes so that `close()` is not longer
called early.

Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.

The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.

Fixes gh-29356
2022-06-15 10:51:01 -07:00
Stephane Nicoll 49b71005de Upgrade to Spring Framework 5.3.21
Closes gh-31318
2022-06-15 11:06:29 +02:00
Stephane Nicoll cb4f5ed08e Upgrade to Reactor 2020.0.20
Closes gh-31346
2022-06-15 08:12:33 +02:00
Phillip Webb 9f8a262e6b Log a warning when a health indicator takes too long to run
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
2022-06-14 09:32:07 -07:00
Andy Wilkinson 2094722e5d Remove duplicate content from "The Spring WebFlux Framework"
Closes gh-31378
2022-06-14 11:52:06 +01:00
Andy Wilkinson 5d7cab09b8 Revert BindConverter changes that are now handled by Framework
See gh-28592 and spring-projects/spring-framework#28609

Closes gh-31343
2022-06-14 10:37:35 +01:00
Stephane Nicoll 2f40c52d81 Start building against Spring Session 2021.1.4 snapshots
See gh-31352
2022-06-14 07:59:44 +02:00
Stephane Nicoll 342d01314a Start building against Spring Security 5.6.6 snapshots
See gh-31351
2022-06-14 07:59:44 +02:00
Stephane Nicoll ba572e5e16 Start building against Spring Kafka 2.8.7 snapshots
See gh-31350
2022-06-14 07:59:43 +02:00
Stephane Nicoll d22c0a22c3 Start building against Spring Data 2021.1.5 snapshots
See gh-31349
2022-06-14 07:59:43 +02:00
Stephane Nicoll bc6d2ea16d Start building against Spring AMQP 2.4.6 snapshots
See gh-31348
2022-06-14 07:59:43 +02:00
Stephane Nicoll a2f323b4ed Start building against Micrometer 1.8.7 snapshots
See gh-31347
2022-06-14 07:59:43 +02:00
Stephane Nicoll 2c7812e504 Start building against Reactor 2020.0.20 snapshots
See gh-31346
2022-06-14 07:59:43 +02:00
Phillip Webb b3a46fc50e Document that placeholders should us the canonical property name form
Closes gh-31309
2022-06-13 18:19:47 -07:00
Anthony Vanelverdinghe 1fffdbae2a Fix typos in the reference documentation
See gh-31328
2022-06-13 16:02:48 +02:00
Lars Grefer 8c9557f552 Enable Links for the Javadoc of the Gradle Plugins
See gh-31279
2022-06-13 15:51:08 +02:00
Anthony Vanelverdinghe b1ccb600f3 Remove reference to outdated location
See gh-31276
2022-06-13 14:52:38 +02:00
Stern, Ittay (is9613) e05363f9b0 Restore Custom Favicon section in the reference guide
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.

See gh-31224
2022-06-13 14:50:18 +02:00
Stephane Nicoll d896d995d1 Polish contribution
See gh-31190
2022-06-13 14:39:58 +02:00
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor
See gh-31190
2022-06-13 14:33:21 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Phillip Webb 63fdd729f5 Refine conversion service type check
Update fix to account for primitive types.

See gh-28592
2022-06-10 16:12:38 -07:00
Phillip Webb 31b0264d94 Ensure conversion service actually converts to the correct type
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
2022-06-10 14:29:25 -07:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat
Closes gh-31322
2022-06-10 11:32:57 +01:00
Andy Wilkinson ed897fc922 Start building against Spring Framework 5.3.21 snapshots
See gh-31318
2022-06-09 19:37:50 +01:00
Andy Wilkinson a651061e2c Remove SpringApplicationHierarchyTests
Closes gh-31281
2022-06-08 19:23:26 +01:00
Stephane Nicoll bbb5966bca Upgrade integration tests to Apache Maven 3.8.5
Closes gh-31260
2022-06-07 09:15:41 +02:00
Andy Wilkinson 348662b15e Remove unused deduceFromApplicationContext and supporting code
Closes gh-31218
2022-05-31 10:57:22 +01:00
Andy Wilkinson 0b6c147a87 Polish 2022-05-30 19:22:30 +01:00
Andy Wilkinson da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
2022-05-30 18:19:47 +01:00
Andy Wilkinson 419ac26e0d Use conventions for source and encoding of aggregatedJavadoc
Closes gh-31210
2022-05-30 17:15:45 +01:00
Stephane Nicoll ad1214c972 Upgrade copyright year of changed files
See gh-31197
2022-05-30 15:13:12 +02:00
heqiang 3a0ab01066 Polish "Remove boxing"
See gh-31197
2022-05-30 15:02:58 +02:00
Matei Cernăianu eb8b9e17c5 Fix "spring.factories" typos in database initialization documentation
See gh-31203
2022-05-30 14:55:15 +02:00
Andy Wilkinson 83e8c039b3 Add application/wasm to MIME mappings
Closes gh-30885
2022-05-27 11:14:04 +01:00
Andy Wilkinson 56c3a5f0ab Polish "Assert that sources does not contain null elements"
See gh-30878
2022-05-27 10:01:06 +01:00
Guirong Hu ebf276c005 Assert that sources does not contain null elements
See gh-30878
2022-05-27 10:00:32 +01:00
Damiano Albani 3f91ed037f Fix Custom Layers Configuration section title in Maven plugin docs
See gh-31172
2022-05-26 19:46:11 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson 3e7bd582a3 Upgrade to Spring Java Format 0.0.33
Closes gh-31166
2022-05-26 13:22:23 +01:00
Phillip Webb 9fa33e5645 Merge branch '2.5.x' into 2.6.x
Closes gh-31127
2022-05-19 18:04:54 -07:00
Phillip Webb 05a6447a8d Polish "Resolve errors in layers.xsd"
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.

See gh-31126
2022-05-19 18:01:55 -07:00
Liuzh 0d78323b60 Resolve errors in layers.xsd
Update `layer-*.xsd` files with following fixes:

- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>

See gh-31126
2022-05-19 18:00:25 -07:00
Andy Wilkinson a712b1e6b0 Upgrade to Spring Security 5.6.5
Closes gh-31102
2022-05-18 19:19:47 +01:00
Andy Wilkinson e82def03ca Upgrade to Spring Security 5.5.8
Closes gh-31096
2022-05-18 19:18:24 +01:00
Andy Wilkinson 69edce0629 Upgrade to Spring Batch 4.3.6
Closes gh-31011
2022-05-18 17:37:11 +01:00
Andy Wilkinson 7f60c67074 Upgrade to Spring Batch 4.3.6
Closes gh-31003
2022-05-18 17:35:55 +01:00
Andy Wilkinson e407bae8c8 Merge branch '2.5.x' into 2.6.x
Closes gh-31098
2022-05-18 13:14:15 +01:00
Andy Wilkinson 5e78bef9f8 Test security dialect auto-config without Spring Security
Closes gh-31097
2022-05-18 13:06:09 +01:00
Stephane Nicoll 01288b61af Upgrade to Spring Integration 5.5.12
Closes gh-31061
2022-05-18 08:54:57 +02:00
Stephane Nicoll 4eb778df43 Upgrade to Spring Integration 5.5.12
Closes gh-31060
2022-05-18 08:54:24 +02:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Phillip Webb 0beccde6ee Merge branch '2.5.x' into 2.6.x
Closes gh-31094
2022-05-17 22:18:38 -07:00
Phillip Webb 7da42d7139 Allow tests to pass when a NAME environment variable exists
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.

Closes gh-31076
2022-05-17 22:16:24 -07:00
Phillip Webb 6bce0c5044 Merge branch '2.5.x' into 2.6.x
Closes gh-31092
2022-05-17 22:14:21 -07:00
Phillip Webb 44c979beb0 Reorder default property sources after @PropertySource processing
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.

Fixes gh-31068
2022-05-17 22:13:49 -07:00
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 2022-05-17 21:48:50 -07:00
Phillip Webb 350d27fe50 Polish code to use method references when possible 2022-05-17 21:16:42 -07:00
Scott Frederick f395cfa255 Merge branch '2.5.x' into 2.6.x
Closes gh-31088
2022-05-17 18:46:38 -05:00
Scott Frederick 50e27333d2 Tolerate failures when recording WebClient metrics
Fixes gh-30978
2022-05-17 18:45:37 -05:00
Andy Wilkinson e3b2088e85 Merge branch '2.5.x' into 2.6.x
Closes gh-31085
2022-05-17 18:36:54 +01:00
Andy Wilkinson cc2d68968d Upgrade to Maven Resolver 1.6.3
This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.

Closes gh-31083
2022-05-17 17:51:37 +01:00
Andy Wilkinson f6b095bdfd Merge branch '2.5.x' into 2.6.x
Closes gh-31078
2022-05-17 15:03:57 +01:00
Andy Wilkinson f19d91561b Manage version of all Artemis modules upon which the build depends
Closes gh-31077
2022-05-17 15:01:23 +01:00
Stephane Nicoll d2d4eefe1b Upgrade to Spring Security 5.6.4
Closes gh-31012
2022-05-17 09:42:13 +02:00
Stephane Nicoll a9df2a1ef7 Upgrade to Spring Kafka 2.8.6
Closes gh-31010
2022-05-17 09:41:36 +02:00
Stephane Nicoll f7f4831199 Upgrade to Spring Security 5.5.7
Closes gh-31005
2022-05-17 09:41:01 +02:00
Stephane Nicoll e9791e904d Upgrade to Spring Kafka 2.7.14
Closes gh-31004
2022-05-17 09:40:44 +02:00
Andy Wilkinson 9381daddb3 Upgrade to Spring AMQP 2.4.5
Closes gh-31009
2022-05-16 17:40:31 +01:00
Stephane Nicoll 6cc8714dec Start building against Spring Integration 5.5.12 snapshots
See gh-31061
2022-05-16 16:41:19 +02:00
Stephane Nicoll d479d2eeb9 Start building against Spring Integration 5.5.12 snapshots
See gh-31060
2022-05-16 16:39:57 +02:00
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x
Closes gh-31058
2022-05-16 16:37:07 +02:00
Stephane Nicoll 22d187a38c Polish "Add missing configuration properties for Statsd"
See gh-30898
2022-05-16 16:33:22 +02:00
izeye d90ef6afb3 Add missing configuration properties for Statsd
See gh-30898
2022-05-16 16:28:50 +02:00
Andy Wilkinson 7a14673a00 Upgrade to Spring LDAP 2.3.8.RELEASE
Closes gh-31044
2022-05-16 11:39:12 +01:00
Andy Wilkinson 456d56d1bb Upgrade to Spring Framework 5.3.20
Closes gh-31043
2022-05-16 11:39:08 +01:00
Andy Wilkinson 8fa4103420 Upgrade to Jackson Bom 2.13.3
Closes gh-31042
2022-05-16 11:39:06 +01:00
Andy Wilkinson d7236934c1 Upgrade to Hibernate 5.6.9.Final
Closes gh-31041
2022-05-16 11:39:04 +01:00
Andy Wilkinson 23aae09936 Upgrade to Spring LDAP 2.3.8.RELEASE
Closes gh-31039
2022-05-16 11:32:48 +01:00
Andy Wilkinson 6fa103bdb2 Start building against Spring Security 5.6.4 snapshots
See gh-31012
2022-05-12 16:59:07 +01:00
Andy Wilkinson 40f82e9aa5 Start building against Spring Batch 4.3.6 snapshots
See gh-31011
2022-05-12 16:59:07 +01:00
Andy Wilkinson 2a9d9698ac Start building against Spring Kafka 2.8.6 snapshots
See gh-31010
2022-05-12 16:59:06 +01:00
Andy Wilkinson 9137d777ab Start building against Spring AMQP 2.4.5 snapshots
See gh-31009
2022-05-12 16:59:00 +01:00
Andy Wilkinson 76bc188e9f Upgrade to Spring HATEOAS 1.4.3
Closes gh-31008
2022-05-12 16:49:57 +01:00
Andy Wilkinson 2413e80105 Upgrade to Micrometer 1.8.6
Closes gh-31007
2022-05-12 16:49:09 +01:00
Andy Wilkinson 5ce39254de Start building against Spring Security 5.5.7 snapshots
See gh-31005
2022-05-12 15:46:11 +01:00
Andy Wilkinson 0233cf01d3 Start building against Spring Kafka 2.7.14 snapshots
See gh-31004
2022-05-12 15:45:02 +01:00
Andy Wilkinson 30bdd76bbe Start building against Spring Batch 4.3.6 snapshots
See gh-31003
2022-05-12 15:44:27 +01:00
Andy Wilkinson 6286fd7917 Upgrade to Spring Framework 5.3.20
Closes gh-31002
2022-05-12 15:43:46 +01:00
Andy Wilkinson e38cd9f928 Upgrade to Micrometer 1.7.12
Closes gh-31001
2022-05-12 15:43:04 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x
Closes gh-30996
2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics"
See gh-30879
2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
2022-05-12 12:36:18 +01:00
Andy Wilkinson 9f46cf88c8 Merge branch '2.5.x' into 2.6.x
Closes gh-30994
2022-05-12 12:27:52 +01:00
颜虎 309e54bd21 Fix link to Upgrading From 1.x in multi-page documentation
See gh-30890
2022-05-12 12:15:30 +01:00
Andy Wilkinson 1fd9c4d82c Polish
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye 624c41c80e Polish
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson ba8274b3cb Upgrade to Reactor Bom 2020.0.19
Closes gh-30926
2022-05-10 16:58:47 +01:00
Andy Wilkinson b61661ff5f Upgrade to Postgresql 42.3.5
Closes gh-30925
2022-05-10 16:58:44 +01:00
Andy Wilkinson 295b3b0fbd Upgrade to Netty tcNative 2.0.52.Final
Closes gh-30924
2022-05-10 16:58:42 +01:00
Andy Wilkinson 4c197e4175 Upgrade to Netty 4.1.77.Final
Closes gh-30923
2022-05-10 16:58:39 +01:00
Andy Wilkinson 1f4f64553c Upgrade to MySQL 8.0.29
Closes gh-30922
2022-05-10 16:58:36 +01:00
Andy Wilkinson bf63740a9a Upgrade to Johnzon 1.2.18
Closes gh-30921
2022-05-10 16:58:33 +01:00
Andy Wilkinson 0a3169aab7 Upgrade to Jaybird 4.0.6.java8
Closes gh-30920
2022-05-10 16:58:31 +01:00
Andy Wilkinson d0bdb2a061 Upgrade to Hazelcast 4.2.5
Closes gh-30919
2022-05-10 16:58:28 +01:00
Andy Wilkinson 23ad3e1952 Upgrade to Couchbase Client 3.2.7
Closes gh-30918
2022-05-10 16:58:26 +01:00
Andy Wilkinson 68b54f194f Upgrade to ActiveMQ 5.16.5
Closes gh-30917
2022-05-10 16:58:23 +01:00
Andy Wilkinson 432741f06e Upgrade to Reactor Bom 2020.0.19
Closes gh-30913
2022-05-10 14:37:43 +01:00
Andy Wilkinson 7157ca4fe5 Upgrade to Netty tcNative 2.0.52.Final
Closes gh-30912
2022-05-10 14:37:41 +01:00
Andy Wilkinson 25c320be51 Upgrade to Netty 4.1.77.Final
Closes gh-30911
2022-05-10 14:37:39 +01:00
Andy Wilkinson 0713f772ba Upgrade to MySQL 8.0.29
Closes gh-30910
2022-05-10 14:37:36 +01:00
Andy Wilkinson 84b1b67e6d Upgrade to Johnzon 1.2.18
Closes gh-30909
2022-05-10 14:37:34 +01:00
Andy Wilkinson 705ce88f13 Upgrade to Jaybird 4.0.6.java8
Closes gh-30908
2022-05-10 14:37:30 +01:00
Andy Wilkinson 0c19ae5294 Upgrade to Hazelcast 4.1.9
Closes gh-30907
2022-05-10 14:37:27 +01:00
Andy Wilkinson 6938df26e0 Upgrade to ActiveMQ 5.16.5
Closes gh-30906
2022-05-10 14:37:25 +01:00
Andy Wilkinson d10addffe3 Merge branch '2.5.x' into 2.6.x
Closes gh-30886
2022-05-06 18:15:01 +01:00
christophejan a1f3d68ead Improve debug logging of requests to actuator endpoints on WebFlux
See gh-30880
2022-05-06 17:49:27 +01:00
Andy Wilkinson 5258cd2814 Merge branch '2.5.x' into 2.6.x
Closes gh-30882
2022-05-06 11:29:22 +01:00
Andy Wilkinson 0e7c3547dd Prohibit usage of Micrometer nullability annotations
Closes gh-30881
2022-05-06 11:29:08 +01:00
Andy Wilkinson c9571a04ab Merge branch '2.5.x' into 2.6.x
Closes gh-30873
2022-05-05 10:19:01 +01:00
Andy Wilkinson 6d4f0232ca Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
See gh-30505
2022-05-05 10:02:27 +01:00
Guirong Hu dc57ad54d5 Fix ConditionalOnProperty when used in an aliased composed annotation
See gh-30505
2022-05-05 10:02:15 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson b20a8bd778 Merge branch '2.5.x' into 2.6.x
Closes gh-30847
2022-05-03 13:54:59 +01:00
Andy Wilkinson 798d61fcf0 Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
See gh-30844
2022-05-03 13:54:13 +01:00
dugenkui03 aeaad006cd Make event handling in ClassPathFileSystemWatcherTests thread-safe
See gh-30844
2022-05-03 13:52:55 +01:00
Andy Wilkinson a8b5a1c688 Merge branch '2.5.x' into 2.6.x
Closes gh-30845
2022-05-03 13:51:38 +01:00
Andy Wilkinson 026b9e2efe Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
See gh-30705
2022-05-03 13:49:12 +01:00
dugenkui03 c8d1dfebab Make event handling in JobExecutionExitCodeGenerator thread-safe
See gh-30705
2022-05-03 13:48:15 +01:00
Andy Wilkinson f1b5f36af8 Merge branch '2.5.x' into 2.6.x
Closes gh-30841
2022-05-03 11:28:53 +01:00
Andy Wilkinson f8e5a534a6 Polish "Polish InfluxMetricsExportAutoConfiguration"
See gh-30824
2022-05-03 09:50:51 +01:00
Eddú Meléndez b0d5364efa Polish InfluxMetricsExportAutoConfiguration
See gh-30824
2022-05-03 09:50:06 +01:00
Andy Wilkinson bf94ea24d3 Improve testing of Batch schema resolution
Closes gh-30794
2022-04-25 19:30:59 +01:00
Andy Wilkinson 409ec48e2a Merge branch '2.5.x' into 2.6.x
Closes gh-30790
2022-04-25 15:00:51 +01:00
Andy Wilkinson 193ef9a06d Package META-INF/services/ files beneath BOOT-INF/classes/
Closes gh-30413
2022-04-25 14:32:47 +01:00
Andy Wilkinson 3f23c08268 Merge branch '2.5.x' into 2.6.x
Closes gh-30788
2022-04-25 14:11:08 +01:00
Andy Wilkinson ce788657ce Improve diagnostics for map binding failures
Closes gh-30281
2022-04-25 13:50:09 +01:00
Andy Wilkinson 5c3be7c61e Merge branch '2.5.x' into 2.6.x
Closes gh-30786
2022-04-25 12:36:14 +01:00
Andy Wilkinson ffe0ec6d4d Use SearchStrategy in MethodValidationExcludeFilter byAnnotation
Closes gh-30631
2022-04-25 12:35:41 +01:00