Commit Graph

30245 Commits

Author SHA1 Message Date
Stephane Nicoll 19188de1bf Merge branch '2.3.x' into 2.4.x 2021-01-14 08:51:19 +01:00
Stephane Nicoll 3ecd1001a1 Upgrade to Spring Kafka 2.5.11.RELEASE
Closes gh-24826
2021-01-14 08:38:29 +01:00
Stephane Nicoll 696539c68f Upgrade to Spring Integration 5.3.5.RELEASE
Closes gh-24825
2021-01-14 08:38:27 +01:00
Stephane Nicoll 8908969a6c Upgrade to Spring AMQP 2.2.14.RELEASE
Closes gh-24824
2021-01-14 08:38:26 +01:00
Stephane Nicoll 92f132ae35 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24823
2021-01-14 08:38:25 +01:00
Stephane Nicoll 6f9e3a6e94 Upgrade to Netty 4.1.58.Final
Closes gh-24822
2021-01-14 08:38:24 +01:00
Stephane Nicoll 1dd445b6ca Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24821
2021-01-14 08:38:23 +01:00
Stephane Nicoll f8c14c9681 Merge branch '2.2.x' into 2.3.x 2021-01-14 08:34:52 +01:00
Stephane Nicoll 5cde6ba719 Upgrade to Dependency Management Plugin 1.0.11
Close gh-24742
2021-01-14 08:16:54 +01:00
Stephane Nicoll a9f7b2a29b Upgrade to Spring Integration 5.2.11.RELEASE
Closes gh-24820
2021-01-14 08:16:32 +01:00
Stephane Nicoll 0d48b9ff2f Upgrade to Spring Amqp 2.2.14.RELEASE
Closes gh-24819
2021-01-14 08:16:31 +01:00
Stephane Nicoll 4c68ae7102 Upgrade to Netty 4.1.58.Final
Closes gh-24818
2021-01-14 08:15:36 +01:00
Madhura Bhave ea08a517c7 Merge branch '2.3.x' into 2.4.x
See gh-24814
2021-01-13 16:23:14 -08:00
Madhura Bhave f57adde61c Merge branch '2.2.x' into 2.3.x
See gh-24813
2021-01-13 16:22:38 -08:00
Madhura Bhave a78ec9da6a Simplify lowercase grep logic in docker script
See gh-24811
2021-01-13 16:21:33 -08:00
Madhura Bhave c957d97167 Merge branch '2.3.x' into 2.4.x
Closes gh-24814
2021-01-13 15:25:44 -08:00
Madhura Bhave c34188f077 Merge branch '2.2.x' into 2.3.x
Closes gh-24813
2021-01-13 15:25:20 -08:00
Madhura Bhave aefeb3ffaf Fix parsing of location header in docker update script
Fixes gh-24811
2021-01-13 15:24:25 -08:00
Madhura Bhave ceff47afba Fix ordering of properties and yaml files
Fixes gh-24719
2021-01-13 15:17:12 -08:00
Stephane Nicoll 9a48423a1d Upgrade to Spring Data 2020.0.3
Closes gh-24700
2021-01-13 17:50:18 +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 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 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 6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08: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 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 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 5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08: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 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 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 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 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