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
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
Phillip Webb
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
Stephane Nicoll
4119da1d9e
Merge branch '1.5.x'
2016-10-05 13:48:51 +02:00
Stephane Nicoll
2d75cc79c0
Polish contribution
...
Closes gh-6367
2016-10-05 13:47:50 +02:00
Henri Kerola
d07f689446
"spring war" should copy resources to WEB-INF/classes
...
Closes gh-6351
2016-10-05 13:36:25 +02:00
Andy Wilkinson
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
2016-09-29 20:33:21 +01:00
Andy Wilkinson
6fb44b2410
Fix TestCommandIntegrationTests after removal of deprecated test support
...
See gh-6971
See gh-6973
2016-09-21 15:15:35 +01:00
Phillip Webb
7299976d12
Fix banner property used in "quiet" mode
...
Fixes gh-6918
2016-09-17 19:23:42 -07:00
Dave Syer
b5294a48b2
Use context class loader instead of one-off for command location
...
This works, and feels like the right thing to do, since there is no
guarantee that extensions won't in turn use ServiceLoader for things
that we haven't yet anticipated.
Fixes gh-6829. Cc @wilkinsona in case he has an opinion.
2016-09-07 10:00:34 +01:00
Johnny Lim
4b9f6869f0
Polish
...
Closes gh-6817
2016-09-05 09:08:08 +02:00
Andy Wilkinson
270530c4fd
Fix class loading problems when CLI extensions are installed
...
Previously, CLI extensions where installed into the CLI's lib
directory which meant that they were on the class path of the app
class loader. Following the change to an executable jar's packaging,
this meant that they could not see classes in the CLI and a
ClassNotFoundException would result.
This commit updates the CLI to install extensions into lib/ext and
load commands using a new ClassLoader that has all of the jars in
lib/ext on its class path and that uses the launch class loader as
its parent.
Closes gh-6615
2016-08-11 16:01:18 +01:00
nagarajasr
0996615ac3
Apply sytem properties on HttpClient
...
Closes gh-6600
2016-08-10 09:24:02 +02:00
