Andy Wilkinson
8772f90e2f
Polish
2018-11-23 17:00:16 +00:00
Andy Wilkinson
3331fa2d02
Merge branch '1.5.x' into 2.0.x
2018-11-23 16:59:18 +00:00
Andy Wilkinson
291522a261
Avoid duplicate scope registration
...
Closes gh-14990
2018-11-23 16:55:43 +00:00
Andy Wilkinson
a54de61e61
Polish
...
Revert change inadvertently committed as part of gh-15017
2018-11-23 16:41:25 +00:00
Andy Wilkinson
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
2018-11-23 15:44:58 +00:00
Andy Wilkinson
d104205880
Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
...
Closes gh-15220
2018-11-23 15:26:01 +00:00
Andy Wilkinson
1f39b5dd7a
Align MeterRegistryConfigurer's javadoc with its implementation
...
Closes gh-15017
2018-11-23 15:22:09 +00:00
Andy Wilkinson
8ee57ac574
Remove redundant suggestion to add a dependency on Woodstox
...
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.
Closes gh-15092
2018-11-23 15:11:03 +00:00
Andy Wilkinson
ce0a3d0311
Add missing classpath setters to BootJar and BootWar
...
Closes gh-15087
2018-11-23 13:46:56 +00:00
Andy Wilkinson
fd6dea7ac8
Merge branch '1.5.x' into 2.0.x
2018-11-23 08:39:25 +00:00
Andy Wilkinson
85cb6bf096
Revert "Upgrade to Ehcache 2.10.6"
...
This reverts commit addc421bfd
.
Closes gh-15237
2018-11-23 08:38:52 +00:00
Andy Wilkinson
3bda78a3d3
Fix tests after HandlerExceptionResolver logging changes
...
See gh-14936 and gh-15189
2018-11-22 20:27:19 +00:00
Andy Wilkinson
97f7984812
Merge branch '1.5.x' into 2.0.x
2018-11-22 17:31:03 +00:00
Andy Wilkinson
2aa2091fc4
Revert "Upgrade to Jetty 9.4.14.v20181114"
...
This reverts commit d4b914828f
.
See gh-15239
2018-11-22 17:29:41 +00:00
Andy Wilkinson
9ca96cb751
Start building against Spring Framework 5.1.1 snapshots
...
See gh-15189
2018-11-22 15:33:10 +00:00
Andy Wilkinson
39bec2c50f
Start building against Spring Integration 5.0.10 snapshots
...
See gh-15251
2018-11-22 15:32:21 +00:00
Andy Wilkinson
00f1e92350
Start building against Spring Session Apple-SR7 snapshots
...
See gh-15254
2018-11-22 15:30:40 +00:00
Andy Wilkinson
739de913d5
Start building against Spring AMQP 2.0.10 snapshots
...
See gh-15256
2018-11-22 15:29:55 +00:00
Andy Wilkinson
de84a51f26
Upgrade to Spring Cloud Connectors 2.0.4.RELEASE
...
Closes gh-15250
2018-11-22 15:21:59 +00:00
Andy Wilkinson
ff22df0475
Upgrade to Jetty El 8.5.33.1
...
Closes gh-15249
2018-11-22 15:21:58 +00:00
Andy Wilkinson
d08edf7e14
Upgrade to Elasticsearch 5.6.13
...
Closes gh-15248
2018-11-22 15:21:57 +00:00
Andy Wilkinson
350e397d53
Upgrade to Janino 3.0.11
...
Closes gh-15247
2018-11-22 15:21:56 +00:00
Andy Wilkinson
ec219b30d2
Upgrade to Activemq 5.15.8
...
Closes gh-15246
2018-11-22 15:21:56 +00:00
Andy Wilkinson
941d8744cb
Upgrade to Javax Json 1.1.4
...
Closes gh-15245
2018-11-22 15:21:55 +00:00
Andy Wilkinson
6761747e39
Upgrade to Reactor Bom Bismuth-SR14
...
Closes gh-15244
2018-11-22 15:21:54 +00:00
Andy Wilkinson
40005c0e59
Upgrade to Unboundid Ldapsdk 4.0.9
...
Closes gh-15243
2018-11-22 15:21:53 +00:00
Andy Wilkinson
ba4461a7a2
Merge branch '1.5.x' into 2.0.x
2018-11-22 15:09:38 +00:00
Andy Wilkinson
992d7dc24b
Upgrade to Spring Session 1.3.4.RELEASE
...
Closes gh-15242
2018-11-22 15:03:03 +00:00
Andy Wilkinson
e72bae5390
Upgrade to Spring Integration 4.3.18.RELEASE
...
Closes gh-15241
2018-11-22 15:03:03 +00:00
Andy Wilkinson
105d7e336d
Upgrade to Spring Cloud Connectors 1.2.7.RELEASE
...
Closes gh-15240
2018-11-22 15:03:03 +00:00
Andy Wilkinson
d4b914828f
Upgrade to Jetty 9.4.14.v20181114
...
Closes gh-15239
2018-11-22 15:03:02 +00:00
Andy Wilkinson
b1853ee4e0
Upgrade to Tomcat 8.5.35
...
Closes gh-15238
2018-11-22 15:03:02 +00:00
Andy Wilkinson
addc421bfd
Upgrade to Ehcache 2.10.6
...
Closes gh-15237
2018-11-22 15:03:02 +00:00
Andy Wilkinson
2d98054041
Upgrade to Appengine Sdk 1.9.68
...
Closes gh-15236
2018-11-22 15:03:02 +00:00
Andy Wilkinson
a7067171c7
Start building against Spring Framework 4.3.21 snapshots
...
See gh-15188
2018-11-22 15:03:02 +00:00
Madhura Bhave
35db10eb30
Use the right variable name in pipeline
2018-11-19 12:51:00 -08:00
Madhura Bhave
ee4205a049
Remove unnecessary logging by start-docker script
2018-11-15 15:48:28 -08:00
Phillip Webb
657a5347be
Use random port for Devtools integration tests
...
Closes gh-15013
2018-11-15 14:02:21 -08:00
Phillip Webb
e87664f295
Add JettyAccessLogCustomizer
...
Add a `JettyAccessLogCustomizer` to customize management access logs
when the management server is running on a different port.
Closes gh-15041
2018-11-15 13:28:51 -08:00
Phillip Webb
c64a007e12
Format POM file
2018-11-15 13:22:50 -08:00
Phillip Webb
3fb30fddb4
Use Bintray API key rather than password in CI
...
Update CI scripts to use the Bintray API key rather than the password
when making curl calls.
Closes gh-15015
2018-11-15 11:15:33 -08:00
Phillip Webb
5183dd120c
Merge pull request #15182 from rahul404
...
* pr/15182:
Polish "Skip scoped targets when determining endpoints"
Skip scoped targets when determining endpoints
2018-11-15 10:42:43 -08:00
Phillip Webb
e4d5714d50
Polish "Skip scoped targets when determining endpoints"
...
See gh-15182
2018-11-15 10:41:14 -08:00
Rahul Ahuja
4853e6a7af
Skip scoped targets when determining endpoints
...
Update `EndpointDiscoverer` to filter out scoped target beans when
finding endpoints.
Closes gh-15182
2018-11-15 10:38:05 -08:00
Phillip Webb
0bc4567898
Merge pull request #15179 from making
...
* pr/15179:
Fix CI Java 11 references
2018-11-15 10:10:59 -08:00
Toshiaki Maki
dd2ed72fae
Fix CI Java 11 references
...
Closes gh-15179
2018-11-15 10:10:33 -08:00
Phillip Webb
3baf782822
Merge branch '1.5.x' into 2.0.x
2018-11-14 18:24:32 -08:00
Phillip Webb
b60da5f85d
Allow early ServletRequest Autowiring
...
Update `EmbeddedWebApplicationContext` so that Servlet related
resolvable dependencies are registered in `postProcessBeanFactory`.
This allows a `ServletReqest` to be autowired into an early initialized
bean and brings parity with WAR based deployments.
Closes gh-14990
2018-11-14 18:15:21 -08:00
Phillip Webb
fb85d0acc1
Merge pull request #15176 from rs017991
...
* pr/15176:
Fixed typo in maven site documentation
2018-11-14 16:10:55 -08:00
Ryan Scheidter
f2d6490548
Fixed typo in maven site documentation
...
Closes gh-15176
2018-11-14 16:10:35 -08:00