root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10,957 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

632 Commits

Author SHA1 Message Date
Brian Clozel 8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer 
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).

Fixes gh-8208
 2017-02-06 17:44:26 +01:00
Stephane Nicoll cfdc75d384 Merge branch '1.5.x' 2017-02-06 10:38:16 +01:00
Johnny Lim 0adab8a2be Use logical 'and' instead of bitwise 'and' 
Closes gh-8198
 2017-02-06 10:35:13 +01:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Spring Buildmaster a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Eddú Meléndez 3d52c86a21 Annotate interfaces with @FunctionaInterface 
Closes gh-6857
 2017-01-27 16:41:01 +00:00
Phillip Webb 17451c5e7a Merge branch '1.5.x' 2017-01-25 22:24:07 -08:00
Phillip Webb 6f19538028 Update CLI open_source_licenses.txt for json 
Update the open_source_licenses file to reflect the fact that the
org.json library is no longer used.

See gh-5929
 2017-01-25 22:12:37 -08:00
Phillip Webb f3db8c90c7 Merge branch '1.4.x' into 1.5.x 2017-01-25 22:09:50 -08:00
Phillip Webb ae910f3169 Update CLI open_source_licenses.txt file 
Closes gh-7703
 2017-01-25 22:05:00 -08:00
Andy Wilkinson 9bba73a1a9 Upgrade to Thymeleaf 3 and drop support for Thymleaf 2 
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.

Closes gh-7450
Closes gh-6258
See gh-7885
 2017-01-25 13:59:09 +00:00
Stephane Nicoll 661fd848eb Merge branch '1.5.x' 2017-01-25 11:02:32 +01:00
Stephane Nicoll 505e7f75ea Polish contribution 
Closes gh-8089
 2017-01-25 11:01:53 +01:00
dreis d58f38f6f6 Use String.replace() with single char if possible 
See gh-8089
 2017-01-25 11:01:52 +01:00
Andy Wilkinson ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson d2201d5284 Correct copyright dates and enforce that starting year is 2012 
Closes gh-7923
 2017-01-13 18:43:30 -05:00
Andy Wilkinson 3c35066ed5 Merge branch '1.5.x' 2017-01-13 15:40:53 -05:00
Andy Wilkinson 426435f4af Merge branch '1.4.x' into 1.5.x 2017-01-13 15:40:11 -05:00
Andy Wilkinson 1afb050061 Correct copyright dates and enforce that starting year is 2012 
Closes gh-7923
 2017-01-13 15:36:06 -05:00
Phillip Webb 77f9bb09ca Further Polish Mockito 2 support 
See gh-7770
 2017-01-05 14:29:29 -08:00
Phillip Webb 0cc313f224 Polish 2017-01-05 11:30:33 -08:00
Stephane Nicoll c28ff4314c Upgrade to Mockito 2 
Closes gh-7770
 2017-01-05 12:22:15 +01:00
Phillip Webb 4bfecc1307 Merge branch '1.5.x' 2017-01-04 23:52:40 -08:00
Phillip Webb cc7c2ebb87 Migrate to android-json 
Migrate from `org.json:json` to the clean room Apache 2.0 licensed
version that was developed for Android.

Fixes gh-5929
 2017-01-04 23:00:06 -08:00
Phillip Webb 53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Spring Buildmaster 9057f9ae1f Next development version 2016-12-23 00:15:23 +00:00
Phillip Webb 1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb 6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Phillip Webb 4b9cba351b Merge branch '1.4.x' into 1.5.x 2016-12-19 12:36:57 -08:00
Phillip Webb bd74c3d327 Polish formatting 2016-12-19 12:25:09 -08:00
Andy Wilkinson 4edab86ba2 Merge branch '1.5.x' 2016-11-16 09:13:32 +00:00
Andy Wilkinson 387a406aad Merge branch '1.4.x' into 1.5.x 2016-11-16 09:13:17 +00:00
Andy Wilkinson b3e0a37197 Remove unwanted System.out calls in test code 2016-11-16 09:12:13 +00:00
Spring Buildmaster e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Andy Wilkinson 9a70a4e261 Merge branch '1.5.x' 2016-11-08 14:43:05 +00:00
Andy Wilkinson d7ef48a9b6 Merge branch '1.4.x' into 1.5.x 2016-11-08 14:43:00 +00:00
Andy Wilkinson 2c4f39045f Stop relying on Artemis's on-demand queue creation in CLI JMS test 
Artemis's on-demand queue cretaion appears to be rather flakey,
sometimes failing with a NullPointerException.

This commit ensures that the queue used by the sample is created
during start up rather than on demand. This will hopefully make the
test that runs the sample more robust.

Closes gh-7346
 2016-11-08 14:36:58 +00:00
Andy Wilkinson becf225911 Simplify CLI integration auto-config test by removing use of Artemis 
Artemis seems to be a bit flakey which is causing sporadic build
failures, for example due to an NPE in Artemis' code.
 2016-11-04 20:58:14 +00:00
Andy Wilkinson 4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots 
Closes gh-7301
See gh-7029
 2016-11-03 20:49:02 +00:00
Andy Wilkinson 4e30da35ad Merge branch '1.5.x' 2016-11-01 13:48:37 +00:00
Andy Wilkinson aeaaaaf903 Merge branch '1.4.x' into 1.5.x 2016-11-01 13:48:31 +00:00
Andy Wilkinson ae4b8dc420 Ensure that CLI-based tests automatically import new TestRestTemplate 
See gh-6973
 2016-11-01 13:47:37 +00:00
Andy Wilkinson fc0d4e45a5 Update CLI test auto-configuration to 1.4's new test infrastructure 
Closes gh-6973
 2016-11-01 11:36:48 +00:00
Andy Wilkinson 1186eb3250 Merge branch '1.5.x' 2016-11-01 10:00:34 +00:00
Andy Wilkinson 9b6c9eeedd Merge branch '1.4.x' into 1.5.x 2016-11-01 10:00:16 +00:00
Andy Wilkinson 7e8c5f5940 Silence CLI dependency resolution progress reporting when run with -q 
Closes gh-7247
 2016-11-01 09:59:58 +00:00
Dave Syer a02fd93d18 Merge branch '1.5.x' 2016-10-28 10:40:01 +01:00
Dave Syer e97b703a20 Additionally make package method public 2016-10-28 10:39:55 +01:00
Dave Syer 13a02a6e55 Merge branch '1.5.x' 2016-10-28 10:33:06 +01:00