Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,432 Commits 23 Branches 0 Tags
2d36d2a7e4541bfbb16534a048f0aa78c2a81636
Commit Graph

435 Commits

Author SHA1 Message Date
Phillip Webb
2c7dd9f519 Polish 2017-06-02 16:00:39 -07:00
Andy Wilkinson
d5438c299c Polish "Use try-with-resources to close resources automatically" 
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
  pull request

Closes gh-8045
 2017-05-23 19:38:48 +01:00
Phillip Webb
889d43ddc4 Refine SpringApplication source types 
Update `SpringApplication` so that the `run` methods and constructors
now require `Class<?>` arguments, rather than `Objects`. String based
sources can still be loaded, but must now be set on the `getSources()`
collections. `Package` and `Resource` types are no longer directly
supported.

This change should help IDEs offer better content assist, and will
help integrations with alternative languages such as Ceylon.

Users currently passing in Class references or using the
`spring.main.sources` property should not be affected by this change. If
an XML resource is being used, some refactoring may be required (see the
changes to `SampleSpringXmlApplication` in this commit).

Fixes gh-9170
 2017-05-15 20:35:29 -07:00
Andy Wilkinson
329a950bd8 Remove testing support from the CLI 
The testing support in the CLI has proven to be more trouble than
it's worth. Our recommendation is that, once an app gets to the stage
of requiring a test suite, it should be converted to a Maven or
Gradle project. This makes it easy to version, publish, deploy etc
using the vast ecosystems of the two build systems.

As part of this change, the dependency management for Spock has been
moved into spring-boot-parent, thereby making it "private". This
allows it to continue to manage the test-only Spock dependency in
spring-boot-test without also managing the version of Spring that is
used by a user's application.

Closes gh-9087
Fixes gh-9043
 2017-05-04 09:35:29 +01:00
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
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
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
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
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
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
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
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
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
Phillip Webb
1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -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
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
Dave Syer
f62abade90 Make DependencyResolutionContext empty by default 
It's more useful as a building block for other tools that way,
and it's easy to add the spring boot dependencies using public
methods.
 2016-10-28 10:32:20 +01:00
Phillip Webb
01900c8342 Merge branch '1.5.x' 2016-10-11 23:42:14 -07:00