Commit Graph

33172 Commits

Author SHA1 Message Date
Madhura Bhave
ceff47afba Fix ordering of properties and yaml files
Fixes gh-24719
2021-01-13 15:17:12 -08:00
Stephane Nicoll
44c5b08c44 Merge branch '2.4.x' 2021-01-13 17:52:22 +01:00
Stephane Nicoll
9a48423a1d Upgrade to Spring Data 2020.0.3
Closes gh-24700
2021-01-13 17:50:18 +01:00
Stephane Nicoll
dc153fbf6a Merge branch '2.4.x' 2021-01-13 14:08:10 +01:00
Stephane Nicoll
e01fdf91bd Upgrade to Spring HATEOAS 1.2.3
Closes gh-24803
2021-01-13 14:05:40 +01:00
Stephane Nicoll
f9e59abe8b Upgrade to Lettuce 6.0.2.RELEASE
Closes gh-24802
2021-01-13 14:05:39 +01:00
Stephane Nicoll
beec43cda5 Upgrade to Micrometer 1.6.3
Closes gh-24786
2021-01-13 14:04:33 +01:00
Stephane Nicoll
fc629a001e Merge branch '2.3.x' into 2.4.x 2021-01-13 14:04:03 +01:00
Stephane Nicoll
6d5d8cbc2c Upgrade to Lettuce 5.3.6.RELEASE
Closes gh-24801
2021-01-13 14:02:36 +01:00
Stephane Nicoll
6b353aee8d Upgrade to Micrometer 1.5.10
Closes gh-24785
2021-01-13 14:01:19 +01:00
Andy Wilkinson
f2ebf10a4a Merge branch '2.4.x'
Closes gh-24800
2021-01-13 11:14:58 +00:00
Andy Wilkinson
a95a7e3d40 Allow restart to be enabled when CL not named AppClassLoader
Previously, the restart initializer that enables restart when
-Dspring.devtools.restart.enabled=true is set had no effect when the
ClassLoader's name did not contain AppClassLoader. This commit updates
RestartApplicationListener to use the correct RestartInitializer when
the system property has forcibly enabled restart.

When restart is enabled a SilentExitException is thrown and it should be
caught and handled by the SilentExitExceptionHandler. When the
application is invoked via one of the loader's LauncherClasses
reflection is used and this exception becomes wrapped in an
InvocationTargetEception. Previously, this wrapping prevented
SilentExitExceptionHandler from handling the exception. This commit
updates the handler to look for an InvocationTargetException with a
SilentExitException target in addition to continuing to look for a
SilentExitException directly.

Fixes gh-24797
2021-01-13 10:12:12 +00:00
Phillip Webb
304c49d73f Merge branch '2.4.x'
Closes gh-24795
2021-01-12 17:38:27 -08:00
Phillip Webb
26f143b8d3 Support @Name annotation on /actuator/configprops
Update `ConfigurationPropertiesReportEndpoint` so that supports
constructor parameters annotated with `@Name`.

Fixes gh-24713
2021-01-12 17:38:17 -08:00
Phillip Webb
635c087694 Merge branch '2.4.x' 2021-01-12 17:33:16 -08:00
Phillip Webb
6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08:00
Scott Frederick
9925c4ccd2 Merge branch '2.4.x'
Closes gh-24794
2021-01-12 17:50:55 -06:00
Scott Frederick
a9e711e503 Enforce builder and run images in the same registry
Previously, when an authenticated Docker builder registry was
configured in the Maven or Gradle plugin and the builder and run
images specified different registries, the authentication credentials
would be sent to both registries. This could cause confusion if both
registries don't recognize the same credentials. This commit enforces
that both images are in the same registry when authentication
is configured.

