Phillip Webb
52e635b823
Merge branch '2.1.x'
2019-04-02 20:50:22 -07:00
Phillip Webb
912e0a87a8
Merge branch '2.0.x' into 2.1.x
2019-04-02 20:49:44 -07:00
Phillip Webb
8c2e0a61ae
Merge branch '1.5.x' into 2.0.x
2019-04-02 20:48:00 -07:00
Phillip Webb
f25469c95f
Update formatting with spring-javaformat 0.0.9
...
See gh-16421
2019-04-02 20:43:36 -07:00
Phillip Webb
cae6a82322
Upgrade to spring-javaformat 0.0.9
...
Closes gh-16421
2019-04-02 20:34:35 -07:00
Phillip Webb
afa58bba04
Merge branch '2.1.x'
2019-04-02 19:42:23 -07:00
Phillip Webb
eefd10d4d1
Merge branch '2.0.x' into 2.1.x
2019-04-02 19:40:28 -07:00
Phillip Webb
f875b74e67
Reformat samples with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 19:39:23 -07:00
Madhura Bhave
6bb5311984
Merge branch '2.1.x'
2019-04-02 15:58:59 -07:00
Madhura Bhave
eff2f92c48
Fix formatting following formatter update
2019-04-02 15:55:34 -07:00
Madhura Bhave
04517495af
Merge branch '2.1.x'
2019-04-02 15:52:35 -07:00
Madhura Bhave
ddc52502f5
Document @MockBean behavior during context refresh
...
Closes gh-16333
2019-04-02 15:50:51 -07:00
Phillip Webb
2376f973f4
Merge branch '2.1.x'
2019-04-02 13:46:36 -07:00
Phillip Webb
47c6bf741d
Merge branch '2.0.x' into 2.1.x
2019-04-02 13:40:21 -07:00
Phillip Webb
07c000c5b7
Merge branch '1.5.x' into 2.0.x
2019-04-02 13:34:28 -07:00
Phillip Webb
2ff74b1559
Reformat code with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 13:30:25 -07:00
Andy Wilkinson
4e337f7466
Merge branch '2.1.x'
2019-04-02 19:55:12 +01:00
Andy Wilkinson
b969d55e05
Upgrade to Spring Kafka 2.2.5
...
Closes gh-16351
2019-04-02 19:51:08 +01:00
Andy Wilkinson
08673c0191
Upgrade to Spring Security 5.1.5
...
Closes gh-16354
2019-04-02 19:49:48 +01:00
Andy Wilkinson
39be22906f
Merge branch '2.0.x' into 2.1.x
2019-04-02 19:49:01 +01:00
Andy Wilkinson
da4a7203c7
Upgrade to Spring Security 5.0.12
...
Closes gh-16353
2019-04-02 19:45:35 +01:00
Phillip Webb
0d8613f3eb
Upgrade to spring-javaformat 0.0.8
...
Closes gh-16418
2019-04-02 10:52:05 -07:00
Phillip Webb
a336a5c36a
Prune unnecessary P2 Eclipse installs
...
Remove a few items that are no longer necessary.
2019-04-02 10:52:05 -07:00
Phillip Webb
6246da06a6
Update Eclipse setup files
...
Update the eclipse setup files and contributing instructions for
compatibility with the latest Eclipse 2019-03 release. This commit
reverts the use the HTTPS in the `.setup` file namespace (since it
breaks the setup editor). The `xsi:schemaLocation` section still
uses HTTPS for actual XSD resolution.
See gh-16245
2019-04-02 10:52:05 -07:00
Stephane Nicoll
8d8f5571a3
Merge pull request #16174 from mmitropolitsky
...
* pr/16174:
Replace ${sys:PID} with %pid in log4j2 configuration
2019-04-02 17:08:09 +02:00
mmitropolitsky
deaf5fa433
Replace ${sys:PID} with %pid in log4j2 configuration
...
Replacing property sys:PID which was set in the code with the default
log4j2 Pattern in log4j2.xml and log4j2-file.xml files.
Closes gh-16174
2019-04-02 17:07:54 +02:00
Stephane Nicoll
df79808d38
Polish
2019-04-02 16:52:02 +02:00
Stephane Nicoll
f1b9b0d3f0
Merge pull request #16327 from hsellik
...
* pr/16327:
Polish "Add Spring-specific styling to Gradle Plugin's documentation"
Add Spring-specific styling to Gradle Plugin's documentation
2019-04-02 16:51:12 +02:00
Stephane Nicoll
c4b1a22e89
Polish "Add Spring-specific styling to Gradle Plugin's documentation"
...
Closes gh-16327
2019-04-02 16:49:11 +02:00
Hendrig Sellik
466b57cd44
Add Spring-specific styling to Gradle Plugin's documentation
...
This commit replaces the default Asciidoctor styling with
Spring specific styling.
First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.
See gh-16327
2019-04-02 16:38:50 +02:00
Stephane Nicoll
8c8a088c20
Fix zip structure of Actuator documentation
...
Closes gh-16326
2019-04-02 16:38:11 +02:00
Andy Wilkinson
9e7d922555
Allow processor cache to be configured to be unlimited
...
Closes gh-16415
2019-04-02 15:26:40 +01:00
Andy Wilkinson
ea80ca2ffc
Do not assume HTTP protocol when customizing processor cache
...
Closes gh-16413
2019-04-02 15:10:55 +01:00
Andy Wilkinson
c5024f21a4
Merge branch '2.1.x'
2019-04-02 14:40:35 +01:00
Andy Wilkinson
6aa4fe579a
Polish
...
See gh-16068
2019-04-02 14:40:18 +01:00
Stephane Nicoll
57cad53ea9
Adapt to latest API change
2019-04-02 15:17:23 +02:00
Andy Wilkinson
3c21ade426
Merge pull request #16410 from Sebastien Deleuze
...
* gh-16410:
Polish "Update CORS handling according to Framework changes"
Update CORS handling according to Framework changes
Closes gh-16410
2019-04-02 12:48:39 +01:00
Andy Wilkinson
e1a6726d76
Polish "Update CORS handling according to Framework changes"
...
See gh-16410
2019-04-02 12:48:00 +01:00
Sebastien Deleuze
2f9db7eec6
Update CORS handling according to Framework changes
...
This commit updates CORS handling according to Framework changes
introduced via [1]. It also fixes tests according to the new behavior.
See gh-16410
[1] d27b5d0ab6
.
2019-04-02 12:47:07 +01:00
Andy Wilkinson
8ebe5f9983
Merge branch '2.1.x'
2019-04-02 11:17:28 +01:00
Andy Wilkinson
fe4c83a874
Merge pull request #16087 from Dmytro Nosan
...
* gh-16087:
Polish "Ensure that MongoClient's EventLoopGroup is shut down during context close"
Ensure that MongoClient's EventLoopGroup is shut down during context close
Closes gh-16087
2019-04-02 11:09:48 +01:00
Andy Wilkinson
f20d9a62ae
Polish "Ensure that MongoClient's EventLoopGroup is shut down during context close"
...
See gh-16087
2019-04-02 11:09:14 +01:00
Dmytro Nosan
ee7bed1849
Ensure that MongoClient's EventLoopGroup is shut down during context close
...
See gh-16087
2019-04-02 11:04:42 +01:00
Andy Wilkinson
4f42597aca
Merge branch '2.1.x'
2019-04-02 10:53:14 +01:00
Andy Wilkinson
02b24b6ed3
Specify that log file endpoint's response is UTF-8 encoded
...
Closes gh-16189
2019-04-02 10:52:18 +01:00
Andy Wilkinson
512fbae715
Merge branch '2.1.x'
2019-04-02 10:47:30 +01:00
Andy Wilkinson
22c9364237
Only use AprLifecycleListener when native library is available
...
Closes gh-16040
2019-04-02 10:47:24 +01:00
Andy Wilkinson
ac4d6bb10f
Merge branch '2.1.x'
2019-04-02 10:27:45 +01:00
Andy Wilkinson
db4623c519
Merge branch '2.0.x' into 2.1.x
2019-04-02 10:27:34 +01:00
Andy Wilkinson
7b5f46d6e3
Add Spring-Boot-* manifest attributes to jars and wars built with Gradle
...
Closes gh-16068
2019-04-02 10:13:09 +01:00