886b39293c
Merge branch '1.5.x'
2018-01-30 12:51:45 -08:00
9b8cb9a463
Protect against symlink attacks
...
Update embedded launch script to no longer change ownership of files
or folders that already exist.
Fixes gh-11397
2018-01-30 12:42:31 -08:00
61f7bd8576
Polish
2018-01-30 12:37:40 -08:00
84fa67d33e
Backport use docker-java 3.0.x for launch tests
...
Backport commit d439b73758
2018-01-10 11:56:09 -08:00
df2ae7aa19
Next Development Version
2017-11-28 09:55:46 +00:00
c0f9f64776
Next Development Version
2017-10-16 12:36:43 +00:00
89b0ba2c14
Relocate test projects under `spring-boot-tests`
...
Move integration and deployment tests under a single `spring-boot-tests`
module.
See gh-9316
2017-10-04 16:34:38 -07:00
3db5843c8b
Polish "Find .conf file next to symlink to jar that's using the launch script"
...
Closes gh-8988
2017-09-26 14:42:18 +01:00
56a5888008
Find .conf file next to symlink to jar that's using the launch script
...
See gh-8988
2017-09-26 13:12:40 +01:00
30eb937a83
Next Development Version
2017-09-12 10:54:22 +00:00
abf39915e8
Polish
2017-08-04 11:12:33 +01:00
17a5bb0be4
Next development version
2017-07-27 08:00:21 +00:00
41c5c0e7c9
Next development version
2017-07-26 08:30:55 +00:00
2626a3a795
Use lambdas when possible
...
Replace anonymous inner classes with lambda declarations (when possible
using method references).
See gh-9781
2017-07-25 00:53:38 -07:00
aa57ca7e18
Polish
2017-07-06 16:53:04 -07:00
05d4d0281c
Next Development Version
2017-06-08 12:47:16 +00:00
4a6b34e725
Merge branch '1.5.x'
2017-06-03 19:41:35 +01:00
d5184724b0
Downgrade Jersey to version that plays nicely with Docker's Java client
2017-06-03 19:40:21 +01:00
09a8b3c072
Merge branch '1.5.x'
2017-06-03 16:54:02 +01:00
ec8ae2f91e
Merge branch '1.4.x' into 1.5.x
2017-06-03 16:53:48 +01:00
e60a261952
Do not allow failure to remove container to mask earlier failure
2017-06-03 16:53:28 +01:00
49fc1b831c
Merge branch '1.5.x'
2017-06-03 13:13:04 +01:00
a215103bb5
Merge branch '1.4.x' into 1.5.x
2017-06-03 13:11:39 +01:00
31ff7f1846
Tolerate Successfully built being found in response other than last
...
Different versions of Docker produce different responses when building
and tagging an image. On CI, a response with a stream like
"Successfully built 185991ffe24a" followed by a response with a
stream like "Successfully tagged spring-boot-it/centos:6.9-a23bced6"
is received. By default, for the building of an image to be considered
successful, the Docker Java client requires the stream for the last
response item to contain "Successfully built". This means that, on the
CI server, it incorrectly believes that the building of the tagged
image has failed.
This commit uses a custom BuildImageResultCallback that doesn't
require the last response to be the one that has a stream containing
"Successfully built". Instead, it looks back through the error-free
responses (newest to oldest) looking for one with a stream containing
"Successfully built".
2017-06-03 13:00:15 +01:00
b8bd51fd48
Merge branch '1.5.x'
2017-06-03 09:55:47 +01:00
5722c149d0
Merge branch '1.4.x' into 1.5.x
2017-06-03 09:55:29 +01:00
0270ccafa5
Enable Docker command debug logging to improve diagnostics on CI server
2017-06-03 09:54:13 +01:00
99790f67e0
Merge branch '1.5.x'
2017-06-02 19:49:51 +01:00
3cf8e81a8b
Merge branch '1.4.x' into 1.5.x
2017-06-02 19:49:16 +01:00
a69a851ae9
Drop CentOS 5 from launch script tests and upgrade to 6.9
...
CentOS 5 was declared EOL in March 2017 and yum on longer works
out of the box. 6.9 is the latest release of CentOS 6. Tests for
CentOS 7 have not been added as it uses systemd rather than SysVinit.
Closes gh-9395
2017-06-02 19:45:45 +01:00
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
d719d2cbbc
Next Development Version
2017-04-20 12:46:19 +00:00
d8f827d224
Cleanup and format code
2017-03-06 17:08:09 -08:00
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
2a83e80a9b
Next Development Version
2017-03-03 14:39:21 +00:00
12d883f6b9
Introduce "server.servlet" configuration prefix
...
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.
Closes gh-8066
2017-02-07 16:48:22 +01:00
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00:00
ed1ce140c0
Next Development Version
2017-01-26 14:20:39 +00:00
4d73f3d2e9
Merge branch '1.5.x'
2016-12-29 22:22:04 -08:00
509be7474d
Add `force-stop` support to launch script
...
Update the embedded launch script to support `force-stop`.
Closes gh-6223
2016-12-29 22:20:05 -08:00
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
50c19250f2
Merge branch '1.5.x'
2016-11-22 15:05:48 +00:00
8bd2e69915
Update Docker images used by launch script integration tests
2016-11-22 15:05:15 +00:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
f48545bd57
Merge branch '1.5.x'
2016-10-14 09:20:12 +01:00
899b8a04cb
Merge branch '1.4.x' into 1.5.x
2016-10-14 09:20:02 +01:00
24f8c737fb
Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory
...
Closes gh-7092
Closes gh-7093
2016-10-14 09:19:11 +01:00
84c9c7bd92
Merge branch '1.5.x'
2016-10-13 16:55:33 +01:00
57b7357be7
Merge branch '1.4.x' into 1.5.x
2016-10-13 16:55:21 +01:00
Phillip Webb
Spring Buildmaster
Andy Wilkinson
Ali Shahbour
Emanuel Campolo
Brian Clozel
Gaurav Rawat
Vedran Pavic