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

289 Commits

Author SHA1 Message Date
Phillip Webb
b442d3b906 Merge branch '1.5.x' into 2.0.x 2019-06-04 01:49:03 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Phillip Webb
1e44aba772 Fix compiler warnings and polish 
Fix various compiler warnings and apply a little polish.
 2019-04-24 19:37:42 -07:00
Andy Wilkinson
d182ee2246 Merge branch '2.1.x' 
Closes gh-16637
 2019-04-24 10:19:31 +01:00
Andy Wilkinson
ed85735822 Merge branch '2.0.x' into 2.1.x 
Closes gh-16636
 2019-04-24 10:10:01 +01:00
Andy Wilkinson
3e3d7545cc Merge branch '1.5.x' into 2.0.x 2019-04-24 10:01:50 +01:00
Andy Wilkinson
27990180ab Merge branch '2.1.x' 
Closes gh-16626
 2019-04-23 14:30:21 +01:00
Andy Wilkinson
73704c84e1 Use latest Docker Java and a compatible version of Jersey 
Closes gh-16625
 2019-04-23 14:29:32 +01:00
Phillip Webb
5f1bbf8c72 Update copyright header of changed files 2019-04-15 17:51:08 -07:00
Madhura Bhave
3c203e9b0d Update devtools to use @Lazy(false) 
Fixes gh-16184
 2019-04-05 18:02:27 -07:00
Andy Wilkinson
4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c Use HTTPS for external links in XML files 
See gh-16270
 2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Spring Operator
b32c0080c3 Update build and setup configuration to use HTTPS 
See gh-16247
 2019-03-19 17:06:45 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS 
See gh-16246
 2019-03-19 16:58:31 +00:00
Andy Wilkinson
28cf63354a Merge pull request #16106 from Spring Operator 
* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
 2019-03-12 10:05:06 +00:00
Spring Operator
c9c554b834 Update build and setup configuration to use HTTPS 
See gh-16106
 2019-03-12 10:02:44 +00:00
Stephane Nicoll
8ff0a9c5a9 Merge branch '2.1.x' 2019-03-12 10:51:08 +01:00
Johnny Lim
bcfbabe6cd Polish 
Closes gh-16193
 2019-03-12 10:50:32 +01:00
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible 
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
 2019-03-06 11:20:51 +00:00
Andy Wilkinson
61d04db0d7 Minimize and centralize assumptions about build output 
Closes gh-15471
 2018-12-14 17:50:20 +00:00
Andy Wilkinson
bbf0932f0f Exclude jcl-over-slf4j in favour of spring-jcl 
Closes gh-15392
 2018-12-07 15:37:24 +00:00
Phillip Webb
ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00
Phillip Webb
893d5666be Update copyright year for changed files 2018-11-29 15:30:51 -08:00
Madhura Bhave
1bb788f5c2 Merge branch '2.0.x' 2018-11-15 14:17:05 -08:00
Phillip Webb
657a5347be Use random port for Devtools integration tests 
Closes gh-15013
 2018-11-15 14:02:21 -08:00
Andy Wilkinson
bfb0886495 Tolerate Hibernate 5.2 
Closes gh-15100
 2018-11-08 12:24:22 +00:00
Phillip Webb
80685f81bf Merge branch '2.0.x' 2018-10-29 22:33:21 -07:00
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