Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
3657c6c85d Merge branch '2.3.x' 2020-10-19 12:27:00 +02:00
Stephane Nicoll
dd74810c80 Revert "Fix detection logic for embedded databases"
This reverts commit c4a5a34702.

See gh-23721
2020-10-19 12:25:00 +02:00
Andy Wilkinson
6f7234ff4e Upgrade to MSSQL JDBC 8.4.1.jre8
Closes gh-23742
2020-10-19 10:29:11 +01:00
Andy Wilkinson
01077d8ced Merge branch '2.3.x'
Closes gh-23744
2020-10-19 10:25:50 +01:00
Andy Wilkinson
e8187f9bb0 Merge branch '2.2.x' into 2.3.x
Closes gh-23743
2020-10-19 10:25:24 +01:00
Andy Wilkinson
2a40bd7853 Register shutdown hook so it can tidy up a partial refresh
Previously, the shutdown hook was only registered once refresh has
completed. If the JVM was shut down during refresh (or after refresh
and before the hook was registered) the hook wouldn't run and the
partially refreshed context would not be cleaned up.

This commit moves the registration of the shutdown hook to before
refresh processing begins. This ensures that the hook is available
to clean up the context if the JVM is shutdown while refresh is in
progress.

Fixes gh-23625
2020-10-19 09:16:07 +01:00
Stephane Nicoll
c0dddf7e23 Merge pull request #23737 from dreis2211
* pr/23737:
  Fix links to Spring Framework documentation

Closes gh-23737
2020-10-19 08:13:46 +02:00
dreis2211
47bac6a90d Fix links to Spring Framework documentation
See gh-23737
2020-10-19 08:13:24 +02:00
Andy Wilkinson
6898a97102 Merge branch '2.3.x'
Closes gh-23732
2020-10-17 07:55:43 +01:00
Andy Wilkinson
11b5e86ffd Deprecate BootJar#getConfigurations
Fixes gh-23527
2020-10-17 07:54:38 +01:00
Stephane Nicoll
995c0c827b Merge pull request #23720 from izeye
* pr/23720:
  Polish

Closes gh-23720
2020-10-17 08:15:43 +02:00
Johnny Lim
20f1c0ef0e Polish
See gh-23720
2020-10-17 08:14:32 +02:00
Stephane Nicoll
8d4498ef6c Merge branch '2.3.x' 2020-10-17 08:00:00 +02:00
Asha Somayajula
c4a5a34702 Fix detection logic for embedded databases
Closes gh-23721
2020-10-17 07:51:24 +02:00
Stephane Nicoll
bebdee3709 Polish
See gh-23693
2020-10-17 07:30:12 +02:00
Scott Frederick
d44ecf5086 Merge branch '2.3.x'
Closes gh-23731
2020-10-16 18:00:09 -05:00
Scott Frederick
9c672deb2d Add javadoc links in Maven plugin parameter docs
This commit modifies the documentation generated for the
Maven plugin to include links to javadoc when Spring
Boot types are mentioned. Some javadoc was also polished
to improve the generated docs.

Fixes gh-21555
2020-10-16 17:45:46 -05:00
Andy Wilkinson
d005a64c9f Revert "Rename CompositeMeterRegistryAutoConfiguration"
This reverts commit 9460d74e8a.

Fixes gh-23724
2020-10-16 17:47:48 +01:00
Andy Wilkinson
f0b0a073c3 Remove unwanted titles from config blocks
Closes gh-23722
2020-10-16 17:43:57 +01:00
Stephane Nicoll
0007961805 Add reference to JobRunr Spring Boot starter
Closes gh-23725
2020-10-16 18:09:34 +02:00
Stephane Nicoll
08b009999b Merge pull request #23693 from somayaj
* pr/23693:
  Polish "Fix detection logic for embedded databases"
  Fix detection logic for embedded databases

Closes gh-23693
2020-10-16 16:34:24 +02:00
Stephane Nicoll
c0b267feb4 Polish "Fix detection logic for embedded databases"
See gh-23693
2020-10-16 16:32:29 +02:00
Asha Somayajula
ab02084e7b Fix detection logic for embedded databases
See gh-23693
2020-10-16 15:54:54 +02:00
Andy Wilkinson
23073d9e76 Make block switches work on every page of multi-page docs
There's a bug in some versions of AsciidoctorJ where extensions are
only called on this first conversion performed by a given Asciidoctor
instance. This affects the multi-page documentation where there are
multiple conversions performed – one for each page in the
documentation.

This commit upgrades the version of AsciidoctorJ used by the
Asciidoctor Gradle plugin to 2.4.1, which contains fix for the problem.

Closes gh-23709
2020-10-16 14:44:14 +01:00
Stephane Nicoll
2916bb4c10 Merge branch '2.3.x'
Closes gh-23718
2020-10-16 11:00:31 +02:00
Stephane Nicoll
6beb0c939f Document how to override plugin configuration on the command line
Closes gh-21536
2020-10-16 10:57:30 +02:00
Stephane Nicoll
b210d0680a Polish 2020-10-16 10:34:58 +02:00
Phillip Webb
bc7b6bdd88 Polish 2020-10-15 15:29:54 -07:00
Phillip Webb
91b787dff7 Upgrade to github-changelog-generator 0.0.5
Closes gh-23715
2020-10-15 15:08:07 -07:00
Phillip Webb
759a5f0811 Merge pull request #23633 from Miehau
* pr/23633:
  Polish 'Add a FailureAnalyzer for ConfigDataNotFound'
  Add a FailureAnalyzer for ConfigDataNotFound

