Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,812 Commits 20 Branches 322 Tags 258 MiB
723bdc77a5
Commit Graph

30812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
13b2c2041f Merge branch '2.4.x' 
Closes gh-25158
 2021-02-09 16:41:17 -08:00
Phillip Webb
cd44db9fdb Merge branch '2.3.x' into 2.4.x 
Closes gh-25157
 2021-02-09 16:40:24 -08:00
Phillip Webb
479f6200da Merge branch '2.2.x' into 2.3.x 
Closes gh-25156
 2021-02-09 16:39:32 -08:00
Phillip Webb
4b97f819d6 Upgrade CI to artifactory-resource 0.0.13 
Closes gh-25154
 2021-02-09 16:37:08 -08:00
Madhura Bhave
301e80be8c Fix raw types error 2021-02-09 14:15:08 -08:00
Madhura Bhave
c05cb21ab7 Add a property to disable the /actuator discovery page 
Closes gh-24693
 2021-02-09 11:36:29 -08:00
Andy Wilkinson
3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource 
Closes gh-24944
 2021-02-09 17:10:03 +00:00
Stephane Nicoll
c60e9c8e64 Merge pull request #25109 from artembilan 
* pr/25109:
  Polish "Make Scheduler consistent for Spring Integration"
  Make Scheduler consistent for Spring Integration

Closes gh-25109
 2021-02-09 17:06:55 +01:00
Stephane Nicoll
dca643500a Polish "Make Scheduler consistent for Spring Integration" 
See gh-25109
 2021-02-09 17:06:43 +01:00
Artem Bilan
c5491cfdd7 Make Scheduler consistent for Spring Integration 
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
 2021-02-09 17:06:43 +01:00
Andy Wilkinson
78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout 
Closes gh-25146
 2021-02-09 15:51:24 +00:00
Stephane Nicoll
6668e008e0 Merge branch '2.4.x' 
Closes gh-25145
 2021-02-09 15:25:23 +01:00
Stephane Nicoll
890c95adba Merge branch '2.3.x' into 2.4.x 
Closes gh-25144
 2021-02-09 15:25:07 +01:00
Stephane Nicoll
700c9ee0d9 Merge pull request #25120 from dreis2211 
* pr/25120:
  Upgrade to Gradle Enterprise Gradle Plugin 3.5.2

Closes gh-25120
 2021-02-09 15:24:52 +01:00
dreis2211
4bb86d4d8d Upgrade to Gradle Enterprise Gradle Plugin 3.5.2 
See gh-25120
 2021-02-09 15:24:08 +01:00
Andy Wilkinson
6521d39867 Merge branch '2.4.x' 
Closes gh-25143
 2021-02-09 14:12:36 +00:00
Andy Wilkinson
caa9249987 Merge branch '2.3.x' into 2.4.x 
Closes gh-25142
 2021-02-09 14:11:59 +00:00
Andy Wilkinson
7898b6afb0 Remove duplicate publication from spring-boot-docs 
Fixes gh-25132
 2021-02-09 14:10:58 +00:00
Stephane Nicoll
c120f789d5 Merge branch '2.4.x' 
Closes gh-25141
 2021-02-09 15:04:58 +01:00
Stephane Nicoll
9218965104 Merge branch '2.3.x' into 2.4.x 
Closes gh-25140
 2021-02-09 15:04:28 +01:00
Stephane Nicoll
4f656d379c Merge pull request #25116 from dreis2211 
* pr/25116:
  Fix build deprecation warnings about duplicate jar entries

Closes gh-25116
 2021-02-09 15:04:06 +01:00
dreis2211
4937547b8a Fix build deprecation warnings about duplicate jar entries 
See gh-25116
 2021-02-09 14:45:58 +01:00
Stephane Nicoll
a9a8d3a167 Merge branch '2.4.x' 
Closes gh-25137
 2021-02-09 09:49:59 +01:00
Stephane Nicoll
b09202ed40 Merge pull request #25093 from izeye 
* pr/25093:
  Polish

Closes gh-25093
 2021-02-09 09:49:44 +01:00
izeye
63ee99bf75 Polish 
See gh-25093
 2021-02-09 09:48:35 +01:00
Stephane Nicoll
ee59f644ed Merge branch '2.4.x' 
Closes gh-25136
 2021-02-09 09:45:37 +01:00
Stephane Nicoll
1c5b802bfe Merge pull request #25075 from oleg-sukhov 
* pr/25075:
  Polish "Clarify usage of BufferingApplicationStartup"
  Clarify usage of BufferingApplicationStartup

Closes gh-25075
 2021-02-09 09:44:47 +01:00
Stephane Nicoll
b2818680fd Polish "Clarify usage of BufferingApplicationStartup" 
See gh-25075
 2021-02-09 09:44:19 +01:00
Oleg Sukhov
853dbc3de3 Clarify usage of BufferingApplicationStartup 
See gh-25075
 2021-02-09 09:21:52 +01:00
Stephane Nicoll
feb17a7eed Merge pull request #25006 from dreis2211 
* pr/25006:
  Polish contribution
  Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping

Closes gh-25006
 2021-02-09 09:15:17 +01:00
Stephane Nicoll
948f61b4ca Polish contribution 
See gh-25006
 2021-02-09 09:10:56 +01:00
dreis2211
634dd979d1 Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping 
See gh-25006
 2021-02-09 09:10:42 +01:00
Andy Wilkinson
c0a1b66032 Merge branch '2.4.x' 
Closes gh-25119
 2021-02-05 14:00:06 +00:00
Andy Wilkinson
88bea823f8 Merge branch '2.3.x' into 2.4.x 
Closes gh-25118
 2021-02-05 13:58:54 +00:00
Andy Wilkinson
d12bb6f915 Upgrade to Gradle 6.8.2 
Closes gh-25117
 2021-02-05 13:34:00 +00:00
Phillip Webb
23ebf017c0 Extract code samples from docs 
See gh-6313
 2021-02-04 15:55:35 -08:00
Andy Wilkinson
7a3bd6d44f Merge branch '2.4.x' 
Closes gh-25106
 2021-02-04 11:44:29 +00:00
Andy Wilkinson
297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate 
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] a0f4d81db7
 2021-02-04 10:59:00 +00:00
Andy Wilkinson
d30251092b Test the Gradle Plugin against 7.0-milestone-1 
Closes gh-25103
 2021-02-04 10:16:48 +00:00
Phillip Webb
0e326d6b0f Extract some code samples from docs 
See gh-6313
 2021-02-03 18:10:44 -08:00
Phillip Webb
e0392c4558 Add additional dependencies for example code 
Add additional dependencies useful for the example code.

See gh-6313
 2021-02-03 17:53:52 -08:00
Phillip Webb
9f6f2d36df Polish documented application logged output 
Update the documented application output based on the latest version.
 2021-02-03 17:53:52 -08:00
Phillip Webb
b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb
ae1be76cce Add pending-extract attribute to source 
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
 2021-02-03 17:45:40 -08:00
Phillip Webb
073f8c4b23 Polish spring-boot-docs 
See gh-25089
 2021-02-03 16:25:11 -08:00
Phillip Webb
2a85427324 Refine spring-boot-docs package restructure 
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
 2021-02-03 15:47:05 -08:00
Phillip Webb
91ccc23462 Restructure spring-boot-docs packages 
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
 2021-02-02 17:09:45 -08:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x' 
See gh-25077
 2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x 
See gh-25076
 2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00