Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Phillip Webb
866e2b712e
Merge branch '2.0.x' into 2.1.x
2019-06-07 12:35:28 -07:00
Phillip Webb
2c8881a908
Merge branch '1.5.x' into 2.0.x
2019-06-07 12:34:13 -07:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Phillip Webb
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
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
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
73704c84e1
Use latest Docker Java and a compatible version of Jersey
...
Closes gh-16625
2019-04-23 14:29:32 +01: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
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
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
Johnny Lim
bcfbabe6cd
Polish
...
Closes gh-16193
2019-03-12 10:50:32 +01: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 4630c2292f
.
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 32782429af
.
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