spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 09:49:01 +00:00
Code Issues Projects Releases Wiki Activity
41,191 Commits 28 Branches 394 Tags
3f4bb4eaccb339cc41326dffd8d079be7bf4472c
Commit Graph
41191 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Moritz Halbritter 3f4bb4eacc Merge pull request #33687 from luben93 
* pr/33687:
  Use hazelcast's Config.loadFromStream()

Closes gh-33687
 2023-01-31 11:03:25 +01:00
lucas persson 275f15b8d3 Use hazelcast's Config.loadFromStream() 
To allow the private function Config.applyEnvAndSystemVariableOverrides()
to override with environment variables

See gh-33687
 2023-01-31 11:03:09 +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 276027536c Merge pull request #33966 from izeye 
* pr/33966:
  Polish

Closes gh-33966
 2023-01-31 10:48:44 +01:00
Johnny Lim 5eeb429e44 Polish 
See gh-33966
 2023-01-31 10:48:30 +01:00
Moritz Halbritter 23f1c896c9 Merge branch '3.0.x' 
Closes gh-34015
 2023-01-31 10:20:36 +01:00
Moritz Halbritter 1a9f1cd2ed Merge pull request #33967 from izeye 
* pr/33967:
  Replace Base64Utils with JDK's Base64

Closes gh-33967
 2023-01-31 10:20:25 +01:00
Johnny Lim bc7fc90550 Replace Base64Utils with JDK's Base64 
See gh-33967
 2023-01-31 10:20:06 +01:00
Moritz Halbritter 3a80007e89 Merge branch '3.0.x' 
Closes gh-34014
 2023-01-31 10:15:27 +01:00
Moritz Halbritter b62b88372f Merge pull request #33976 from izeye 
* pr/33976:
  Remove EnabledForJreRange.min in PaketoBuilderTests

Closes gh-33976
 2023-01-31 10:15:00 +01:00
Johnny Lim 359076e213 Remove EnabledForJreRange.min in PaketoBuilderTests 
See gh-33976
 2023-01-31 10:14:47 +01:00
Moritz Halbritter c38f5d9f22 Merge pull request #34002 from marcingrzejszczak 
* pr/34002:
  Adds CompositeSpanExporter

Closes gh-34002
 2023-01-31 10:11:45 +01:00
Marcin Grzejszczak 06aec1a9bf Adds CompositeSpanExporter 
Micrometer Tracing comes with 3 generic interfaces, SpanExportingPredicate,
SpanReporter and SpanFilter, thanks to which you can decide whether you
want to export a span, how you want to report it and how to mutate it
regardless of which tracer library you are using.

Without this change usage of these 3 interfaces is not possible
for OpenTelemetry.

With this change we're putting all SpanExporters to the
CompositeSpanExporter and apply the exporters only after predicates,
filtering and reporting took place.

See gh-34002
 2023-01-31 10:11:20 +01:00
Moritz Halbritter 4dfc291e15 Merge pull request #34004 from eddumelendez 
* pr/34004:
  Add property `headers` in `OtlpProperties`

Closes gh-34004
 2023-01-31 09:41:19 +01:00
Eddú Meléndez 92dd004375 Add property headers in OtlpProperties 
In Micrometer 1.11, headers property has been introduced.

See gh-34004
 2023-01-31 09:37:39 +01:00
Phillip Webb 390892f11b Merge branch '3.0.x' 
Closes gh-33998
 2023-01-26 21:45:57 -08:00
Phillip Webb 3d20608c11 Merge pull request #33987 from krzyk 
* pr/33987:
  Drop unnecessary Collections.unmodifiableSet
  Use Files.writeString
  Use for loop rather than iterator
  Use Comparator.comparing
  Use try with close
  Use instanceof patterns
  Use text blocks
  Use diamond operators

Closes gh-33987
 2023-01-26 21:45:40 -08:00
