root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
33,123 Commits 23 Branches 345 Tags 288 MiB
Commit Graph

2338 Commits

Author SHA1 Message Date
Andy Wilkinson de410b7621 Merge branch '2.4.x' 
Closes gh-26828
 2021-06-09 18:01:32 +01:00
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions 
Closes gh-26620
 2021-06-09 18:00:45 +01:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization 
Closes gh-26682
 2021-06-08 15:13:55 +01:00
Phillip Webb abd926788f Merge branch '2.4.x' 
Closes gh-26782
 2021-06-06 21:53:10 -07:00
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config' 
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
 2021-06-06 21:05:54 -07:00
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main 
Closes gh-26741
 2021-06-02 12:24:36 -07:00
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x 
Closes gh-26740
 2021-06-02 12:20:02 -07:00
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs 
Fixes gh-26736
 2021-06-02 12:18:57 -07:00
Stephane Nicoll 1f95989e85 Merge branch '2.4.x' 
Closes gh-26735
 2021-06-02 13:56:13 +02:00
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x 
Closes gh-26734
 2021-06-02 13:52:03 +02:00
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis 
Closes gh-26733
 2021-06-02 13:49:16 +02:00
Madhura Bhave 54c3194164 Merge branch '2.4.x' into main 
Closes gh-26701
 2021-05-28 14:38:28 -07:00
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x 
Closes gh-26700
 2021-05-28 14:30:44 -07:00
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period 
Closes gh-26469
 2021-05-28 14:30:04 -07:00
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide 
Closes gh-26592
 2021-05-28 13:29:27 +02:00
Stephane Nicoll e5ee1eb86f Merge branch '2.4.x' 
See gh-26654
 2021-05-26 09:27:52 +02:00
Stephane Nicoll 130261f0df Merge branch '2.3.x' into 2.4.x 
See gh-26653
 2021-05-26 09:21:17 +02:00
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide 
Closes gh-26592
 2021-05-26 09:20:58 +02:00
Stephane Nicoll f3d4fdb9c4 Merge branch '2.4.x' 
Closes gh-26655
 2021-05-25 10:46:40 +02:00
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation" 
See gh-26421
 2021-05-25 10:45:08 +02:00
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation 
See gh-26421
 2021-05-25 10:44:51 +02:00
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin 
See gh-26635
 2021-05-23 16:37:44 +02:00
Phillip Webb ab958d2394 Include io.spring.asciidoctor.backends group 
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
 2021-05-19 22:58:31 -07:00
Phillip Webb 8a3f835ffe Set Asciidoctor attribute-missing to warn 
Closes gh-26590
 2021-05-19 11:53:46 -07:00
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint 
See gh-26591
 2021-05-19 17:42:13 +02:00
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links 
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
 2021-05-18 21:19:24 -07:00
Phillip Webb 86a5c90d20 Simplify anchor-rewrite.properties 2021-05-18 21:19:09 -07:00
Phillip Webb e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to 
See gh-26262
 2021-05-18 11:53:26 -07:00
Phillip Webb 499a29c415 Move "Testcontainers" How-to 
See gh-26262
 2021-05-18 11:49:03 -07:00
Phillip Webb 72d50ed2f8 Move "Testing With Spring Security" How-to 
See gh-26262
 2021-05-18 11:49:02 -07:00
Phillip Webb 5f7e3d3952 Polish 2021-05-18 11:39:20 -07:00
Andy Wilkinson 88b383c6bb Polish "Update docs and internal dep mgmt following Spock 2.0's release" 
See gh-26586
 2021-05-18 10:00:05 +01:00
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release 
See gh-26586
 2021-05-18 09:59:29 +01:00
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x' 
Closes gh-26526
 2021-05-17 11:52:53 +01:00
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x 
Closes gh-26525
 2021-05-17 11:48:34 +01:00
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies" 
See gh-25944
 2021-05-17 11:44:23 +01:00
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies 
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
 2021-05-17 11:29:36 +01:00
Andy Wilkinson 05a64ecb2c Merge branch '2.4.x' 
Closes gh-26522
 2021-05-17 11:24:29 +01:00
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26521
 2021-05-17 11:22:48 +01:00
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance" 
See gh-26227
 2021-05-17 11:07:42 +01:00
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests 
See gh-26441
 2021-05-17 09:31:51 +02:00
Andy Wilkinson a623dab0aa Merge branch '2.4.x' 
Closes gh-26474
 2021-05-15 08:57:23 +01:00
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x 
Closes gh-26473
 2021-05-15 08:56:09 +01:00
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM 
Closes gh-26467
 2021-05-15 08:55:59 +01:00
