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
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
acda8e647b
Update CLI's tests following introduction of spring-jcl module
...
The new spring-jcl module is now a dependency of spring-core. This
commit updates the CLI's dependency resolution-related tests to
account for the new dependency.
2017-05-04 09:29:22 +01:00
0fbe903308
Merge branch '1.5.x'
2017-05-03 19:37:06 +01:00
832b3d1f2f
Merge branch '1.4.x' into 1.5.x
2017-05-03 19:36:56 +01:00
08143edf19
Close streams when unpacking the CLI
...
See gh-9080
2017-05-03 19:36:28 +01:00
9ea461229c
Merge branch '1.5.x'
2017-05-03 18:45:41 +01:00
ce74047896
Merge branch '1.4.x' into 1.5.x
2017-05-03 18:45:32 +01:00
2f26088800
Unpack CLI for its integration tests as dir is no longer assembled
...
Closes gh-9080
2017-05-03 18:44:25 +01:00
bdd8cb3468
Merge branch '1.5.x'
2017-05-03 16:49:21 +01:00
51970f81d2
Merge branch '1.4.x' into 1.5.x
2017-05-03 16:48:59 +01:00
dc8a34f324
Fix warnings caused by CLI's assembly configuration
...
Closes gh-9080
2017-05-03 16:47:38 +01:00
06558675bb
Polish
2017-04-25 09:45:14 -07:00
81fef71fcb
Merge branch '1.5.x'
2017-04-19 22:48:46 -07:00
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
f0c5372642
Align with Spring Framework 5's new Commons Logging adapter
...
Closes gh-8825
2017-04-06 13:22:53 +01:00
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
d8f827d224
Cleanup and format code
2017-03-06 17:08:09 -08:00
425dbc3e52
Update copyright header for edited files
2017-03-06 15:04:07 -08:00
a4bcd20b64
Merge branch '1.5.x'
2017-02-27 20:43:18 -08:00
ca1540cefe
Update header copyright for changed files
2017-02-27 20:41:18 -08:00
cfdc75d384
Merge branch '1.5.x'
2017-02-06 10:38:16 +01:00
0adab8a2be
Use logical 'and' instead of bitwise 'and'
...
Closes gh-8198
2017-02-06 10:35:13 +01:00
3d52c86a21
Annotate interfaces with @FunctionaInterface
...
Closes gh-6857
2017-01-27 16:41:01 +00:00
17451c5e7a
Merge branch '1.5.x'
2017-01-25 22:24:07 -08:00
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
f3db8c90c7
Merge branch '1.4.x' into 1.5.x
2017-01-25 22:09:50 -08:00
ae910f3169
Update CLI open_source_licenses.txt file
...
Closes gh-7703
2017-01-25 22:05:00 -08:00
661fd848eb
Merge branch '1.5.x'
2017-01-25 11:02:32 +01:00
505e7f75ea
Polish contribution
...
Closes gh-8089
2017-01-25 11:01:53 +01:00
d58f38f6f6
Use String.replace() with single char if possible
...
See gh-8089
2017-01-25 11:01:52 +01:00
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
0cc313f224
Polish
2017-01-05 11:30:33 -08:00
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
4bfecc1307
Merge branch '1.5.x'
2017-01-04 23:52:40 -08:00
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
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
4edab86ba2
Merge branch '1.5.x'
2016-11-16 09:13:32 +00:00
387a406aad
Merge branch '1.4.x' into 1.5.x
2016-11-16 09:13:17 +00:00
b3e0a37197
Remove unwanted System.out calls in test code
2016-11-16 09:12:13 +00:00
Phillip Webb
Andy Wilkinson
Stephane Nicoll
Johnny Lim
Eddú Meléndez
dreis