Fixes gh-24552
2021-01-12 17:50:28 -06:00
Phillip Webb
4cc1467aba Merge branch '2.4.x' 2021-01-12 12:04:40 -08:00
Phillip Webb
a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb
9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Phillip Webb
48e00fc7f4 Merge branch '2.4.x'
Closes gh-24793
2021-01-12 11:49:15 -08:00
Phillip Webb
b6cb9c016f Detect bad properties in profile specific files
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
2021-01-12 11:48:19 -08:00
Madhura Bhave
5d8b760996 Merge branch '2.4.x' 2021-01-12 11:00:23 -08:00
Madhura Bhave
5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08:00
Andy Wilkinson
7527ac16ba Merge branch '2.4.x' 2021-01-12 16:21:19 +00:00
Andy Wilkinson
1cc9bd93ba Merge branch '2.3.x' into 2.4.x 2021-01-12 16:21:09 +00:00
Andy Wilkinson
f650bc6281 Merge branch '2.2.x' into 2.3.x 2021-01-12 16:20:57 +00:00
Andy Wilkinson
434b8a7b9d Merge pull request #24789 from runningcode
* gh-24789:
  Polish "Upgrade to Gradle Enterprise Maven Extension 1.8.1"
  Upgrade to Gradle Enterprise Maven Extension 1.8.1

Closes gh-24789
2021-01-12 16:20:50 +00:00
Andy Wilkinson
d6a43ec22b Polish "Upgrade to Gradle Enterprise Maven Extension 1.8.1"
See gh-24789
2021-01-12 16:20:40 +00:00
Nelson Osacky
479f71f2b2 Upgrade to Gradle Enterprise Maven Extension 1.8.1
See gh-24789
2021-01-12 16:20:18 +00:00
Andy Wilkinson
31fe24c451 Merge branch '2.4.x'
Closes gh-24791
2021-01-12 16:04:04 +00:00
Andy Wilkinson
5cae1a2842 Merge branch '2.3.x' into 2.4.x
Closes gh-24790
2021-01-12 16:03:48 +00:00
Andy Wilkinson
7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
2021-01-12 15:47:33 +00:00
Andy Wilkinson
c1d169b53b Merge branch '2.4.x'
Closes gh-24788
2021-01-12 14:31:40 +00:00
Andy Wilkinson
afa9ccba71 Merge branch '2.3.x' into 2.4.x
Closes gh-24787
2021-01-12 14:31:29 +00:00
Andy Wilkinson
22ff229d80 Merge pull request #24767 from runningcode
* gh-24767:
  Upgrade to Gradle Enterprise Gradle Plugin 3.5.1

Closes gh-24767
2021-01-12 14:31:20 +00:00
Nelson Osacky
74ffc3e0fa Upgrade to Gradle Enterprise Gradle Plugin 3.5.1
See gh-24767
2021-01-12 14:30:47 +00:00
Andy Wilkinson
067f5a52cc Merge branch '2.4.x'
Closes gh-24784
2021-01-12 14:17:39 +00:00
Andy Wilkinson
139152ccce Merge branch '2.3.x' into 2.4.x
Closes gh-24783
2021-01-12 14:17:24 +00:00
Andy Wilkinson
5a02996eca Fix release train version's comparison with other version types
Fixes gh-24782
2021-01-12 14:16:13 +00:00
Stephane Nicoll
68f0304833 Merge branch '2.4.x' 2021-01-12 15:01:26 +01:00
Stephane Nicoll
a5dbe3091b Merge branch '2.3.x' into 2.4.x 2021-01-12 15:01:10 +01:00
Stephane Nicoll
c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
2021-01-12 15:00:11 +01:00
Stephane Nicoll
09d417fe74 Merge branch '2.2.x' into 2.3.x 2021-01-12 14:59:48 +01:00
Stephane Nicoll
a0c5e35e04 Upgrade to Reactor Dysprosium-SR16
Closes gh-24766
2021-01-12 14:27:59 +01:00
Stephane Nicoll
60fa1b4754 Upgrade to Thymeleaf 3.0.12.RELEASE
Closes gh-24781
2021-01-12 14:18:39 +01:00
Stephane Nicoll
9c6133b090 Upgrade to Neo4j Ogm 3.2.19
Closes gh-24780
2021-01-12 14:18:38 +01:00
Stephane Nicoll
843577993c Upgrade to Hibernate Validator 6.0.22.Final
Closes gh-24779
2021-01-12 14:18:36 +01:00
Stephane Nicoll
6bbcdf4860 Upgrade to Hibernate 5.4.27.Final
Closes gh-24778
2021-01-12 14:18:35 +01:00