Andy Wilkinson f44c99df26 Merge branch '2.4.x' 
Closes gh-26452
 2021-05-13 14:01:37 +01:00
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter 
Closes gh-25733
 2021-05-13 13:58:07 +01:00
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation 
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
 2021-05-10 18:04:05 -07:00
Andy Wilkinson dc5f115c04 Document support for Gradle 6.9 
Closes gh-26409
 2021-05-07 11:29:51 +01:00
Phillip Webb d3207b107c Polish docs 2021-05-05 23:42:22 -07:00
Phillip Webb 65c00f373a Polish 2021-05-04 14:07:58 -07:00
Phillip Webb 711a0c19e6 Use consistent asciidoctor subs attribute 
Closes gh-25101
 2021-05-04 13:01:20 -07:00
Phillip Webb 979fa12ca9 Polish source type for Gradle snippets 2021-05-04 10:35:39 -07:00
Phillip Webb 57e54af6f5 Delete R2dbcDatabaseInitializationConfiguration 
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.

Closes gh-26225
 2021-05-04 08:15:14 -07:00
Phillip Webb d6d1d95741 Use American English spellings 2021-05-03 22:39:45 -07:00
Phillip Webb b5583a4620 Polish doc code samples 
See gh-6313
 2021-05-03 22:39:44 -07:00
Phillip Webb 9aad29da0c Extract code samples from docs 
See gh-6313
 2021-05-03 17:46:37 -07:00
Phillip Webb b314d848dc Polish docs code 
See gh-6313
 2021-04-30 18:19:52 -07:00
Phillip Webb 09e85806d6 Align docs package structure with heading IDs 
See gh-6313
 2021-04-30 16:34:35 -07:00
dreis2211 ca3105920b Fix link to Webservices reference docs 
See gh-26316
 2021-04-30 08:27:22 +02:00
Phillip Webb 33c6c600a9 Split up adoc files 
Closes gh-23254
 2021-04-29 17:32:27 -07:00
Andy Wilkinson 5d8a64e186 Validate section IDs in the reference documentation 
See gh-26307
 2021-04-29 15:40:54 +01:00
Stephane Nicoll 242f2ba6bd Merge branch '2.4.x' 
Closes gh-26299
 2021-04-29 12:30:09 +02:00
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26298
 2021-04-29 12:29:55 +02:00
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators 
Closes gh-26279
 2021-04-29 12:28:43 +02:00
Phillip Webb 5dce5ee595 Align adoc filename with anchors 
See gh-26296
 2021-04-28 22:34:16 -07:00
Phillip Webb bd3f4d74be Rationalize reference documentation anchors 
Closes gh-26296
 2021-04-28 21:56:51 -07:00
Stephane Nicoll 80248dcc13 Merge branch '2.4.x' 
Closes gh-26283
 2021-04-28 16:14:58 +02:00
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x 
Closes gh-26282
 2021-04-28 16:14:46 +02:00
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc 
Closes gh-26268
 2021-04-28 16:14:06 +02:00
Andy Wilkinson 6953da2013 Merge branch '2.4.x' 
Closes gh-26257
 2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Andy Wilkinson 091907f762 Rename default branch to main 
Closes gh-26248
 2021-04-27 11:27:37 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x' 
Closes gh-26242
 2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x 
Closes gh-26241
 2021-04-26 17:42:00 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs 
See gh-6313
 2021-04-26 14:01:37 -07:00
Phillip Webb 32a87fcbda Extract code samples from docs 
See gh-6313
 2021-04-25 16:07:26 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs 
See gh-6313
 2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs 
See gh-6313
 2021-04-23 19:10:09 -07:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x' 
Closes gh-26211
 2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested 
See gh-26209
 2021-04-22 14:47:29 +02:00
Stephane Nicoll e3f81f0243 Merge branch '2.4.x' 2021-04-21 17:23:42 +02:00
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review 
See gh-26188
 2021-04-21 17:23:21 +02:00
Stephane Nicoll 3ca6ed6246 Polish 
Closes gh-26190
 2021-04-21 17:20:22 +02:00
izeye 4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +02:00
Stephane Nicoll 6c68f3652c Merge branch '2.4.x' 
Closes gh-26186
 2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-26185
 2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll 57d35aba12 Merge branch '2.4.x' 
Closes gh-26160
 2021-04-19 17:09:45 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x 
Closes gh-26159
 2021-04-19 17:01:28 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to" 
See gh-14928
 2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to 
See gh-14928
 2021-04-19 16:53:50 +02:00
Andy Wilkinson 5142fe9b8e Fix typo in Initialize a Database using basic SQL scripts 
Closes gh-26137
 2021-04-15 17:03:31 +01:00
izeye e27c85698d Polish 
See gh-26135
 2021-04-15 16:31:10 +02:00