Andy Wilkinson
ce8427793f
Merge branch '2.3.x'
...
See gh-24053
2020-11-05 12:19:44 +00:00
Andy Wilkinson
91f4541a91
Merge branch '2.2.x' into 2.3.x
...
See gh-24052
2020-11-05 12:19:13 +00:00
Andy Wilkinson
006d4bc36d
Do not set Tomcat's trust store password when null
...
See gh-24041
2020-11-05 12:18:32 +00:00
Andy Wilkinson
06f37f4295
Merge branch '2.3.x'
...
Closes gh-24053
2020-11-05 11:40:07 +00:00
Andy Wilkinson
2ffb81f0d9
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24052
2020-11-05 11:35:37 +00:00
Andy Wilkinson
2425dcd200
Do not set Tomcat's key store and key pass when null
...
Fixes gh-24041
2020-11-05 11:30:04 +00:00
Andy Wilkinson
cb24df148f
Upgrade to Jetty 9.4.34.v20201102
...
Closes gh-24047
2020-11-05 08:24:55 +00:00
Andy Wilkinson
d9c6c38748
Merge branch '2.3.x'
2020-11-05 08:22:44 +00:00
Andy Wilkinson
e447be6df7
Upgrade to Jetty 9.4.34.v20201102
...
Closes gh-24046
2020-11-05 08:22:31 +00:00
Scott Frederick
8f39ebf781
Merge branch '2.3.x'
...
Closes gh-24043
2020-11-04 16:53:57 -06:00
Scott Frederick
62aa1b7aaf
Narrow criteria for hidden property paths
...
A previous change intended to prevent temporary directories created as
an implementation detail of mounting volumes on kubernetes pods from
being used as a source for property files had a side-effect of also
preventing other types of hidden directories from being recognized. This
commit narrows the criteria for considering a directory as hidden,
using the kubernetes `..` prefix convention instead of the Unix `.`
prefix.
Fixes gh-23983
2020-11-04 16:09:54 -06:00
Andy Wilkinson
bb5faeaabe
Correct cross-reference in reference documentation
...
See gh-24033
2020-11-04 21:09:10 +00:00
Andy Wilkinson
f5ec36cd7b
Merge branch '2.3.x'
...
Closes gh-24040
2020-11-04 20:53:53 +00:00
Andy Wilkinson
fdd028d52c
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24039
2020-11-04 20:53:06 +00:00
Andy Wilkinson
d3ea48b7a8
Configure DockerHub credentials on staging builds
...
See gh-24038
2020-11-04 20:48:14 +00:00
Andy Wilkinson
1172dbfec9
Log into DockerHub prior to running CI builds
...
Closes gh-24038
2020-11-04 20:31:49 +00:00
Andy Wilkinson
21eb46739c
Merge branch '2.3.x'
...
Closes gh-24033
2020-11-04 17:45:30 +00:00
Andy Wilkinson
84cee76700
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24032
2020-11-04 17:42:24 +00:00
Andy Wilkinson
d5980be623
Clarify documentation for relaxed binding of environment variables
...
Closes gh-22974
2020-11-04 17:40:27 +00:00
Andy Wilkinson
f3648d6fe1
Merge branch '2.3.x'
...
Closes gh-24030
2020-11-04 16:47:38 +00:00
Andy Wilkinson
e83f3f40be
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24029
2020-11-04 16:47:23 +00:00
Andy Wilkinson
a8b8f43180
Improve description of spring.datasource.initialization-mode
...
Closes gh-21121
2020-11-04 16:46:28 +00:00
Andy Wilkinson
a1af99640e
Merge branch '2.3.x'
...
Closes gh-24026
2020-11-04 10:15:26 +00:00
Andy Wilkinson
28f7bc37a5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24025
2020-11-04 10:15:07 +00:00
Andy Wilkinson
c289ba0c2c
Recommend disabling context root redirects with proxied Tomcat
...
Closes gh-22908
2020-11-04 10:13:55 +00:00
Andy Wilkinson
a4505eaeb0
Merge branch '2.3.x'
...
Closes gh-24024
2020-11-04 09:41:41 +00:00
Andy Wilkinson
81f672eae3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24023
2020-11-04 09:40:54 +00:00
Andy Wilkinson
28ccf54b21
Ignore schema username when auto-configuring a test DB
...
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.
This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.
Fixes gh-19321
2020-11-04 09:30:19 +00:00
Andy Wilkinson
2814f91fbf
Merge branch '2.3.x'
...
Closes gh-24022
2020-11-03 20:33:08 +00:00
Andy Wilkinson
7c209478b6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24021
2020-11-03 20:32:57 +00:00
Andy Wilkinson
c51c3432a6
Merge pull request #24020 from PascalSchumacher
...
* gh-24020:
Fix typo in Spring Session documentation
Closes gh-24020
2020-11-03 20:32:04 +00:00
Pascal Schumacher
5472fcf433
Fix typo in Spring Session documentation
...
See gh-24020
2020-11-03 20:31:42 +00:00
Andy Wilkinson
6cb5a98036
Merge branch '2.3.x'
...
Closes gh-24019
2020-11-03 19:43:28 +00:00
Andy Wilkinson
b2a058b6fe
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24018
2020-11-03 19:43:15 +00:00
Andy Wilkinson
2f280b01e1
Improve Spring Session back-off documentation
...
Closes gh-23151
2020-11-03 19:42:57 +00:00
Andy Wilkinson
bbad377ecc
Merge branch '2.3.x'
...
Closes gh-24017
2020-11-03 18:00:22 +00:00
Andy Wilkinson
f3d4b3e5ac
Allow entries to be streamed from JarURLConnections' jar file
...
Fixes gh-23821
2020-11-03 17:59:38 +00:00
Andy Wilkinson
f4e90f4512
Merge branch '2.3.x'
...
Closes gh-24016
2020-11-03 17:29:14 +00:00
Andy Wilkinson
2d9d40bd2d
Merge pull request #23999 from mruzicka
...
* gh-23999:
Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
Avoid repeated calls of WebFlux and MVC registrations' getters
Closes gh-23999
2020-11-03 17:28:56 +00:00
Andy Wilkinson
d1a9dba25d
Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
...
See gh-23999
2020-11-03 17:23:16 +00:00
Andy Wilkinson
4c777c6df7
Deprecate classpath logging listener and stop registering by default
...
Closes gh-23138
2020-11-03 17:21:36 +00:00
Michal Růžička
2aac5c0095
Avoid repeated calls of WebFlux and MVC registrations' getters
...
See gh-23999
2020-11-03 16:51:39 +00:00
Andy Wilkinson
73c444262b
Merge branch '2.3.x'
...
Closes gh-24015
2020-11-03 16:38:49 +00:00
Andy Wilkinson
f9ff39a7a6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24014
2020-11-03 16:38:33 +00:00
Andy Wilkinson
35bff55097
Ensure that Quartz can be auto-configured with a Quartz-specific TM
...
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.
This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.
Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson
d41e739f8c
Merge branch '2.3.x'
...
Closes gh-24013
2020-11-03 14:58:41 +00:00
Andy Wilkinson
dc86e8ce30
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24012
2020-11-03 14:58:28 +00:00
Andy Wilkinson
6548ca4c11
Implement equals and hashCode in TestTypeExcludeFilter
...
Fixes gh-23978
2020-11-03 14:50:00 +00:00
Andy Wilkinson
07d92373df
Merge pull request #24011 from dsyer
...
* gh-24011:
Polish "Align MustacheViewResolver with other similar resolvers"
Align MustacheViewResolver with other similar resolvers
Closes gh-24011
2020-11-03 14:28:35 +00:00
Andy Wilkinson
c722692a8b
Polish "Align MustacheViewResolver with other similar resolvers"
...
See gh-24011
2020-11-03 14:28:11 +00:00