fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,898 Commits 22 Branches 339 Tags
Commit Graph

594 Commits

Author SHA1 Message Date
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
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
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
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
387a406aad Merge branch '1.4.x' into 1.5.x 2016-11-16 09:13:17 +00:00
Andy Wilkinson
b3e0a37197 Remove unwanted System.out calls in test code 2016-11-16 09:12:13 +00:00
Spring Buildmaster
e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Andy Wilkinson
d7ef48a9b6 Merge branch '1.4.x' into 1.5.x 2016-11-08 14:43:00 +00:00
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
 2016-11-08 14:36:58 +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
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
e97b703a20 Additionally make package method public 2016-10-28 10:39:55 +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
d818a09ed8 Polish 2016-10-11 23:38:14 -07: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
cd45ce9104 Merge branch '1.4.x' into 1.5.x 2016-09-29 13:12:11 +01:00
Andy Wilkinson
1bb5dc205d Update samples to use Artemis in place of HornetQ 
Closes gh-7057
 2016-09-29 11:52:09 +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
Stephane Nicoll
6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Spring Buildmaster
7e9ed5e1a7 Next Development Version 2016-09-21 07:58:07 +00:00
Andy Wilkinson
472117299e Add some integration tests for the CLI’s quiet mode 
See gh-6918
 2016-09-18 10:56:18 +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
Stephane Nicoll
81094e4b23 Merge branch '1.3.x' 2016-08-01 13:49:49 -07:00
Stephane Nicoll
f186008d1f Fix Groovy version in INSTALL.txt 
This commit uses maven filtering to set the Groovy version rather than an
hard-coded value that can be easily outdated.

Closes gh-6530
 2016-08-01 13:49:28 -07:00
Spring Buildmaster
334baaeffd Next development version 2016-07-28 19:54:01 +00:00
Spring Buildmaster
a89ef5df6e Next Development Version 2016-07-28 09:18:40 +00:00
Spring Buildmaster
2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Andy Wilkinson
c24c5aeb3b Upgrade to Maven Assembly Plugin 2.6 
Closes gh-6291
 2016-07-01 15:44:45 +01:00
Andy Wilkinson
92bb24e365 Avoid synchronizing on this and use an internal monitor instead 
Where possible, code that previously synchronized on this (or on the
class in the case of static methods) has been updated to use an
internal monitor object instead. This allows the locking model that's
employed to be an implementation detail rather than part of the
class's API.

Classes that override a synchronized method continue to declare
the overriding method as synchronized. This ensures that locking
is consistent across the superclass and its subclass.

Closes gh-6262
 2016-07-01 10:44:23 +01:00
Phillip Webb
99c6194e17 Don't use MockitoJUnitRunner 
Replace `@RunWith(MockitoJUnitRunner.class)` with direct Mockito
initialization since the running doesn't support parallel test
execution.
 2016-06-09 20:55:59 -07:00
Vedran Pavic
a1ac934bee Ignore special variable related JVM output in CommandLineInvoker 
Closes gh-5883
 2016-05-13 16:31:49 +01:00
Spring Buildmaster
819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Andy Wilkinson
38ad420810 Merge branch '1.3.x' 2016-05-06 16:02:03 +01:00
Andy Wilkinson
d77d3ff236 Use a SHA256 checksum in the Homebrew formula 
Closes gh-5885
 2016-05-06 15:58:57 +01:00
Spring Buildmaster
376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Phillip Webb
609cb52cd4 Move to relocated web classes 
Refactor code to move from recently deprecated classes.

Closes gh-5822
 2016-04-28 12:45:15 -07:00
Stephane Nicoll
93c495f69a Remove pid file 
This shouldn't have been committed.
 2016-04-27 05:00:49 +02:00
Phillip Webb
2679a6f0c6 Polish 2016-04-26 15:02:39 -07:00