Commit Graph

50613 Commits

Author SHA1 Message Date
Phillip Webb
d39c94f437 Refine ConfigurationProcessorIntegrationTests resource detection logic 2023-03-02 21:52:53 -08:00
Scott Frederick
8c3bf88aba Merge branch '3.0.x' 2023-03-02 15:01:23 -06:00
Scott Frederick
f28bb221a2 Suppress Spring Kafka deprecation warning
See gh-34441
2023-03-02 15:01:05 -06: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
Andy Wilkinson
be5e9406d0 Merge branch '3.0.x' 2023-03-02 19:51:48 +00:00
Andy Wilkinson
2d7e408a5c Upgrade to Spring Framework 6.0.6
Closes gh-34440
2023-03-02 19:51:17 +00:00
Andy Wilkinson
565dfc58ae Merge branch '3.0.x' 2023-03-02 16:57:10 +00:00
Andy Wilkinson
b9eef6af5a Upgrade to Reactor Bom 2022.0.4
Closes gh-34444
2023-03-02 13:59:18 +00:00
Andy Wilkinson
d4577556e0 Upgrade to Jetty 11.0.14
Closes gh-34447
2023-03-02 13:59:18 +00:00
Andy Wilkinson
a56bdba224 Upgrade to Dropwizard Metrics 4.2.17
Closes gh-34446
2023-03-02 13:59:17 +00:00
Andy Wilkinson
ba072de3c9 Start building against Spring Kafka 3.0.4 snapshots
See gh-34441
2023-03-02 13:59:17 +00:00
Andy Wilkinson
c635b5390a Start building against Reactor Bom 2022.0.4 snapshots
See gh-34444
2023-03-02 13:59:17 +00:00
Andy Wilkinson
0b504b1c3e Start building against Spring Framework 6.0.6 snapshots
See gh-34440
2023-03-02 13:59:17 +00:00
Andy Wilkinson
f010c69091 Upgrade to Couchbase Client 3.4.3
Closes gh-34445
2023-03-02 13:59:16 +00:00
Andy Wilkinson
c16d0745ae Start building against Spring Data Bom 2022.0.3 snapshots
See gh-34439
2023-03-02 10:47:11 +00: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
Scott Frederick
9f0108496c Consolidate web server SSL configuration 2023-03-01 16:54:09 -06:00
Moritz Halbritter
0b23ffd73a Merge branch '3.0.x'
Closes gh-34425
2023-03-01 14:14:05 +01:00
Moritz Halbritter
ecbc412c7c Add property 'management.wavefront.trace-derived-custom-tag-keys'
Closes gh-34194
2023-03-01 13:35:17 +01:00
Moritz Halbritter
f0a16f4e98 Merge branch '3.0.x'
Closes gh-34423
2023-03-01 13:21:36 +01:00
Moritz Halbritter
0fc4741ff6 Merge branch '2.7.x' into 3.0.x
Closes gh-34422
2023-03-01 13:20:51 +01:00
Moritz Halbritter
29a16a6428 Merge pull request #32943 from anandmnair
* pr/32943:
  Polish "Add reference to Failover starter"
  Add reference to Failover starter

Closes gh-32943
2023-03-01 13:19:22 +01:00
Moritz Halbritter
18592e8145 Polish "Add reference to Failover starter"
See gh-32943
2023-03-01 13:18:45 +01:00
Anand Manissery
1240864a5e Add reference to Failover starter
See gh-32943
2023-03-01 13:18:38 +01:00
Moritz Halbritter
ba8a4c699f Merge pull request #34050 from dangzhicairang
* pr/34050:
  Polish "Add RabbitTemplateCustomizer"
  Add RabbitTemplateCustomizer

Closes gh-34050
2023-03-01 13:04:39 +01:00
Moritz Halbritter
2becf70c2a Polish "Add RabbitTemplateCustomizer"
See gh-34050
2023-03-01 13:03:21 +01:00
dzcr
5f77c1cd77 Add RabbitTemplateCustomizer
See gh-34050
2023-03-01 12:57:03 +01:00
Moritz Halbritter
944862389b Merge branch '3.0.x'
Closes gh-34420
2023-03-01 12:51:23 +01:00
Moritz Halbritter
7ea56a2fdb Merge branch '2.7.x' into 3.0.x
Closes gh-34419
2023-03-01 12:51:15 +01:00
Moritz Halbritter
673a39a2e5 Merge pull request #34220 from 1993heqiang
* pr/34220:
  Update logger to use GracefulShutdown.class

Closes gh-34220
2023-03-01 12:51:02 +01:00
1993heqiang
277784b17d Update logger to use GracefulShutdown.class
See gh-34220
2023-03-01 12:50:31 +01:00
Moritz Halbritter
79a4861c17 Merge branch '3.0.x'
Closes gh-34418
2023-03-01 12:46:58 +01:00
Moritz Halbritter
73ba797c02 Merge branch '2.7.x' into 3.0.x
Closes gh-34417
2023-03-01 12:46:43 +01:00
Moritz Halbritter
891dc913d5 Merge pull request #34319 from izeye
* pr/34319:
  Polish "Add missing Micrometer PropertiesConfigAdapterTests"

Closes gh-34319
2023-03-01 12:46:32 +01:00
Johnny Lim
956a579bc9 Polish "Add missing Micrometer PropertiesConfigAdapterTests"
See gh-34319
2023-03-01 12:45:55 +01:00
Moritz Halbritter
54e9b2269e Merge branch '3.0.x'
Closes gh-34416
2023-03-01 12:43:58 +01:00
Moritz Halbritter
8b97797389 Merge pull request #34398 from dalbani
* pr/34398:
  Fix typo

Closes gh-34398
2023-03-01 12:43:44 +01:00
Damiano Albani
ea70ff7efe Fix typo
See gh-34398
2023-03-01 12:43:19 +01:00
Moritz Halbritter
e821085752 Merge branch '3.0.x'
Closes gh-34415
2023-03-01 12:41:24 +01:00
Moritz Halbritter
e407515a0f Merge branch '2.7.x' into 3.0.x
Closes gh-34414
2023-03-01 12:41:13 +01:00
Moritz Halbritter
36a7428827 Merge pull request #34386 from jongwooo
* pr/34386:
  Fix typo in external-config.adoc

Closes gh-34386
2023-03-01 12:41:02 +01:00
Jongwoo Han
8e166595c0 Fix typo in external-config.adoc
See gh-34386
2023-03-01 12:40:21 +01:00
Moritz Halbritter
c06bb95fbe Merge pull request #34223 from ttddyy
* pr/34223:
  Add management.wavefront.application.custom-tags property

Closes gh-34223
2023-03-01 09:30:08 +01:00
Tadaya Tsuyukubo
1a6d240234 Add management.wavefront.application.custom-tags property
Add `management.wavefront.application.custom-tags` property which
populates custom tags in `ApplicationTags` created by
`WavefrontAutoConfiguration`.

See gh-34223

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2023-03-01 09:28:44 +01:00
Moritz Halbritter
b0fc5fa827 Merge pull request #34365 from mtheiss
* pr/34365:
  Use maven.compiler.release to prevent impossible JDK api usage

Closes gh-34365
2023-03-01 09:27:20 +01:00
Martin Theiss
a073ef80e8 Use maven.compiler.release to prevent impossible JDK api usage
See gh-34365
2023-03-01 09:26:54 +01:00