Closes gh-23633
2020-10-15 12:27:39 -07:00
Phillip Webb
e360e4a75e Polish 'Add a FailureAnalyzer for ConfigDataNotFound'
See gh-23633
2020-10-15 12:11:29 -07:00
Michal Mlak
be7d697121 Add a FailureAnalyzer for ConfigDataNotFound
Add a `FailureAnalyzer` to deal with `ConfigDataNotFoundException`.

See gh-23633
2020-10-15 12:05:21 -07:00
Phillip Webb
1cf9fc107e Improve ConfigData processing code
Refactor `ConfigData` processing code to make it less awkward to
follow.

Prior to this commit the `ConfigDataLocationResolver` would take a
String location and return a `ConfigDataLocation` instance. This was
a little confusing since sometimes we would refer to `location` as the
String value, and sometimes it would be the typed instance. We also
had nowhere sensible to put the `optional:` prefix logic and we needed
to pass a `boolean` parameter to a number of methods. The recently
introduced `Orgin` support also didn't have a good home.

To solve this, `ConfigDataLocation` has been renamed to
`ConfigDataResource`. This frees up `ConfigDataLocation` to be used
as a richer `location` type that holds the String value, the `Orgin`
and provides a home for the `optional:` logic.

This commit also cleans up a few other areas of the code, including
renaming `ResourceConfigData...` to `StandardConfigData...`. It also
introduces a new exception hierarchy for `ConfigDataNotFoundExceptions`.

Closes gh-23711
2020-10-15 11:33:57 -07:00
Phillip Webb
f89b99bdbc Allow FailureAnalizers without ApplicationContext
Update `SpringApplication` so that `FailureAnalyzers` apply even if
the `ApplicationContext` was not created. If no `ApplicationContext`
is available, only `FailureAnalyzer` instances that do not implement
any `Aware` interfaces are considered.

Closes gh-23710
2020-10-15 11:18:26 -07:00
Andy Wilkinson
84f96033c5 Put project deps in app layer and make customization easier
Previously, when building a layered jar with Gradle, project
dependencies were treated the same as any other dependency, being
included in the dependencies or snapshot dependencies layer based
on their version.

This commit updates the default layering when using Gradle to include
project dependencies in the application layer by default. The DSL has
also been updated to allow their layer to be customized using new
includeProjectDependencies() and excludeProjectDependencies() methods
rather than relying on including and excluding them via a
group:artifact:version pattern.

Closes gh-23431
2020-10-15 16:04:02 +01:00
Brian Clozel
ad6ea94112 Merge branch '2.3.x'
Closes gh-23702
2020-10-15 11:08:56 +02:00
Brian Clozel
07bdfd6ec2 Merge branch '2.2.x' into 2.3.x
Closes gh-23701
2020-10-15 11:08:33 +02:00
Brian Clozel
f43970e6e0 Merge branch '2.1.x' into 2.2.x
Closes gh-23700
2020-10-15 11:08:10 +02:00
Brian Clozel
918ef888e9 Fix image folder name in update detection script
Fixes gh-23699
2020-10-15 11:06:05 +02:00
Stephane Nicoll
89b11b0078 Upgrade to Liquibase 3.10.3
This commit upgrades to Liquibase 3.10.3 and adds an explicit exclude
check as this version started to include a "banner.txt" at the root of
the classpath. Given it may override a banner configured by the user it
is ignored so that the default banner is displayed.

Users impacted by this change can rename their banner and configure the
"spring.banner.location" property to point to it.

Closes gh-23658
2020-10-15 10:20:28 +02:00
Stephane Nicoll
e81877eb04 Merge branch '2.3.x'
Closes gh-23698
2020-10-15 09:30:56 +02:00
Stephane Nicoll
7253ce1c8e Merge branch '2.2.x' into 2.3.x
Closes gh-23697
2020-10-15 09:30:03 +02:00
Stephane Nicoll
e86397bc08 Merge branch '2.1.x' into 2.2.x
Closes gh-23696
2020-10-15 09:29:40 +02:00
Stephane Nicoll
bdb6b2a4bb Add configuration for changelog generator
This commits adds a dedicated configuration to be used when invoking
the github changelog generator. This custom configuration makes sure
to sort dependency upgrades based on the issue title.

Closes gh-23484
2020-10-15 09:27:24 +02:00
Stephane Nicoll
07a8933714 Merge pull request #23694 from izeye
* pr/23694:
  Upgrade to spring-asciidoctor-extensions 0.5.0

Closes gh-23694
2020-10-15 09:08:40 +02:00
Johnny Lim
915e470510 Upgrade to spring-asciidoctor-extensions 0.5.0
See gh-23694
2020-10-15 09:08:15 +02:00
Stephane Nicoll
2f48ab119b Upgrade to Spring AMQP 2.3.0-RC1
Closes gh-23680
2020-10-15 09:06:26 +02:00
Stephane Nicoll
0c48370112 Upgrade to Spring Kafka 2.6.2
Closes gh-23679
2020-10-15 09:06:01 +02:00
Stephane Nicoll
f79cee92a9 Upgrade to Spring Integration 5.4.0-RC1
Closes gh-23695
2020-10-15 09:05:22 +02:00
Scott Frederick
de991616b0 Use config map name for configtree property sources
When Kubernetes mounts config maps onto volumes in a pod, it creates
hidden files on the pod filesystem with symbolic links to the
hidden files. The symlinks are named for the user-provided config
map that was mounted, while the hidden files have system-generated
names.

Prior to this commit, the property sources created by the
configtree property source were added to the environment using the
system-generated hidden file name instead of the user-provided
symlink name. This commit corrects that behavior so the property
sources are named as a user would expect.

Fixes gh-23232
2020-10-14 21:02:55 -05:00