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
11,881 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

650 Commits

Author SHA1 Message Date
Andy Wilkinson bdd8cb3468 Merge branch '1.5.x' 2017-05-03 16:49:21 +01:00
Andy Wilkinson 51970f81d2 Merge branch '1.4.x' into 1.5.x 2017-05-03 16:48:59 +01:00
Andy Wilkinson dc8a34f324 Fix warnings caused by CLI's assembly configuration 
Closes gh-9080
 2017-05-03 16:47:38 +01:00
Phillip Webb 06558675bb Polish 2017-04-25 09:45:14 -07:00
Spring Buildmaster 9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Spring Buildmaster d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Phillip Webb 81fef71fcb Merge branch '1.5.x' 2017-04-19 22:48:46 -07:00
Phillip Webb bddc190848 Suppress "resolving dependencies" when --quiet 
Update Spring CLI so that the "resolving dependencies" message is
suppressed when `run --quiet` is used.

Fixes gh-8946
 2017-04-19 22:18:12 -07:00
Andy Wilkinson f0c5372642 Align with Spring Framework 5's new Commons Logging adapter 
Closes gh-8825
 2017-04-06 13:22:53 +01:00
Phillip Webb 33e54ed723 Relocate `org.springframework.boot.web.support` 
Move `org.springframework.boot.web.support` under the `servlet` package.

Fixes gh-8557
 2017-03-14 22:03:03 -07:00
Phillip Webb 67556ba8ea Restructure embedded web server packages 
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
 2017-03-12 21:08:25 -07:00
Phillip Webb d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
Phillip Webb 425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Spring Buildmaster d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster 2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Phillip Webb a4bcd20b64 Merge branch '1.5.x' 2017-02-27 20:43:18 -08:00
Phillip Webb ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
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
Spring Buildmaster ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +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