Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,676 Commits 23 Branches 0 Tags
7a3bd6d44fa822ab298adcbefd7149fd55433806
Commit Graph

30676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phillip Webb
d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08:00
Phillip Webb
230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb
630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb
d8b849e00d Fix test that fails when building against SNAPSHOT 
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.

See gh-23936
 2021-02-01 22:09:04 -08:00
Phillip Webb
1eef2e1b46 Merge branch '2.4.x' 2021-02-01 19:47:11 -08:00
Phillip Webb
331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00
Phillip Webb
c404a50a2e Allow test to use snapshot/milestone repo 
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
 2021-02-01 19:45:11 -08:00
Phillip Webb
cff09df3fe Merge branch '2.4.x' 2021-02-01 17:07:28 -08:00
Phillip Webb
003f2f9521 Merge branch '2.3.x' into 2.4.x 2021-02-01 17:07:07 -08:00
Phillip Webb
faaa5e4186 Fix BOM attached sourceSet 
See gh-23936
 2021-02-01 16:51:53 -08:00
Phillip Webb
59b8fb5b49 Merge branch '2.4.x' 
Closes gh-25079
 2021-02-01 16:36:02 -08:00
Phillip Webb
db52bf3d7a Merge branch '2.3.x' into 2.4.x 
Closes gh-25078
 2021-02-01 16:35:46 -08:00
Phillip Webb
40c1748e3c Remove hardcoded versions from MavenBuild 
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.

Closes gh-23936
 2021-02-01 16:20:55 -08:00
Phillip Webb
d8b6960997 Merge branch '2.4.x' 
Closes gh-25077
 2021-02-01 16:08:57 -08:00
Phillip Webb
257608a3a3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25076
 2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26 Add junit-platform-launcher dependency 
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
 2021-02-01 15:31:28 -08:00
Madhura Bhave
c73e3cc2dc Update documentation for layered wars 
Closes gh-22821
Closes gh-22195
 2021-02-01 14:43:43 -08:00
Madhura Bhave
1245e5eec9 Add support for creating layered war files with Gradle 
See gh-22195
 2021-02-01 14:43:42 -08:00
Andy Wilkinson
7f8ea33359 Merge branch '2.4.x' 
Closes gh-25073
 2021-02-01 15:39:52 +00:00
Andy Wilkinson
79c0597aa2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25072
 2021-02-01 15:39:19 +00:00
Andy Wilkinson
3585d20453 Include IDialect beans in WebFluxTest and WebMvcTest 
Fixes gh-24149
 2021-02-01 15:03:08 +00:00
Phillip Webb
0104ee677e Merge branch '2.4.x' 
Closes gh-25067
 2021-01-30 17:58:05 -08:00
Phillip Webb
57f1f17320 Merge branch '2.3.x' into 2.4.x 
Closes gh-25066
 2021-01-30 17:57:53 -08:00
Phillip Webb
187258aa6a Fix classpath.idx format documentation 
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
 2021-01-30 17:56:09 -08:00
Phillip Webb
d6eb1eb5ae Merge branch '2.4.x' 
Closes gh-25065
 2021-01-30 17:46:25 -08:00
Phillip Webb
9ac5151932 Merge branch '2.3.x' into 2.4.x 
Closes gh-25064
 2021-01-30 17:46:10 -08:00
Phillip Webb
19c5864d2c Clarify square bracket map binding notation 
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
 2021-01-30 17:42:49 -08:00
Phillip Webb
99d400f302 Merge branch '2.4.x' 
Closes gh-25062
 2021-01-30 17:04:24 -08:00
Phillip Webb
d7c44e4503 Merge branch '2.3.x' into 2.4.x 
Closes gh-25061
 2021-01-30 17:04:10 -08:00
Phillip Webb
549d4f7fbe Document that Spring MVC has own ConversionService 
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
 2021-01-30 17:03:55 -08:00
Phillip Webb
d8c9b8c329 Merge branch '2.4.x' 
Closes gh-25060
 2021-01-30 12:35:52 -08:00
Phillip Webb
77478d9f34 Refine CharSequenceToObjectConverter logic 
Update `CharSequenceToObjectConverter` so that conversion that would
apply using an `ObjectTo...` converter now favors `toString()` based
conversion.

Prior to this commit, when converting a `CharSequence` to a `Collection`
the `ObjectToCollectionConveter` would be picked instead of the
`StringToCollectionConverter`. This resulted in a `Collection`
containing a single `String` value, rather than the expected list
of values split around ",".

Fixes gh-25057
 2021-01-30 12:35:36 -08:00
Phillip Webb
01746453f7 Merge branch '2.4.x' 2021-01-30 12:34:28 -08:00
Phillip Webb
dd997cda9c Remove sysout from test 2021-01-30 10:38:02 -08:00
Andy Wilkinson
82b90d5749 Merge branch '2.4.x' 
Closes gh-25052
 2021-01-29 09:07:40 +00:00
Andy Wilkinson
a3058200cb Merge branch '2.3.x' into 2.4.x 
Closes gh-25050
 2021-01-29 09:06:42 +00:00