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

156 Commits

Author SHA1 Message Date
Phillip Webb
744cdf43e9 Revert "Use random port for DevTools tests" 
This reverts commit 4630c2292f232e541c3c8118100cba05e14c5129.
 2018-10-29 22:33:00 -07:00
Phillip Webb
2d305341a4 Merge branch '2.0.x' 2018-10-29 17:43:43 -07:00
Phillip Webb
4630c2292f Use random port for DevTools tests 
Change the `RemoteApplicationLauncher` to use a random port and also
protect against an NPE if the launch fails.
 2018-10-29 17:42:47 -07:00
Phillip Webb
f3fa20b2d1 Polish 2018-10-29 14:25:45 -07:00
Phillip Webb
6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Andy Wilkinson
4a222cb4e5 Polish "Log a warning when using fallback for pid and log locations" 
Closes gh-14519
 2018-10-04 15:21:05 +01:00
Stephane Nicoll
0eae32371f Polish contribution 
Closes gh-14667
 2018-10-03 13:59:32 +02:00
Johnny Lim
335775892b Polish 
See gh-14667
 2018-10-03 13:57:18 +02:00
Andy Wilkinson
65295e0e14 Merge branch '2.0.x' 2018-09-19 19:52:19 +01:00
Andy Wilkinson
bff93a67ce Fix remote DevTools restart when a previously added class is then changed 
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.

This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.

Closes gh-14205
 2018-09-19 18:02:01 +01:00
durigon
7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll 
Closes gh-14483
 2018-09-17 10:54:54 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Andy Wilkinson
76ea2d9dd4 Ensure that the server tests app can resolve milestone poms 2018-05-16 20:23:04 +01:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Andy Wilkinson
49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Johnny Lim
b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00
Phillip Webb
69cbf1318c Second attempt to fix server test CI failures 
Switch process redirection off and instead consume streams
and copy to System.out/System.err.

See gh-12689
 2018-03-29 19:54:41 -07:00
Phillip Webb
7498e7f2cd Revert "Attempt to fix server test CI failures" 
This reverts commit 32782429afde8744552061496c161427b27eabf7.
 2018-03-29 19:23:11 -07:00
Phillip Webb
32782429af Attempt to fix server test CI failures 
Switch surefire configuration so that forking isn't used. This seems to
prevent the "Corrupted STDOUT by directly writing to native stream"
errors and will hopefully reduce failures on the CI server.

See gh-12689
 2018-03-29 18:05:34 -07:00
Phillip Webb
a4b0be089d Polish 2018-03-14 14:05:26 -07:00
Andy Wilkinson
a809e8f316 Polish usage of settings.xml to configure repository 
See gh-12293
 2018-03-01 15:02:01 +00:00
Andy Wilkinson
d0b8a84821 Use settings.xml to pass repository into server integration tests 
Closes gh-12293
 2018-03-01 12:11:54 +00:00
Andy Wilkinson
35b7a16917 Merge branch '1.5.x' 2018-02-28 11:24:08 +00:00
Stephane Nicoll
306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
Phillip Webb
4b9c3c137e Polish Collection.toArray 
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
 2018-02-22 21:11:30 -08:00
Andy Wilkinson
e1ab62668f Merge branch '1.5.x' 2018-02-13 15:05:28 +00:00
Andy Wilkinson
76a450dfba Format with Eclipse Oxygen SR2 2018-02-08 10:53:53 +00:00
Phillip Webb
c3ec316890 Move Application* and *FileWriter classes 
Move `ApplicationHome`, `ApplicationPid` and `ApplicationTemp` to the
`system` package. Since `system` package is now much lower level, the
existing `FileWriter` implementations also needed to move to prevent
package tangles.

Fixes gh-8614
 2018-02-01 16:44:42 -08:00
Phillip Webb
3ff772957b Add WebServerApplicationContext abstraction 
Add a new `WebServerApplicationContext` interface that provides a common
abstraction for all application contexts that create and manage the
lifecycle of an embedded `WebServer`.

Allows server namespaces to become a first-class concept (rather
subverting `ConfigurableWebApplicationContext.getNamespace()`) and
allow us to drop `getServerId()` from `WebServerInitializedEvent`.

Also helps to improve `ManagementContextAutoConfiguration` and
`ManagementContextFactory`.

Fixes gh-11881
 2018-02-01 16:38:15 -08:00
Andy Wilkinson
9542f5182c Move scripts for new launch script tests to correct location 
See gh-11397
 2018-02-01 09:26:16 +00:00
Phillip Webb
886b39293c Merge branch '1.5.x' 2018-01-30 12:51:45 -08:00
Phillip Webb
b234501af3 Polish 2018-01-26 11:39:41 -08:00
Phillip Webb
6d93573db0 Merge branch '1.5.x' 2018-01-18 22:03:51 -08:00
Stephane Nicoll
a5fd3fbfbd Merge branch '1.5.x' 2018-01-17 15:53:28 +01:00
Stephane Nicoll
f8af6c8134 Merge branch '1.5.x' 2018-01-17 13:42:56 +01:00
Phillip Webb
49c685b7c0 Merge branch '1.5.x' 2018-01-10 12:01:29 -08:00
Johnny Lim
483d123d9b Fix imports order for Checkstyle 
Closes gh-11587
 2018-01-10 09:46:06 +01:00
Madhura Bhave
32557e4987 Fix imports 2018-01-09 15:47:09 -08:00
Phillip Webb
b3ec2c9d1d Polish 2018-01-09 12:12:59 -08:00
Andy Wilkinson
d439b73758 Use docker-java 3.0.x for launch script integration tests 2018-01-09 16:37:07 +00:00
Johnny Lim
0f0c6e0729 Polish 
Closes gh-11536
 2018-01-09 09:28:56 +01:00
Madhura Bhave
8102dc78cb Remove redundant throws declarations 2017-12-29 12:10:13 -08:00
Madhura Bhave
100c2ce86f Remove spring-boot-security-tests module 
Closes gh-11321
 2017-12-12 09:42:03 -08:00
Stephane Nicoll
d5c32333d5 Merge branch '1.5.x' 2017-11-29 11:19:24 +01:00
Andy Wilkinson
e216560896 Merge branch '1.5.x' 2017-11-20 14:17:57 +00:00
Johnny Lim
bd0dcfb172 Utilize StandardCharsets 
Closes gh-10972
 2017-11-10 09:49:13 +01:00
Andy Wilkinson
66b55defa0 Adapt to password encoder changes in Spring Security 
Closes gh-10762
 2017-10-24 21:50:19 +01:00
Phillip Webb
748e0779b6 Update copyright year for changed files 2017-10-10 11:56:13 -07:00