Commit Graph

106 Commits

Author SHA1 Message Date
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Krzysztof Krason
6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Stephane Nicoll
4f6c3ab2b0 Upgrade to JUnit Jupiter 5.9.0
Closes gh-32351
2022-09-14 15:18:40 +02:00
dreis2211
eea4611553 Fix references to JDK 1.8 in READMEs
See gh-30447
2022-03-28 09:38:24 +02:00
dreis2211
be981e45d1 Remove checks for Java 9 compatibility in build.gradle files
See gh-30335
2022-03-21 10:48:50 +01:00
Phillip Webb
13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb
e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb
1b7db2750d Merge branch '2.7.x'
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb
72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
2022-01-12 14:03:27 -08:00
dreis2211
d8deee7cf6 Update to JDK 17 in launch script tests
See gh-29201
2022-01-04 16:24:12 +01:00
Andy Wilkinson
fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
0b58d4858d Merge branch '2.5.x'
Closes gh-28200
2021-10-05 11:13:20 +01:00
Andy Wilkinson
322615d9c5 Merge branch '2.4.x' into 2.5.x
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson
8c3820f87e Fix up-to-date checking of syncAppSource tasks
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.

This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.

Closes gh-28197
2021-10-05 11:08:22 +01:00
Andy Wilkinson
29637706a9 Merge branch '2.5.x'
Closes gh-28166
2021-10-01 14:16:33 +01:00
Andy Wilkinson
14a57adb53 Merge branch '2.4.x' into 2.5.x
Closes gh-28165
2021-10-01 14:16:20 +01:00
Andy Wilkinson
35b16ea04e Minimize dependencies of launch script test app
Closes gh-28164
2021-10-01 14:15:52 +01:00
Scott Frederick
9f001efa29 Adjust fat jar central directory to account for launch script
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.

Fixes gh-22336
2021-07-19 15:02:42 -05: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
dreis2211
a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
2021-03-26 19:38:54 +00:00
dreis2211
1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
2021-03-06 08:15:56 +01: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
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
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
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
Andy Wilkinson
1233288df0 Disable JarLaunchScriptIntegrationTests without Docker
See gh-21388
2020-08-04 18:23:06 +01:00
Andy Wilkinson
3210bc59ca Merge branch '2.3.x'
Closes gh-22722
2020-08-04 13:33:19 +01:00
Andy Wilkinson
323b097623 Merge branch '2.2.x' into 2.3.x
Closes gh-22721
2020-08-04 13:32:49 +01:00
Andy Wilkinson
84ff233590 Polish "Test the launch script when executed directly"
See gh-21388
2020-08-04 11:29:53 +01:00
Alexey Vinogradov
02a6a84499 Test the launch script when executed directly
See gh-21388
2020-08-04 10:18:35 +01:00
Brian Clozel
89688d61ac Revert back to /snapshot repository for SNAPTHOTs
See gh-22640
2020-07-29 18:36:11 +02:00
Brian Clozel
f185e07573 Add missing libs-snapshot repository declaration
See gh-22640
2020-07-29 16:26:24 +02:00
Andy Wilkinson
2e1366f61f Make spring-boot-dependencies available when building test app 2020-07-24 18:30:52 +01:00
Andy Wilkinson
8436fa9159 Make spring-boot -dependencies and -parent available
See gh-22066
2020-06-29 14:46:10 +01:00
Phillip Webb
2198614359 Fix incorrect spring replace due to " change 2020-01-22 17:11:31 -08:00