Eddú Meléndez
3d52c86a21
Annotate interfaces with @FunctionaInterface
...
Closes gh-6857
8 years ago
Phillip Webb
17451c5e7a
Merge branch '1.5.x'
8 years ago
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
8 years ago
Phillip Webb
f3db8c90c7
Merge branch '1.4.x' into 1.5.x
8 years ago
Phillip Webb
ae910f3169
Update CLI open_source_licenses.txt file
...
Closes gh-7703
8 years ago
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
8 years ago
Stephane Nicoll
661fd848eb
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
505e7f75ea
Polish contribution
...
Closes gh-8089
8 years ago
dreis
d58f38f6f6
Use String.replace() with single char if possible
...
See gh-8089
8 years ago
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
8 years ago
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
8 years ago
Phillip Webb
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
8 years ago
Phillip Webb
0cc313f224
Polish
8 years ago
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
8 years ago
Phillip Webb
4bfecc1307
Merge branch '1.5.x'
8 years ago
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
8 years ago
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
8 years ago
Phillip Webb
aacf5d660f
Update copyright year for changed files
8 years ago
Spring Buildmaster
9057f9ae1f
Next development version
8 years ago
Phillip Webb
1f417997f3
Merge branch '1.5.x'
8 years ago
Phillip Webb
6121208cbb
Polish formatting
8 years ago
Phillip Webb
4b9cba351b
Merge branch '1.4.x' into 1.5.x
8 years ago
Phillip Webb
bd74c3d327
Polish formatting
8 years ago
Andy Wilkinson
4edab86ba2
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
387a406aad
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
b3e0a37197
Remove unwanted System.out calls in test code
8 years ago
Spring Buildmaster
e712a9ba8c
Next Development Version
8 years ago
Andy Wilkinson
9a70a4e261
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
d7ef48a9b6
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
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.
8 years ago
Andy Wilkinson
4486d2d209
Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
...
Closes gh-7301
See gh-7029
8 years ago
Andy Wilkinson
4e30da35ad
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
aeaaaaf903
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
ae4b8dc420
Ensure that CLI-based tests automatically import new TestRestTemplate
...
See gh-6973
8 years ago
Andy Wilkinson
fc0d4e45a5
Update CLI test auto-configuration to 1.4's new test infrastructure
...
Closes gh-6973
8 years ago
Andy Wilkinson
1186eb3250
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
9b6c9eeedd
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
7e8c5f5940
Silence CLI dependency resolution progress reporting when run with -q
...
Closes gh-7247
8 years ago
Dave Syer
a02fd93d18
Merge branch '1.5.x'
8 years ago
Dave Syer
e97b703a20
Additionally make package method public
8 years ago
Dave Syer
13a02a6e55
Merge branch '1.5.x'
8 years ago
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.
8 years ago
Phillip Webb
01900c8342
Merge branch '1.5.x'
8 years ago
Phillip Webb
d818a09ed8
Polish
8 years ago
Stephane Nicoll
264d8442da
Fix build
8 years ago
Stephane Nicoll
c5cc626d48
Remove remote shell support
...
See gh-7044
8 years ago