Commit Graph

30456 Commits

Author SHA1 Message Date
Stephane Nicoll
7592c98d5c Merge branch '2.4.x'
Closes gh-24871
2021-01-18 14:45:02 +01:00
Stephane Nicoll
819809849f Merge pull request #24867 from izeye
* pr/24867:
  Fix property name for spring.dao.exceptiontranslation.enabled

Closes gh-24867
2021-01-18 14:44:07 +01:00
izeye
21db14227c Fix property name for spring.dao.exceptiontranslation.enabled
See gh-24867
2021-01-18 14:41:41 +01:00
Stephane Nicoll
e0a3b79bda Merge pull request #24866 from izeye
* pr/24866:
  Update copyright of changed file
  Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation()

Closes gh-24866
2021-01-18 14:40:49 +01:00
Stephane Nicoll
742983fc5e Update copyright of changed file
See gh-24866
2021-01-18 14:38:58 +01:00
izeye
41fcc427c6 Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation()
See gh-24866
2021-01-18 14:37:34 +01:00
Stephane Nicoll
7493632b79 Merge branch '2.4.x'
Closes gh-24870
2021-01-18 14:31:23 +01:00
Stephane Nicoll
52ca841a2e Merge branch '2.3.x' into 2.4.x
Closes gh-24869
2021-01-18 14:31:05 +01:00
Stephane Nicoll
5df401169b Fix reference to spring-javaformat-intellij-idea-plugin
Closes gh-24864
2021-01-18 14:30:24 +01:00
Stephane Nicoll
38cd1b4949 Merge pull request #24862 from izeye
* pr/24862:
  Polish contribution
  Polish

Closes gh-24862
2021-01-18 11:03:40 +01:00
Stephane Nicoll
dcc0ca0df9 Polish contribution
See gh-24862
2021-01-18 11:03:27 +01:00
izeye
3aea8b37a0 Polish
See gh-24862
2021-01-18 10:58:27 +01:00
Stephane Nicoll
bcc1331f85 Restore missing deprecated metadata for Bitronix
See gh-24806
2021-01-18 10:29:21 +01:00
Stephane Nicoll
dcae55a8bc Merge branch '2.4.x'
Closes gh-24861
2021-01-17 17:04:22 +01:00
Stephane Nicoll
f7c855dc40 Merge pull request #24851 from dreis2211
* pr/24851:
  Fix configuration metadata for logging.charset.* properties

Closes gh-24851
2021-01-17 17:04:09 +01:00
dreis2211
b8b5e4cebf Fix configuration metadata for logging.charset.* properties
See gh-24851
2021-01-17 17:02:24 +01:00
Stephane Nicoll
600be08225 Merge branch '2.4.x'
Closes gh-24855
2021-01-15 16:51:27 +01:00
Stephane Nicoll
7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll
b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll
ff164ec72f Merge pull request #24837 from izeye
* pr/24837:
  Polish

Closes gh-24837
2021-01-15 14:38:23 +01:00
izeye
e7350503b8 Polish
See gh-24837
2021-01-15 14:37:33 +01:00
Stephane Nicoll
1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll
e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll
2de8c49d9f Remove deprecated code in Spring Boot 2.3
Closes gh-24806
2021-01-15 14:15:55 +01:00
Stephane Nicoll
2c2c160579 Remove deprecated code
See gh-24806
2021-01-15 14:14:33 +01:00
Stephane Nicoll
a18f01addf Remove bitronix support
See gh-24806
2021-01-15 14:14:27 +01:00
Andy Wilkinson
4b0d5c31de Switch to the Apache Tomcat EL implementation by default
Previously we used org.glassfish:jakarta.el as our default EL
implementation. Since adopting it we have learned that it can be
significantly slower than Apache Tomcat's EL implementation in some
scenarios. This commit switches to using
org.apache.tomcat.embed:tomcat-embed-el by default instead of the
Glassfish implementation.

Closes gh-24744
2021-01-15 09:30:54 +00:00
Stephane Nicoll
e2033992c7 Merge branch '2.4.x' 2021-01-15 08:25:41 +01:00
Stephane Nicoll
9343633582 Merge branch '2.3.x' into 2.4.x 2021-01-15 08:25:27 +01:00
Stephane Nicoll
9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Phillip Webb
33c1a050ee Merge branch '2.4.x' 2021-01-14 21:15:17 -08:00
Phillip Webb
909f71708f Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 21:02:39 -08:00
Phillip Webb
1e3330c375 Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 20:55:03 -08:00
Phillip Webb
a790a9079d Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 20:49:16 -08:00
Phillip Webb
f3719b99ca Merge branch '2.4.x' 2021-01-14 20:35:26 -08:00
Spring Buildmaster
dc76aa312e Next development version (v2.4.3-SNAPSHOT) 2021-01-15 03:19:45 +00:00
Phillip Webb
0fd3cd5ed5 Merge branch '2.4.x' 2021-01-14 17:25:22 -08:00
Phillip Webb
26f2caca22 Update copyright year of changed files 2021-01-14 17:25:09 -08:00
Phillip Webb
daf2b2fea3 Merge branch '2.4.x'
Fixes gh-24846
2021-01-14 17:23:24 -08:00
Phillip Webb
c0aef4c35f Apply SystemProperties to LoggerContext
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.

Fixes gh-24835
2021-01-14 17:22:37 -08:00
Madhura Bhave
b7843f9399 Merge branch '2.4.x'
Closes gh-24846
2021-01-14 16:15:15 -08:00
Madhura Bhave
68fc2329c8 Revert "Remove unnecessary code"
Fixes gh-24835
2021-01-14 16:13:30 -08:00
Scott Frederick
45acd5f30c Merge branch '2.4.x' 2021-01-14 14:13:13 -06:00
Scott Frederick
716dce3859 Merge branch '2.3.x' into 2.4.x 2021-01-14 14:11:51 -06:00
Spring Buildmaster
8f692a16c6 Next development version (v2.3.9.BUILD-SNAPSHOT) 2021-01-14 18:45:38 +00:00
Brian Clozel
4dd60684c9 Merge branch '2.4.x'
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel
6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll
a788ef4958 Merge branch '2.4.x'
Closes gh-24842
2021-01-14 18:03:38 +01:00
Stephane Nicoll
dda8b5d287 Revert "Upgrade to Kafka 2.6.1"
See gh-24247
2021-01-14 18:03:09 +01:00
Stephane Nicoll
2072e7242a Merge branch '2.3.x' into 2.4.x
Closes gh-24841
2021-01-14 18:02:28 +01:00