Commit Graph

29592 Commits

Author SHA1 Message Date
Stephane Nicoll ef74f79b54 Merge branch '2.3.x' 2020-11-06 16:43:21 +01:00
Stephane Nicoll 2282c73aab Start building against Spring Framework 5.2.11 snapshots
See gh-24034
2020-11-06 16:41:47 +01:00
Brian Clozel fe359bcbfb Merge branch '2.3.x'
Closes gh-24067
2020-11-06 14:49:42 +01:00
Brian Clozel e98db484bc Upgrade to spring-doc-resources 0.2.4
Closes gh-24066
2020-11-06 14:48:53 +01:00
Andy Wilkinson 6a2332d477 Merge branch '2.3.x'
Closes gh-24062
2020-11-05 15:55:09 +00:00
Andy Wilkinson 44d0ce5ff1 Merge branch '2.2.x' into 2.3.x
Closes gh-24060
2020-11-05 15:53:53 +00:00
Andy Wilkinson 9c5d1646bd Show how to configure a case-sensitive physical naming strategy
Closes gh-24045
2020-11-05 15:53:32 +00:00
Stephane Nicoll 946be4eab6 Merge branch '2.3.x'
Closes gh-24059
2020-11-05 16:33:28 +01:00
Stephane Nicoll 4a8646bd09 Merge branch '2.2.x' into 2.3.x
Closes gh-24058
2020-11-05 16:32:52 +01:00
Andy Wilkinson 38821c15da Merge branch '2.3.x'
Closes gh-24057
2020-11-05 15:01:49 +00:00
Stephane Nicoll 59ea7c11f6 Use most specific getter when generating metadata
This commit makes sure to use the most specific getter if more than
one candidate exists.

Closes gh-24002
2020-11-05 16:01:28 +01:00
Andy Wilkinson 1e100677c7 Reduce scope of META-INF customizations to main, source, and javadoc jars
Closes gh-23955
2020-11-05 15:01:08 +00:00
Andy Wilkinson d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
2020-11-05 14:37:49 +00:00
Andy Wilkinson 49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
2020-11-05 14:37:22 +00:00
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