Johnny Lim
ff9fd1abeb
Polish
...
See gh-35185
2023-05-10 08:31:36 +02:00
Moritz Halbritter
05add58976
Merge branch '3.0.x'
...
Closes gh-35373
2023-05-10 08:23:35 +02:00
Moritz Halbritter
42cc84070b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35372
2023-05-10 08:23:27 +02:00
Moritz Halbritter
52789cb191
Fix anchors in Maven plugin documentation
...
Closes gh-35371
2023-05-10 08:21:44 +02:00
Andy Wilkinson
93c3116b3a
Fix failsGracefullyWhenNoTestMainMethodIsFound on Windows
2023-05-09 16:56:18 +01:00
Moritz Halbritter
a4092fb396
Remove HTML tags from TestRunMojo javadoc
...
Closes gh-35349
2023-05-09 10:14:55 +02:00
Scott Frederick
cf180fa1cc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick
5d91c24f63
Update Couchbase image tag used in tests
...
Closes gh-35228
2023-05-05 14:45:58 -05:00
Andy Wilkinson
07a11045d9
Merge branch '3.0.x'
...
Closes gh-35328
2023-05-05 17:35:50 +01:00
Andy Wilkinson
fd864c35aa
Improve mapping of resolved artifacts to dependency coordinates
...
Closes gh-31216
2023-05-05 17:32:59 +01:00
Moritz Halbritter
441ed30ee4
Polish "Replace Mockito argument captors with assertArg"
...
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
See gh-35015
2023-05-05 15:41:31 +02:00
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02:00
Scott Frederick
1143396531
Add smoke tests to verify Couchbase SSL connections
...
See gh-34811
2023-05-04 17:09:52 -05:00
Andy Wilkinson
19d7973776
Add bootTestRun to run app using test source set output and classpath
...
Closes gh-35248
2023-05-04 15:27:10 +01:00
Andy Wilkinson
e43998615c
Add a test-run goal to the Maven plugin
...
Closes gh-35202
2023-05-04 15:06:03 +01:00
Moritz Halbritter
9b5a2643cc
Polish "Add service connection from Testcontainers Zipkin"
...
See gh-35107
2023-05-03 13:09:50 +02:00
Phillip Webb
d86e82d026
Merge branch '3.0.x'
2023-05-02 15:42:05 -07:00
Phillip Webb
2c27ec5b7b
Merge branch '2.7.x' into 3.0.x
2023-05-02 15:42:00 -07:00
Phillip Webb
b3226c55d2
Polish
2023-05-02 15:41:55 -07:00
Scott Frederick
23ae91b008
Add native image manifest entry
...
A manifest entry `Spring-Boot-Native-Processed: true` is added to the
jar manifest by the Maven or Gradle plugin when the jar has been built
for use in a native image. With the Gradle plugin, this is done in
reaction to the GraalVM Native Image Plugin being applied to the
project. With the Maven plugin, this is done when the `native` profile
is applied to the build.
2023-05-02 15:11:49 -05:00
Scott Frederick
5ac6a3d90b
Add smoke test to verify MongoDB SSL connections
...
See gh-35042
2023-05-02 15:11:09 -05:00
Scott Frederick
3bb271e320
Add smoke test to verify Redis SSL connection
...
See gh-34815
2023-05-02 13:52:50 -05:00
Moritz Halbritter
9d50d92b9c
Merge branch '3.0.x'
2023-05-02 16:36:49 +02:00
Moritz Halbritter
1f4a337ad2
Merge branch '2.7.x' into 3.0.x
2023-05-02 16:17:50 +02:00
Moritz Halbritter
091d6204cb
Disable build image integration tests on aarch64 linux and mac
...
See gh-35229
2023-05-02 15:38:42 +02:00
Moritz Halbritter
7c725a7560
Polish DockerImageNames
2023-05-02 15:01:45 +02:00
Andy Wilkinson
ce7bf0d0af
Merge branch '3.0.x'
...
Closes gh-35197
2023-04-28 18:06:37 +01:00
Andy Wilkinson
4581c25e20
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35196
2023-04-28 18:06:12 +01:00
Andy Wilkinson
de2df9311c
Test Gradle plugin against Gradle 8.1.1
...
Closes gh-35195
2023-04-28 18:05:06 +01:00
Andy Wilkinson
b64adbc34b
Fix disabled conditions on AbstractDockerComposeIntegrationTests
2023-04-20 16:12:36 +01:00
Andy Wilkinson
d4f857683d
Polish formatting of DockerImageNames
2023-04-19 14:22:12 +01:00
Stephane Nicoll
a323bd90a8
Polish "Reintroduce support for ActiveMQ"
...
See gh-35048
2023-04-19 13:08:14 +02:00
Andy Wilkinson
651f341385
Fix compatibility of Redpanda Docker image name
...
See 3e010b12
2023-04-18 19:52:17 +01:00
Phillip Webb
3e010b1230
Fetch redpanda directly from docker hub
...
Attempt to avoid rate limiting issues by fetching redpanda directly
from docker hub.
See gh-34780
2023-04-18 10:51:46 -07:00
Andy Wilkinson
0da209db08
Polish "Add support for Oracle R2DBC Service Connection"
...
See gh-34852
2023-04-18 13:47:46 +01:00
Eddu Melendez
f4bcf99d30
Add service connection from Testcontainers Redpanda
...
Redpanda (https://redpanda.com/ ) is Kafka-compatible and
Testcontainers provides a module. This commit adds support for
creating KafkaConnectionDetails from a
@ServiceConnection-annotated RedpandaContainer.
See gh-34780
2023-04-18 12:49:25 +01:00
Stephane Nicoll
16563a6a0a
Upgrade to Native Build Tools Plugin 0.9.21
...
Closes gh-35055
2023-04-18 13:45:53 +02:00
Andy Wilkinson
2b4f565b76
Merge branch '3.0.x'
...
Closes gh-35038
2023-04-17 17:52:11 +01:00
Andy Wilkinson
df93b39f60
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35037
2023-04-17 17:51:53 +01:00
Andy Wilkinson
d6bbbb8bac
Merge branch '3.0.x'
...
Closes gh-35036
2023-04-17 17:49:55 +01:00
Andy Wilkinson
284e4d6f6d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35035
2023-04-17 17:46:33 +01:00
Andy Wilkinson
88ec47ff2b
Test Gradle plugin against Gradle 8.1
...
Closes gh-35034
2023-04-17 17:38:28 +01:00
Andy Wilkinson
751fc9fe54
Fix includeProjectDependencies with Kotlin DSL
2023-04-17 17:35:15 +01:00
Mortitz Halbritter
24d1620a93
Add 'excludeDockerCompose' Maven property
...
Update `AbstractPackagerMojo` so that the docker-compose module
can be filtered from the packaged jar.
Co-authored-by: Phillip Webb <pwebb@vmware.com>
Co-authored-by: "Andy Wilkinson <wilkinsona@vmware.com>
2023-04-17 01:00:16 -07:00
Phillip Webb
4ae24e404e
Add @DisabledIfProcessUnavailable test support annotation
...
Add `@DisabledIfProcessUnavailable` annotation that can disable
a test if a process isn't available to execute.
Closes gh-35023
2023-04-17 01:00:04 -07:00
Andy Wilkinson
d5756db54c
Stop using Native Build Tools "requiredVersion" configuration option
...
Closes gh-34840
2023-04-14 11:55:20 +01:00
Andy Wilkinson
b8ec7d291d
Upgrade to Jackson Bom 2.15.0-rc2
...
Closes gh-34980
2023-04-14 11:55:20 +01:00
Phillip Webb
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
Phillip Webb
9b6a2a59a1
Set offset when checking date in tests
...
Update integration tests that check the current date so that the offset
is set for the current time before comparing results.
See gh-34786
2023-04-12 22:13:08 -07:00
Phillip Webb
8d2f550f8c
Merge branch '3.0.x'
2023-04-10 21:14:42 -07:00
Phillip Webb
3ba3558cff
Merge branch '2.7.x' into 3.0.x
2023-04-10 21:14:34 -07:00
Phillip Webb
3e9a136143
Polish gradle formatting
2023-04-10 21:14:09 -07:00
Phillip Webb
463701db18
Merge branch '3.0.x'
2023-04-10 16:22:57 -07:00
Phillip Webb
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
Scott Frederick
56bc6d2fa0
Allow image application directory to be configurable
...
An `applicationDirectory` option on the Maven
`spring-boot:build-image` goal and the Gradle `bootBuildImage` task
can be configured to set the location that will be used to upload
application contents to the builder image, and will contain the
application contents in the generated image.
Closes gh-34786
2023-04-07 14:00:00 -05:00
Scott Frederick
5817c8441d
Allow image Created date to be configurable
...
A `createdDate` option on the Maven `spring-boot:build-image` goal
and the Gradle `bootBuildImage` task can be used to set the `Created`
metadata field on a generated OCI image to a specified date or to
the current date.
Closes gh-28798
2023-04-06 15:08:34 -05:00
Stephane Nicoll
5c1c0a2b2e
Upgrade to Kotlin 1.8.20
...
Closes gh-34879
2023-04-06 16:25:23 +02:00
Andy Wilkinson
29193c4b9e
Merge branch '3.0.x'
...
Closes gh-34789
2023-03-28 09:33:55 +01:00
Andy Wilkinson
4b58eefe7b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34788
2023-03-28 09:33:41 +01:00
Andy Wilkinson
4705e82a6e
Note that optional dependencies are included by run and repackage
...
Closes gh-34636
2023-03-28 09:33:06 +01:00
Andy Wilkinson
95f45eab1f
Create service connections from Testcontainers-managed containers
...
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.
See gh-34658
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
Scott Frederick
9fa5aa3649
Merge branch '3.0.x'
...
Closes gh-
2023-03-21 14:56:16 -05:00
Scott Frederick
6a6f4a3928
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34704
2023-03-21 14:56:02 -05:00
Scott Frederick
ad680ed4ea
Polish "Add documentation for publishing images with Maven command line"
...
See gh-34517
2023-03-21 13:30:50 -05:00
Anthony Dahanne
21978da02a
Add documentation for publishing images with Maven command line
...
See gh-34517
2023-03-21 13:30:50 -05:00
Andy Wilkinson
7283493031
Upgrade to Maven Help Plugin 3.4.0
...
Closes gh-34687
2023-03-21 12:04:36 +00:00
Andy Wilkinson
bfeeda6fbc
Merge branch '3.0.x'
...
Closes gh-34601
2023-03-14 14:40:50 +00:00
Andy Wilkinson
220c4b671b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34600
2023-03-14 14:40:26 +00:00
Johnny Lim
00f388fa6f
Polish Javadoc since tags for gh-34324
...
See gh-34587
2023-03-14 14:39:10 +00:00
Scott Frederick
dab8b07302
Merge branch '3.0.x'
...
Closes gh-34496
2023-03-06 15:31:09 -06:00
Scott Frederick
29ad690d56
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34495
2023-03-06 15:30:55 -06:00
Scott Frederick
7730eee439
Use image manifest when exporting layers
...
A tar archive of a Docker image contains a `mainfest.json` file that
lists the path to each embedded tar file containing the contents of a
layer in the image. This manifest file should be used to identify the
layer files instead of relying on file naming conventions and
assumptions on the directory structure that are not consistent
between container engine implementations.
Fixes gh-34324
2023-03-06 15:13:08 -06:00
Andy Wilkinson
185dc18126
Merge branch '3.0.x'
...
Closes gh-34488
2023-03-06 10:53:52 +00:00
Andy Wilkinson
fab4230246
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34487
2023-03-06 10:53:32 +00:00
Andy Wilkinson
27ba20f310
Test Gradle plugin against Gradle 8.0.2
...
Closes gh-34486
2023-03-06 10:21:21 +00:00
Johnny Lim
390629eefd
Add Javadoc since to BuildInfoMojo.skip
...
See gh-34482
2023-03-06 10:05:07 +00:00
Scott Frederick
2602ce48b8
Merge branch '3.0.x'
...
Closes gh-34476
2023-03-03 16:50:55 -06:00
Scott Frederick
17755e5376
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34475
2023-03-03 16:49:45 -06:00
Scott Frederick
10d71f5645
Document how to get socket location for podman configuration
...
Closes gh-34435
2023-03-03 16:47:48 -06:00
Phillip Webb
91ce2d6e1e
Merge branch '3.0.x'
...
Closes gh-34473
2023-03-03 11:00:19 -08:00
Phillip Webb
4370757fb2
Use Java 17 in Maven integration tests
...
Closes gh-34472
2023-03-03 10:59:00 -08:00
Andy Wilkinson
2cb585aeb6
Merge branch '3.0.x'
...
Closes gh-34471
2023-03-03 16:28:22 +00:00
Andy Wilkinson
5c43e42839
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34470
2023-03-03 16:27:49 +00:00
Andy Wilkinson
95cd0f2435
Test Boot's Maven Plugin against Maven 3.9.0
...
Closes gh-34469
2023-03-03 16:27:02 +00:00
Andy Wilkinson
671d8a876f
Merge branch '3.0.x'
...
Closes gh-34463
2023-03-03 10:47:28 +00:00
Andy Wilkinson
6a95f44f67
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34462
2023-03-03 10:47:08 +00:00
Andy Wilkinson
68a1dd3a76
Document support for Gradle 8
...
Closes gh-34458
2023-03-03 10:42:28 +00:00
Andy Wilkinson
f180a02015
Merge branch '3.0.x'
...
Closes gh-34461
2023-03-03 10:36:55 +00:00
Andy Wilkinson
03dd666818
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34460
2023-03-03 10:27:32 +00:00
Andy Wilkinson
4f7e038f14
Test Gradle plugin against Gradle 8.0.1
...
Closes gh-34457
2023-03-03 10:21:26 +00:00
Phillip Webb
c735652e0b
Merge branch '3.0.x'
...
Closes gh-34453
2023-03-02 12:09:01 -08:00
Phillip Webb
956b9e06c9
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34452
2023-03-02 12:08:52 -08:00
Phillip Webb
69d34c96bf
Apply consistent timestamps to files added to a fat archive
...
Update logic in `BootZipCopyAction` to align with the recent changes
made in the Maven plugin (commit 998d59b7
). Timestamps are now
specified in UTC and offset against the default timezone before being
written.
Removing the offset from our UTC time before calling `entry.setTime()`
ensures that we get consistent bytes in the zip file when the output
stream reapplies the offset during write.
Closes gh-21005
2023-03-02 12:06:42 -08:00
Phillip Webb
2b94484078
Merge branch '3.0.x'
...
Closes gh-34431
2023-03-01 21:29:13 -08:00
Phillip Webb
f5cf821479
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34430
2023-03-01 21:28:51 -08:00
Phillip Webb
998d59b7ac
Ignore system timezone when applying outputTimestamp to entries
...
Update `JarWriter` so that entry times are set with the default TimeZone
offset removed. The Javadoc for `ZipEntry.setTime` states:
The file entry is "encoded in standard `MS-DOS date and time format`.
The default TimeZone is used to convert the epoch time to the MS-DOS
data and time.
Removing the offset from our UTC time before calling `entry.setTime()`
ensures that we get consistent bytes in the zip file when the output
stream reapplies the offset during write.
Fixes gh-34424
2023-03-01 21:27:08 -08:00
Chintan Radia
a98760125c
Add support for CNB platform API 0.11
...
See gh-34383
2023-03-01 09:24:42 +01:00
Diego Díez
b073ef0310
Add build-info skip support
...
See gh-34393
2023-03-01 09:19:14 +01:00
Andy Wilkinson
7e364cd67d
Merge branch '3.0.x'
...
Closes gh-34392
2023-02-27 13:55:17 +00:00
Andy Wilkinson
814b77c33f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34391
2023-02-27 13:54:59 +00:00
Andy Wilkinson
81882ecca4
Apply plugins consistently in Gradle documentation examples
...
Closes gh-34038
2023-02-27 13:26:05 +00:00
Andy Wilkinson
eb105572f6
Test Gradle plugin against Gradle 6.9.4
...
Closes gh-34368
2023-02-24 10:36:08 +00:00
Phillip Webb
157091a811
Merge branch '3.0.x'
2023-02-22 18:36:57 -08:00
Phillip Webb
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
Phillip Webb
a5902d7a00
Update copyright year of changed files
2023-02-22 18:35:17 -08:00
Phillip Webb
b07269a018
Merge branch '3.0.x'
2023-02-21 23:20:07 -08:00
Phillip Webb
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
Andy Wilkinson
6e9d94edb1
Merge branch '3.0.x'
...
Closes gh-34183
2023-02-14 19:49:50 +00:00
Johnny Lim
d368115128
Fix name for Implementation-Title in Spring Boot Gradle plugin
...
See gh-34177
2023-02-14 19:47:43 +00:00
Scott Frederick
12537c7170
Merge branch '3.0.x'
...
Closes gh-34162
2023-02-09 15:47:57 -06:00
Scott Frederick
cbac3c81d6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34161
2023-02-09 15:47:34 -06:00
Scott Frederick
33aef7fe27
Update CLI installation docs to download releases from Maven Central
...
Closes gh-33962
2023-02-09 15:45:15 -06:00
Andy Wilkinson
bbe526df70
Merge branch '3.0.x'
...
Closes gh-34120
2023-02-08 11:00:29 +00:00
Andy Wilkinson
9378fc47a7
Set implementation name and version in Gradle-built archives
...
Closes gh-34059
2023-02-08 10:59:55 +00:00
Andy Wilkinson
5a95fd0d2b
Make httpcore5-h2 classes available to Gradle tests
...
httpclient5 now requires classes in httpcore5-h2 in addition to those
in httpcore5.
See gh-34086
2023-02-07 15:13:48 +00:00
Andy Wilkinson
f595b46bd3
Upgrade to HttpClient5 5.2.1
...
Closes gh-34086
2023-02-06 14:46:05 +00:00
Moritz Halbritter
e0d8d528b7
Merge branch '3.0.x'
...
Closes gh-34073
2023-02-06 11:54:58 +01:00
Moritz Halbritter
2e61acb979
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34072
2023-02-06 11:54:51 +01:00
Enimiste
d6032c9d2c
Remove inputStream.close() line to conform to the interface
...
The "ReproducibleResourceTransformer" interface says that "An input
stream for the resource, the implementation should *not* close this
stream".
See gh-34063
2023-02-06 11:47:25 +01:00
lars-christian stitz
a186055c51
Improve log message when repackaging by specifying the involved files
...
See gh-33350
2023-01-31 13:16:56 +01:00
Moritz Halbritter
48db5ff35c
Merge branch '3.0.x'
...
Closes gh-34018
2023-01-31 10:51:45 +01:00
Moritz Halbritter
0a080736d8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34017
2023-01-31 10:50:30 +01:00
Moritz Halbritter
23f1c896c9
Merge branch '3.0.x'
...
Closes gh-34015
2023-01-31 10:20:36 +01:00
Johnny Lim
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2023-01-31 10:20:06 +01:00
Phillip Webb
390892f11b
Merge branch '3.0.x'
...
Closes gh-33998
2023-01-26 21:45:57 -08:00
Krzysztof Krason
94996664bc
Drop unnecessary Collections.unmodifiableSet
...
See gh-33987
2023-01-26 20:47:35 -08:00
Krzysztof Krason
d3efd7e091
Use try with close
...
See gh-33987
2023-01-26 20:36:38 -08:00
Krzysztof Krason
0e68cae57f
Use instanceof patterns
...
See gh-33987
2023-01-26 20:36:25 -08:00
Krzysztof Krason
a9c547e767
Use text blocks
...
See gh-33987
2023-01-26 20:36:01 -08:00
Krzysztof Krason
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
Moritz Halbritter
2601020337
Merge branch '3.0.x'
...
Closes gh-33964
2023-01-24 10:09:10 +01:00
Moritz Halbritter
dfda153da5
Merge branch '2.7.x' into 3.0.x
...
Closes gh-33963
2023-01-24 10:09:01 +01:00
Scott Frederick
0b6dade142
Migrate CLI to Apache HttpClient 5
...
Closes gh-33534
2023-01-23 13:59:15 -06:00
Scott Frederick
1588f9d881
Migrate buildpack-platform to Apache HttpClient 5
...
Closes gh-33533
2023-01-23 13:59:08 -06:00
Andy Wilkinson
63abaa4cd2
Start working on 3.1.0
2023-01-23 12:04:39 +00:00
Phillip Webb
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00
Phillip Webb
470a255b0d
Polish
2023-01-18 15:47:50 -08:00
Phillip Webb
7c508fa324
Update copyright year of changed files
2023-01-18 15:37:58 -08:00
Moritz Halbritter
94f4a4396c
Merge branch '2.7.x'
...
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter
e8d809fe65
Replace 'via' with 'over' or 'through' in the documentation
...
Closes gh-33878
2023-01-18 16:56:42 +01:00
Moritz Halbritter
fe8d8f4ed3
Merge branch '2.7.x'
2023-01-18 13:50:06 +01:00
Moritz Halbritter
524a4b6c1e
Only return complete accessor name when accessor has a backing field
2023-01-18 13:42:56 +01:00
Moritz Halbritter
ae64b205d4
Merge branch '2.7.x'
...
Closes gh-33871
2023-01-18 12:08:58 +01:00
Moritz Halbritter
26d658802f
Add support for record accessors in spring-boot-configuration-processor
...
Closes gh-29526
2023-01-18 12:02:34 +01:00
Moritz Halbritter
6c44055fd4
Polish PropertyDescriptorResolver
2023-01-18 12:01:06 +01:00
Moritz Halbritter
b1f8024e8a
Merge branch '2.7.x'
...
Closes gh-33845
2023-01-16 16:06:44 +01:00
Moritz Halbritter
9f2ed201b2
Improve error message when start goal can't contact running application
...
Closes gh-24044
2023-01-16 15:58:03 +01:00
Moritz Halbritter
d26fa80741
Merge branch '2.7.x'
...
Closes gh-33843
2023-01-16 14:10:35 +01:00
Moritz Halbritter
6cec0187c3
Include exception message in condition result when docker is unavailable
...
Closes gh-20582
2023-01-16 14:09:21 +01:00