Commit Graph

204 Commits

Author SHA1 Message Date
Andy Wilkinson
27ae302905 Merge branch '2.4.x' into 2.5.x 2021-07-23 17:40:20 +01:00
Andy Wilkinson
931409cdd4 Update copyright header in changed files 2021-07-23 17:39:55 +01:00
Andy Wilkinson
bd3aec4f80 Merge branch '2.4.x' into 2.5.x
Closes gh-27478
2021-07-23 17:30:27 +01:00
Andy Wilkinson
d9a24f32b4 Rework spring-boot-server-tests to avoid using Maven
Closes gh-27476
2021-07-23 17:30:07 +01:00
Andy Wilkinson
a7334deb54 Merge branch '2.4.x' into 2.5.x
Closes gh-27234
2021-07-10 12:05:40 +01:00
Andy Wilkinson
57d7ba0836 Switch s-b-server-tests from libs-snapshot to snapshot and milestone
Closes gh-27233
2021-07-10 12:04:55 +01:00
Phillip Webb
4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Stephane Nicoll
d3c817b7ba Polish "Remove unnecessary throws declaration in tests"
See gh-26441
2021-05-17 09:36:53 +02:00
Andy Wilkinson
d18af399f9 Merge branch '2.4.x'
Closes gh-26352
2021-05-04 10:22:25 +01:00
Andy Wilkinson
1417c1b0c4 Merge branch '2.3.x' into 2.4.x
Closes gh-26351
2021-05-04 10:22:12 +01:00
Andy Wilkinson
4c42810df9 Ensure that server tests pick up latest snapshots
Closes gh-25921
2021-05-04 09:51:15 +01:00
Andy Wilkinson
47516b50c3 Merge branch '2.4.x'
Closes gh-26246
2021-04-27 10:39:54 +01:00
Andy Wilkinson
b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
2021-04-27 10:39:36 +01:00
Andy Wilkinson
ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
2021-04-27 10:39:19 +01:00
Phillip Webb
beaf03a008 Update copyright year of changed files 2021-04-15 12:22:48 -07:00
Andy Wilkinson
67c81100de Merge branch '2.4.x'
Closes gh-25991
2021-04-09 19:07:02 +01:00
Andy Wilkinson
2b9ba96287 Merge branch '2.3.x' into 2.4.x
Closes gh-25990
2021-04-09 19:06:38 +01:00
Andy Wilkinson
0bc5c2ba8c Ensure that containers' static resource handling not MVC's is used
Closes gh-25949
2021-04-09 17:48:03 +01:00
dreis2211
a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
2021-03-26 19:38:54 +00:00
Stephane Nicoll
6aaf9f47be Merge branch '2.4.x'
Closes gh-25524
2021-03-06 08:16:35 +01:00
dreis2211
1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
2021-03-06 08:15:56 +01:00
Andy Wilkinson
3b235e4960 Merge branch '2.4.x'
See gh-25482
2021-03-03 17:56:42 +00:00
Andy Wilkinson
f85c7c9ef1 Merge branch '2.3.x' into 2.4.x
See gh-25481
2021-03-03 17:56:16 +00:00
Andy Wilkinson
da3920bd46 Wait for process to exit to avoid race with file deletion
See gh-25457
2021-03-03 17:55:37 +00:00
Andy Wilkinson
4a74521174 Merge branch '2.4.x'
See gh-25482
2021-03-03 16:43:53 +00:00
Andy Wilkinson
fefd49cce7 Merge branch '2.3.x' into 2.4.x
See gh-25481
2021-03-03 16:43:18 +00:00
Andy Wilkinson
c5cfb8750b Delete files after destroying processes that may be accessing them
Closes gh-25457
2021-03-03 16:42:49 +00:00
Andy Wilkinson
59d8c97634 Merge branch '2.4.x'
Closes gh-25482
2021-03-03 13:46:58 +00:00
Andy Wilkinson
e984f0ca31 Merge branch '2.3.x' into 2.4.x
Closes gh-25481
2021-03-03 13:46:39 +00:00
dreis2211
b0a6e92fb6 Speed up spring-boot-server-tests
See gh-25457
2021-03-03 13:34:41 +00:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
d8b6960997 Merge branch '2.4.x'
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb
257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Phillip Webb
82791b4eda Improve performance of Tomcat 'jar:war:file' URLs
Update jar `Handler` fallback logic to directly support Tomcat
'jar:war:file' URLs. This commit allows contents to be accessed without
the JDK needing to extracted the nested jar to the temporary folder.

Closes gh-24553
2020-12-17 22:51:19 -08:00
Phillip Webb
abd0b484bc Merge branch '2.3.x' into 2.4.x 2020-12-17 22:50:19 -08:00
Phillip Webb
b351288f48 Fix integration test app detection
See gh-18631
2020-12-17 22:32:56 -08:00
Phillip Webb
a2a153ade6 Fix name clash with integration test apps
Rename "app" projects in `spring-boot-launch-script-tests` and
`spring-boot-loader-tests` to something unique.

See gh-18631
2020-12-17 22:00:12 -08:00
Phillip Webb
0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
2020-12-17 20:47:13 -08:00
Phillip Webb
c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
2020-12-17 20:43:41 -08:00
Stephane Nicoll
60530b9b5b Merge branch '2.3.x'
Closes gh-24348
2020-12-07 11:56:35 +01:00
Stephane Nicoll
07e32bf52e Merge branch '2.2.x' into 2.3.x
Closes gh-24347
2020-12-07 11:55:40 +01:00
Stephane Nicoll
f64b7f8465 Use proper CentOS base image
See gh-24344
2020-12-07 11:46:33 +01:00
Stephane Nicoll
a5a8545801 Switch integration tests to CentOS 7
This commit upgrades the docker image for CentOS to Centos 7.9 as
CentOs 6 is EOL since November 30. Given that CentOS 7 does no longer
support SysVinit, this commit also updates the integration tests to not
test this OS anymore.

Closes gh-24344
2020-12-07 10:33:29 +01:00
Stephane Nicoll
2e4b338704 Merge branch '2.3.x'
Closes gh-23155
2020-09-01 11:32:00 +02:00
Stephane Nicoll
a341d00529 Review instructions for running launch script tests with Gradle
Closes gh-20606
2020-09-01 11:30:50 +02:00
Andy Wilkinson
07b6f83c7a Merge branch '2.3.x' 2020-08-04 18:24:28 +01:00