Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,264 Commits 23 Branches 0 Tags
de900e71a3a60860fcd8fb3a6632afbc30ae1004
Commit Graph

2497 Commits

Author SHA1 Message Date
Andy Wilkinson
de900e71a3 Merge branch '2.0.x' 2018-07-02 16:26:27 +01:00
Andy Wilkinson
032d5488cd Tolerate non-existent source folders in DevTools 
Closes gh-13620
 2018-07-02 16:26:19 +01:00
Madhura Bhave
4eff07f6c0 Merge branch '2.0.x' 2018-06-28 12:49:34 -07:00
Madhura Bhave
fddc9e9c7e Support multiple paths in DispatcherServletPathProvider 
Closes gh-13603
 2018-06-28 12:36:58 -07:00
Andy Wilkinson
4cccc9a886 Merge branch '2.0.x' 2018-06-28 14:27:21 +01:00
Andy Wilkinson
a5d20ffed7 Avoid NPE when creating method tag for WebFlux req with non-standard method 
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.

This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.

Closes gh-13596
 2018-06-28 14:27:02 +01:00
Andy Wilkinson
45fdf2ffa4 Support Tomcat 9 and Undertow 2 
Closes gh-11749
Closes gh-12243
 2018-06-28 11:33:30 +01:00
Andy Wilkinson
b4cd4f4c43 Stop mocking class that is final in latest Framework 5.1 snapshots 2018-06-28 10:51:58 +01:00
Madhura Bhave
cde3c21926 Merge branch '2.0.x' 2018-06-27 11:34:22 -07:00
dreis2211
17edf0e2fe Fix typo 2018-06-27 11:31:06 -07:00
Madhura Bhave
598b1f4300 Merge branch '2.0.x' 2018-06-27 11:21:18 -07:00
Madhura Bhave
a1491be636 Refine DispatcherServletPathProvider creation 
Closes gh-13527
 2018-06-27 11:06:56 -07:00
Andy Wilkinson
ca0de4385c Upgrade to Hibernate 5.3 and JPA 2.2 
Closes gh-11725
 2018-06-26 16:51:47 +01:00
Andy Wilkinson
9281e2a410 Avoid creating JsonParser for VCAP_* parsing when running outside CF 
Closes gh-13437
 2018-06-25 17:35:30 +01:00
Andy Wilkinson
8dbeb68afa Merge branch '2.0.x' 2018-06-25 13:13:42 +01:00
Andy Wilkinson
04119585e8 Merge branch '1.5.x' into 2.0.x 2018-06-25 13:13:34 +01:00
Andy Wilkinson
80ede14510 Merge branch '2.0.x' 2018-06-25 11:25:21 +01:00
Andy Wilkinson
911453d478 Merge branch '1.5.x' into 2.0.x 2018-06-25 11:25:10 +01:00
Andy Wilkinson
a097f923c1 Provide sensible defaults for launch script properties when using Gradle 
Closes gh-4458
 2018-06-22 13:08:44 +01:00
Andy Wilkinson
5c3b4333f8 Merge branch '2.0.x' 2018-06-21 17:31:24 +01:00
Andy Wilkinson
30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 2018-06-21 17:31:16 +01:00
Andy Wilkinson
24dec4807f Merge branch '2.0.x' 2018-06-21 12:47:46 +01:00
Andy Wilkinson
fd125b4a4a Remove assumption that a file URI can be turned into a File 
Closes gh-13493
 2018-06-21 12:47:23 +01:00
Stephane Nicoll
4c172eb6cd Merge branch '2.0.x' 2018-06-21 13:32:31 +02:00
Stephane Nicoll
f2cc6e2ef2 Fix link of RESTEasy repository 
Closes gh-13538
 2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640 Remove wro4j starter reference 
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
 2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c Remove GraphQL starter reference 
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
 2018-06-21 13:32:07 +02:00
Andy Wilkinson
a612ba1b11 Merge branch '2.0.x' 2018-06-21 12:18:40 +01:00
Andy Wilkinson
48c5e70ac8 Merge branch '1.5.x' into 2.0.x 2018-06-21 12:18:35 +01:00
Andy Wilkinson
eb6898314a Merge branch '2.0.x' 2018-06-21 11:41:15 +01:00
Andy Wilkinson
2624748911 Merge branch '1.5.x' into 2.0.x 2018-06-21 11:41:02 +01:00
Stephane Nicoll
56a7aa552f Polish 2018-06-21 10:40:33 +02:00
Johnny Lim
bb60edaca6 Polish 
Closes gh-13534
 2018-06-21 09:24:36 +02:00
Stephane Nicoll
d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Johnny Lim
b9ea0fd5a7 Polish 
See gh-13534
 2018-06-21 09:20:50 +02:00
Stephane Nicoll
9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Andy Wilkinson
3ea7c2e003 Merge branch '2.0.x' 2018-06-20 16:51:56 +01:00
Andy Wilkinson
4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00
Andy Wilkinson
c90f589906 Merge branch '2.0.x' 2018-06-20 13:57:05 +01:00
Andy Wilkinson
e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Andy Wilkinson
7571f10ae3 Merge branch '2.0.x' 2018-06-20 11:41:54 +01:00
Andy Wilkinson
e730382718 Merge branch '1.5.x' into 2.0.x 2018-06-20 11:12:51 +01:00
Andy Wilkinson
20546024d3 Merge branch '2.0.x' 2018-06-20 10:11:44 +01:00
Andy Wilkinson
e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available 
Closes gh-13521
 2018-06-20 10:10:35 +01:00
Stephane Nicoll
8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template 
Closes gh-13529
 2018-06-20 09:28:00 +02:00
Stephane Nicoll
65cc7c72f4 Harmonize JNDI lookups to enable resourceRef 
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.

This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.

Closes gh-12803
 2018-06-19 21:51:18 +02:00
Andy Wilkinson
c12f8298e6 Merge branch '2.0.x' 2018-06-19 20:06:58 +01:00
Andy Wilkinson
814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Stephane Nicoll
3fdb2b3c85 Merge branch '2.0.x' 2018-06-19 20:59:43 +02:00
Stephane Nicoll
864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00