fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,864 Commits 22 Branches 339 Tags
Commit Graph

2230 Commits

Author SHA1 Message Date
Stephane Nicoll
7f50d49251 Merge branch '2.0.x' 2018-05-07 14:42:39 +02:00
dreis2211
15d67d6b12 Remove MockServletWebServer.emptyEnumeration() 
Closes gh-13084
 2018-05-07 14:41:06 +02:00
Stephane Nicoll
9cf68a2de4 Merge branch '2.0.x' 2018-05-07 14:38:52 +02:00
dreis2211
e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader 
Closes gh-13085
 2018-05-07 14:38:22 +02:00
Brian Clozel
31c7102800 Upgrade to Reactor Californium 
This Reactor generation will get the Reactor Netty 0.8 upgrade, which
will include important changes such as maven coordinate, package and API
changes.
 2018-05-07 11:48:04 +02:00
Brian Clozel
2e9b6bec1b Merge branch '2.0.x' 2018-05-07 10:56:22 +02:00
Brian Clozel
925269eacc Upgrade to Reactor Bismuth SR9 
Closes gh-12848
 2018-05-07 10:54:24 +02:00
Phillip Webb
c578a30e90 Polish 2018-05-04 23:12:42 -07:00
Stephane Nicoll
ea2a98d009 Merge branch '2.0.x' 2018-05-05 07:22:20 +02:00
Stephane Nicoll
c22e9a5514 Make sure that JpaProperties does not have Hibernate imports 
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.

This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.

Closes gh-13043
 2018-05-05 07:21:50 +02:00
Phillip Webb
cff552fb05 Merge branch '2.0.x' 2018-05-04 20:14:33 -07:00
Phillip Webb
6556bb2e89 Fix checkstyle violations 2018-05-04 20:13:57 -07:00
Phillip Webb
a323a85e3b Merge branch '2.0.x' 2018-05-04 20:06:55 -07:00
Phillip Webb
975e986fef Polish 2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef Migrate KafkaProperties to use PropertyMapper 2018-05-04 20:06:11 -07:00
Madhura Bhave
cdb5d76c7d Merge branch '2.0.x' 2018-05-04 18:12:25 -07:00
Madhura Bhave
469372c5ef Account for servlet path "/" in EndpointRequest 
See gh-12934
 2018-05-04 18:09:15 -07:00
Madhura Bhave
e02954a25b Merge branch '2.0.x' 2018-05-04 16:55:54 -07:00
Madhura Bhave
f5f3af7f9c Point to gradle plugin's doc for custom dependency versions 
Fixes gh-12807
 2018-05-04 16:54:11 -07:00
Phillip Webb
7b120c1c97 Formatting 2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07:00
Phillip Webb
6de479fe6a Polish 2018-05-04 16:08:05 -07:00
Phillip Webb
93046d058d Polish 2018-05-04 16:05:12 -07:00
Madhura Bhave
6855c5556d EndpointRequest should consider server.servlet.path 
Fixes gh-12934
 2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
57bfbfb3ad Fix checkstyle errors 2018-05-04 15:58:59 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Andy Wilkinson
b18a456123 Merge branch '2.0.x' 2018-05-04 20:02:43 +01:00
Andy Wilkinson
fefe9e4e49 Upgrade to Junit Jupiter 5.1.1 
Closes gh-13075
 2018-05-04 19:18:41 +01:00
Andy Wilkinson
c74292c222 Upgrade to Jooq 3.10.7 
Closes gh-13074
 2018-05-04 19:18:40 +01:00
Andy Wilkinson
ee587130b2 Upgrade to Narayana 5.8.1.Final 
Closes gh-13073
 2018-05-04 19:18:40 +01:00
Andy Wilkinson
36880ad25b Upgrade to Hibernate 5.2.17.Final 
Closes gh-13072
 2018-05-04 19:18:39 +01:00
Andy Wilkinson
578dd8611c Upgrade to Elasticsearch 5.6.9 
Closes gh-13071
 2018-05-04 19:18:39 +01:00
Andy Wilkinson
205449cca1 Upgrade to Javax Money 1.0.3 
Closes gh-13070
 2018-05-04 19:18:38 +01:00
Andy Wilkinson
9ec27d1f97 Upgrade to Rxjava2 2.1.13 
Closes gh-13069
 2018-05-04 19:18:37 +01:00
Andy Wilkinson
ff915b3450 Upgrade to Hazelcast 3.9.4 
Closes gh-13068
 2018-05-04 19:18:36 +01:00
Andy Wilkinson
5c2d4980de Upgrade to Couchbase Client 2.5.8 
Closes gh-13067
 2018-05-04 19:18:36 +01:00
Andy Wilkinson
820115a125 Merge branch '2.0.x' 2018-05-04 16:01:54 +01:00
Andy Wilkinson
c16f99f782 Revert "Upgrade to Ehcache 2.10.5" in 2.0 as well 
See gh-13056
 2018-05-04 16:01:39 +01:00
Stephane Nicoll
23c49116ff Merge branch '2.0.x' 2018-05-04 16:57:27 +02:00
Stephane Nicoll
18b1e8da60 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:57:12 +02:00
Stephane Nicoll
303b479b90 Merge branch '2.0.x' 2018-05-04 16:15:26 +02:00
Stephane Nicoll
959c569199 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:15:10 +02:00
Stephane Nicoll
15936a1fe8 Merge branch '2.0.x' 2018-05-04 14:27:39 +02:00
Stephane Nicoll
126f928f36 Polish "Improve Spring Session docs" 
Closes gh-13061
 2018-05-04 14:26:51 +02:00
Vedran Pavic
370160720d Improve Spring Session docs 
See gh-13061
 2018-05-04 14:26:39 +02:00
Andy Wilkinson
65e6011b7f Merge branch '2.0.x' 2018-05-04 11:45:35 +01:00
Andy Wilkinson
2bcf29913d Skip building the Gradle plugin on Java 9 as well as 10 
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.

This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
 2018-05-04 11:40:35 +01:00
Andy Wilkinson
b4ccf5186b Merge branch '2.0.x' 2018-05-04 10:04:19 +01:00
Andy Wilkinson
a1f3e7970c Merge branch '1.5.x' into 2.0.x 2018-05-04 10:03:54 +01:00