Andy Wilkinson
622606d85a
Make it clearer that only the main DataSource bean may be replaced
...
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson
c76b246463
Merge branch '2.3.x'
...
Closes gh-24005
2020-11-03 10:17:17 +00:00
Andy Wilkinson
b846143c37
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24004
2020-11-03 10:17:00 +00:00
Andy Wilkinson
d32d65b02c
Add tip about providing as much typo info as possible in @Bean methods
...
Closes gh-22925
2020-11-03 10:16:20 +00:00
Andy Wilkinson
b50f8359b5
Merge branch '2.3.x'
...
Closes gh-24003
2020-11-03 09:51:06 +00:00
Andy Wilkinson
e820400748
Polish manifests of source and javadoc jars
...
Previously, the main jar file and the source and javadoc jar files all
had the same changes applied to their manifests.
The commit changes the Implementation-Title of source and javadoc jars
so that the title indicates that's what they are. Rather than using
the project's description as the title (as is done for the main jar),
the titles for source and javadoc jars will now be "Source for
${project.name}" and "Javadoc for ${project.name}" respectively.
Closes gh-23974
2020-11-03 09:50:36 +00:00
Andy Wilkinson
dbb954734e
Correct replacement for stale-while-revalidate config property
...
Fixes gh-23980
2020-11-02 20:49:00 +00:00
Andy Wilkinson
8004a821f2
Fix nested test config discovery for sliced tests
...
Fixes gh-23984
2020-11-02 20:40:27 +00:00
Andy Wilkinson
43b0e2f25c
Work around Micrometer JvmGcMetrics introspection failure
...
Closes gh-23998
2020-11-02 19:52:30 +00:00
Andy Wilkinson
4a47ed97b8
Merge branch '2.3.x'
...
Closes gh-23997
2020-11-02 17:35:36 +00:00
Andy Wilkinson
8294083c99
Make deployment integration tests run when war changes
...
Closes gh-23996
2020-11-02 17:33:58 +00:00
Stephane Nicoll
b67d746840
Fix metadata for deprecated logging.file properties
...
See gh-23609
Closes gh-23995
2020-11-02 18:09:27 +01:00
Stephane Nicoll
62f26ee36f
Remove code that's no longer used
...
Closes gh-23993
2020-11-02 10:55:12 +01:00
Stephane Nicoll
339b21cee7
Merge branch '2.3.x'
...
Closes gh-23992
2020-11-02 10:48:32 +01:00
Stephane Nicoll
1e9c9b9d73
Add missing default values in configuration properties metadata
...
Closes gh-23991
2020-11-02 10:44:06 +01:00
Phillip Webb
fb59432cf5
Use Graal friendly logging factory implementations
...
Update `LoggingSystemFactory` class present checks to use a static
final field so that they work better with Graal.
Closes gh-23985
2020-11-01 12:54:43 -08:00
Phillip Webb
298880c260
Polish formatting
2020-11-01 12:50:31 -08:00
Stephane Nicoll
b547a53bc3
Merge pull request #23986 from izeye
...
* pr/23986:
Polish
Closes gh-23986
2020-11-01 17:08:13 +01:00
izeye
9c35cd41ad
Polish
...
See gh-23986
2020-11-01 17:07:50 +01:00
Phillip Webb
f3134600c0
Merge branch '2.3.x'
2020-10-29 19:10:59 -07:00
Phillip Webb
d87c437862
Fix release script distribution check
...
Update `BintrayService.isDistributionComplete` to use unpublished
artifacts.
2020-10-29 19:10:01 -07:00
Scott Frederick
f080bb6c25
Fix test that depended on snapshot version
...
A test case would fail to accurately capture the contents
of the layers.idx file unless the test project contained
at least one non-project snapshot dependency, which was only
true when the Spring Boot version was a snapshot.
See gh-23463
2020-10-29 19:40:13 -05:00
Stephane Nicoll
d951f28e16
Upgrade to Micrometer 1.6.0
...
Closes gh-23525
2020-10-29 18:58:32 +01:00
Stephane Nicoll
b230b41e07
Merge branch '2.3.x'
2020-10-29 18:58:13 +01:00
Spring Buildmaster
a2d87678df
Next development version (v2.3.6.BUILD-SNAPSHOT)
2020-10-29 17:40:17 +00:00
Andy Wilkinson
1d4a45cf8a
Add dependency management for jOOQ's new jooq-kotlin module
...
Closes gh-23964
2020-10-29 16:35:37 +00:00
Phillip Webb
fe28ad88db
Merge branch '2.3.x'
2020-10-29 09:17:42 -07:00
Phillip Webb
33d66b7f82
Fix to spring-doc-resources version
...
See gh-23824
2020-10-29 09:16:37 -07:00
Andy Wilkinson
c22e655848
Move spring.resources.* properties to spring.web.resources.*
...
Closes gh-23917
2020-10-29 16:08:50 +00:00
Phillip Webb
929d8fcd3c
Update copyright year of changed files
2020-10-29 09:08:13 -07:00
Phillip Webb
a41ff4dfab
Merge branch '2.3.x'
2020-10-29 09:07:57 -07:00
Phillip Webb
b0c2687aa9
Update copyright year of changed files
2020-10-29 09:07:42 -07:00
Phillip Webb
98dbfd572f
Merge branch '2.3.x'
...
Closes gh-23971
2020-10-29 09:06:59 -07:00
Phillip Webb
2992f40222
Upgrade to spring-doc-resources 0.2.3.RELEASE
...
Closes gh-23824
2020-10-29 09:06:23 -07:00
Andy Wilkinson
5642dc6d13
Merge branch '2.3.x'
...
Closes gh-23970
2020-10-29 15:31:59 +00:00
Andy Wilkinson
70d9602b3f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23969
2020-10-29 15:31:12 +00:00
Andy Wilkinson
e7eb7739dc
Use overriding rather than overridden getter methods in config prop AP
...
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Stephane Nicoll
f0558bb048
Merge branch '2.3.x'
2020-10-29 16:27:13 +01:00
Stephane Nicoll
eb77a20ea1
Merge branch '2.2.x' into 2.3.x
2020-10-29 16:26:40 +01:00
Spring Buildmaster
79a833539b
Next development version (v2.2.12.BUILD-SNAPSHOT)
2020-10-29 13:47:25 +00:00
Andy Wilkinson
a8705d19e5
Upgrade to Flyway 7.1.1
...
Closes gh-23932
2020-10-29 13:04:00 +00:00
Stephane Nicoll
cc3c898dfe
Upgrade to github-changelog-generator 0.0.4
...
Closes gh-23965
2020-10-29 13:36:39 +01:00
Stephane Nicoll
3b899ee326
Merge branch '2.1.x' into 2.2.x
2020-10-29 13:35:50 +01:00
Spring Buildmaster
625a0c99cb
Next development version (v2.1.19.BUILD-SNAPSHOT)
2020-10-29 11:15:37 +00:00
Stephane Nicoll
7b4d26138d
Merge branch '2.3.x'
2020-10-29 11:24:05 +01:00
Stephane Nicoll
2520ab4aa1
Merge branch '2.2.x' into 2.3.x
2020-10-29 11:22:11 +01:00
Stephane Nicoll
7de2711396
Merge branch '2.1.x' into 2.2.x
2020-10-29 11:21:16 +01:00
Andy Wilkinson
ee7a686e24
Merge pull request #23958 from evgeniycheban
...
* gh-23958:
Polish "Add liquibase driver class name property"
Add liquibase driver class name property
Closes gh-23958
2020-10-29 10:07:12 +00:00
Andy Wilkinson
2db8e7eebe
Polish "Add liquibase driver class name property"
...
See gh-23958
2020-10-29 10:06:43 +00:00
Stephane Nicoll
ec57251c55
Configure release script to use .RELEASE suffix
2020-10-29 11:01:32 +01:00