Krzysztof Krason 94996664bc Drop unnecessary Collections.unmodifiableSet 
See gh-33987
 2023-01-26 20:47:35 -08:00
Krzysztof Krason 1b5b1cd250 Use Files.writeString 
See gh-33987
 2023-01-26 20:47:35 -08:00
Krzysztof Krason f4af93fb03 Use for loop rather than iterator 
See gh-33987
 2023-01-26 20:47:35 -08:00
Krzysztof Krason 55a50d565c Use Comparator.comparing 
See gh-33987
 2023-01-26 20:47:34 -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
Phillip Webb 5120242996 Merge branch '2.7.x' into 3.0.x 2023-01-26 19:41:42 -08:00
Phillip Webb b81d5900e6 Use newer language features 
See gh-33987
 2023-01-26 19:35:03 -08:00
Krzysztof Krason a8958471f6 Switch anonymous inner classes to lambdas 
See gh-33987
 2023-01-26 19:34:22 -08:00
Krzysztof Krason 888d4ac392 Use '==' rather than '.equals' with enum value 
See gh-33987
 2023-01-26 19:33:37 -08:00
Phillip Webb 95963b7dee Merge branch '3.0.x' 
Closes gh-33996
 2023-01-26 17:38:22 -08:00
Phillip Webb 058914f1cf Merge branch '2.7.x' into 3.0.x 
Closes gh-33995
 2023-01-26 17:38:02 -08:00
Phillip Webb c7a8151313 Restore "Use Jedis Instead of Lettuce" how-to documentation 
Closes gh-33994
 2023-01-26 17:37:01 -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
Moritz Halbritter 9975ec8be3 Report deprecated Map properties 
Closes gh-27854
 2023-01-24 10:07:54 +01:00
Moritz Halbritter 4b370250e0 Merge pull request #33911 from mhalbritter 
* mh/19605:
  Use bean name for servlet and filter registrations if name is not set

Closes gh-33911
 2023-01-24 09:14:40 +01:00
Moritz Halbritter a4e7a8bae0 Use bean name for servlet and filter registrations if name is not set 
If the name is set, it is used. If not, the bean name is used. If that's
not set, the convention based name is taken.

Registration failures now throw an IllegalStateException instead of
being logged. DynamicRegistrationBean.setIgnoreRegistrationFailure
can be used to restore the old behavior.

See gh-33911
 2023-01-24 09:14:06 +01:00
Scott Frederick 7c313a7b4a Remove dependency management for Apache HttpClient 4 
Closes gh-33535
 2023-01-23 13:59:15 -06: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 7f09636ad2 Merge pull request #33711 from scordio 
* gh-33711:
  Upgrade to AssertJ 3.24.2

Closes gh-33711
 2023-01-23 18:04:04 +00:00
Stefano Cordio ec1f1f949e Upgrade to AssertJ 3.24.2 
This commit also switches to use the AssertJ bom.

See gh-33711
 2023-01-23 18:03:38 +00:00
Andy Wilkinson d7e5b61393 Upgrade to Artemis 2.27.1 
Closes gh-33955
 2023-01-23 18:02:38 +00:00
Andy Wilkinson ceb9721db8 Upgrade to Angus Mail 1.1.0 
Closes gh-33956
 2023-01-23 18:02:16 +00:00
Andy Wilkinson f0ef47eb2d Merge branch '3.0.x' 
Closes gh-33948
 2023-01-23 14:57:21 +00:00
Andy Wilkinson 1eb6de0b6d Correct artifact ID of some Angus Mail modules 
Closes gh-33947
 2023-01-23 14:56:44 +00:00
Andy Wilkinson fee0daf127 Set bomr upgrade policy to same major version 2023-01-23 14:45:42 +00:00
Andy Wilkinson 7ebcf11c81 Merge branch '3.0.x' 2023-01-23 12:45:34 +00:00
Andy Wilkinson 63abaa4cd2 Start working on 3.1.0 2023-01-23 12:04:39 +00:00