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
Andy Wilkinson
b67c427259
Upgrade to Servlet 6.0 and related EE 10 specs
...
Co-authored-by: Phillip Webb <pwebb@vmware.com>
Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2022-11-07 17:33:38 +00:00
Phillip Webb
d7941c6315
Polish
2022-11-05 18:44:57 -07:00
Phillip Webb
4be3218cb6
Merge branch '2.7.x'
2022-10-25 15:48:26 -07:00
Scott Frederick
c22e76632c
Add Build-Jdk-Spec to jar and war manifest when building with Gradle
...
This commit adds a `Build-Jdk-Spec` attribute to the manifest in a
jar or war file built with the Spring Boot Gradle plugin. This
aligns the Gradle plugin's behavior with the default Maven plugin
behavior.
This removes the need to set a `BP_JVM_VERSION` environment variable
when invoking Cloud Native Buildpacks, as the Paketo buildpacks will
honor `Build-Jdk-Spec` in a jar or war manifest to determine the
default JVM version.
Fixes gh-32829
2022-10-25 15:48:05 -05:00
Phillip Webb
e0b67889a8
Use Stream.toList instead of Stream.collect when possible
...
Update code to make use of `Stream.toList()` whenever possible.
Closes gh-28177
2022-10-04 00:29:22 -07:00
Brian Clozel
a0735eb3fb
Migrate remaining usage of httpclient API
...
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.
Closes gh-32461
2022-09-29 18:55:42 +02:00
Brian Clozel
5fb2a50ad0
Adapt build dependencies to httpclient5
...
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.
See gh-32461
2022-09-29 18:55:41 +02:00
Stephane Nicoll
72fc1f0018
Merge branch '2.7.x'
...
Closes gh-32512
2022-09-27 08:30:44 +02:00
Stephane Nicoll
9a004a6508
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32511
2022-09-27 08:30:37 +02:00
Johnny Lim
975affc497
Enable LoaderIntegrationTests with Java 19
...
See gh-32501
2022-09-27 08:30:13 +02:00
Scott Frederick
f9c341c75a
Revert "Generate the AutoConfiguration.imports file from annotations"
...
This reverts commit da4de7d67d
.
2022-09-21 14:50:15 -05:00
Stephane Nicoll
4f6c3ab2b0
Upgrade to JUnit Jupiter 5.9.0
...
Closes gh-32351
2022-09-14 15:18:40 +02:00
Andy Wilkinson
a896fd0a36
Merge branch '2.7.x'
2022-09-10 09:38:18 +01:00
Andy Wilkinson
dffce2553c
Merge branch '2.6.x' into 2.7.x
2022-09-10 09:38:09 +01:00
Andy Wilkinson
9fe9f31af1
Polish
2022-09-10 09:38:03 +01:00
Andy Wilkinson
144abee80a
Merge branch '2.7.x'
2022-09-10 09:35:08 +01:00
Andy Wilkinson
b512083b3a
Merge branch '2.6.x' into 2.7.x
2022-09-10 09:34:57 +01:00
Andy Wilkinson
a262520f08
Disable LoaderIntegrationTests on Java 19 till it GAs
...
See gh-32280
2022-09-10 09:34:51 +01:00
Stephane Nicoll
aa6e52f029
Merge branch '2.7.x'
2022-09-10 10:32:20 +02:00
Stephane Nicoll
71fa410929
Merge branch '2.6.x' into 2.7.x
2022-09-10 10:32:12 +02:00
Stephane Nicoll
c3416ac97a
Disable LoaderIntegrationTests with Java 19
...
See gh-32295
2022-09-10 10:31:48 +02:00
Scott Frederick
da4de7d67d
Generate the AutoConfiguration.imports file from annotations
...
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.
Closes gh-31228
2022-09-02 15:10:22 -05:00
Phillip Webb
4ec2e357d9
Merge branch '2.7.x'
...
See gh-32086
2022-08-17 12:49:52 -07:00
Phillip Webb
60e1cc510c
Merge branch '2.6.x' into 2.7.x
...
See gh-32085
2022-08-17 12:48:21 -07:00
Phillip Webb
bd74344025
Revert "Don't close jar files early"
...
This reverts commit b42f056ddb
.
2022-08-17 11:38:42 -07:00
Andy Wilkinson
3cf6dc25a8
Merge branch '2.7.x'
...
See gh-31403
2022-06-16 17:34:23 +01:00
Andy Wilkinson
f285d9e7cf
Merge branch '2.6.x' into 2.7.x
...
See gh-31402
2022-06-16 17:33:53 +01:00
Andy Wilkinson
252cf94332
Fix requiresUnpack following Bouncy Castle upgrade
...
See gh-31400
2022-06-16 17:32:40 +01:00
Andy Wilkinson
d370d19e7a
Merge branch '2.7.x'
...
Closes gh-31403
2022-06-16 12:14:52 +01:00
Andy Wilkinson
5e1cd28d3f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31402
2022-06-16 12:14:28 +01:00
Lars Grefer
e8a1a0399a
Upgrade to Bouncycastle 1.71
...
Closes gh-31400
2022-06-16 12:14:06 +01:00
Phillip Webb
d84557f1f9
Merge branch '2.7.x'
...
Closes gh-31396
2022-06-15 10:53:17 -07:00
Phillip Webb
bcbcc53a09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31395
2022-06-15 10:51:40 -07:00
Phillip Webb
b42f056ddb
Don't close jar files early
...
Update `JarFile` and related classes so that `close()` is not longer
called early.
Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.
The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.
Fixes gh-29356
2022-06-15 10:51:01 -07:00
Phillip Webb
c7374fd415
Update copyright year of changed files
2022-04-20 15:30:20 -07:00
dreis2211
eea4611553
Fix references to JDK 1.8 in READMEs
...
See gh-30447
2022-03-28 09:38:24 +02:00
Andy Wilkinson
a59f60c614
Merge branch '2.7.x'
2022-03-25 11:15:08 +00:00
Andy Wilkinson
aad59efef2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30430
2022-03-25 11:14:57 +00:00
Andy Wilkinson
344aa405ae
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30429
2022-03-25 11:14:46 +00:00
Andy Wilkinson
e36ac6c155
Polish "Enable Java 18 for LoaderIntegrationTests"
...
See gh-30422
2022-03-25 11:02:57 +00:00
Eddú Meléndez
e9c433a0b7
Enable Java 18 for LoaderIntegrationTests
...
See gh-30422
2022-03-25 11:02:42 +00:00
dreis2211
be981e45d1
Remove checks for Java 9 compatibility in build.gradle files
...
See gh-30335
2022-03-21 10:48:50 +01:00
Andy Wilkinson
00193517f0
Merge branch '2.7.x'
2022-03-09 15:38:00 +00:00
Andy Wilkinson
f488db9e49
Merge branch '2.6.x' into 2.7.x
2022-03-09 15:37:47 +00:00
Andy Wilkinson
0d4d225ebb
Merge branch '2.5.x' into 2.6.x
2022-03-09 15:37:40 +00:00
Andy Wilkinson
a58cd050e5
Disable LoaderIntegrationTests when all runtimes are incompatible
...
See gh-29524
2022-03-09 15:36:53 +00:00
Andy Wilkinson
f5ca568014
Remove versions less than 17 from JavaVersion enum
...
Closes gh-29503
2022-03-09 15:16:59 +00:00
Andy Wilkinson
0833e9eab8
Relax alias checking for CI on Windows
2022-03-03 15:46:33 +00:00
Moritz Halbritter
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
Moritz Halbritter
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
Moritz Halbritter
42808ff13c
Merge branch '2.7.x'
...
# Conflicts:
# spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
Moritz Halbritter
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
2022-02-17 09:17:23 +01:00
Moritz Halbritter
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
Andy Wilkinson
1fa541d4de
Merge branch '2.7.x'
2022-01-19 17:24:42 +00:00
Andy Wilkinson
4c422b9f3c
Merge branch '2.5.x' into 2.6.x
2022-01-19 17:24:17 +00:00
Andy Wilkinson
b60612dabb
Disable LoaderIntegrationTests when Docker's unavailable
...
Closes gh-29385
2022-01-19 17:23:30 +00:00
Phillip Webb
13f6729b37
Merge branch '2.7.x'
2022-01-18 18:49:08 -08:00
Phillip Webb
f6cdc27b2a
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:48:40 -08:00
Phillip Webb
eca05c42fb
Further refine LoaderIntegrationTests for CI
...
Update `LoaderIntegrationTests` to filter compatible JDKs early.
See gh-29385
2022-01-18 18:47:41 -08:00
Phillip Webb
e18cbe5fe2
Merge branch '2.7.x'
2022-01-18 18:19:46 -08:00
Phillip Webb
392de30390
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:18:56 -08:00
Phillip Webb
de8f8c3e64
Refine LoaderIntegrationTests for CI
...
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.
See gh-29385
2022-01-18 18:16:47 -08:00
Phillip Webb
2d1854a682
Merge branch '2.7.x'
2022-01-18 17:42:34 -08:00
Phillip Webb
44537d4494
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29462
2022-01-18 17:36:59 -08:00
Phillip Webb
3d908079ef
Run LoaderIntegrationTests against multiple JDKs
...
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.
Closes gh-29385
2022-01-18 17:36:48 -08: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
Phillip Webb
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08: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
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
c80283b85f
Merge branch '2.5.x'
...
Closes gh-28653
2021-11-12 13:05:42 +00:00
Andy Wilkinson
92fd3b79a5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28652
2021-11-12 13:05:14 +00:00
Andy Wilkinson
08aac25c00
Limit logging produced by spring-boot-loader-tests's intTest task
...
Closes gh-28651
2021-11-12 13:04:10 +00:00
Andy Wilkinson
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
2021-10-29 12:48:45 +01:00
Stephane Nicoll
4ebac4cc66
Merge branch '2.5.x'
...
Closes gh-28279
2021-10-11 09:09:15 +02:00
Stephane Nicoll
0103eb123b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28278
2021-10-11 09:09:08 +02:00
dreis2211
ae1167e026
Remove unused settings.xml in integration tests
...
See gh-28269
2021-10-11 09:08:29 +02: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
Phillip Webb
4c2c4ec16c
Merge branch '2.5.x'
2021-09-21 11:25:36 -07:00
Phillip Webb
5ba69634c9
Merge branch '2.4.x' into 2.5.x
2021-09-21 11:17:55 -07:00
Phillip Webb
dfd36673f7
Update copyright year of changed files
2021-09-21 11:17:19 -07:00
dreis2211
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
2021-08-18 13:48:29 +01:00
Andy Wilkinson
14db8aec95
Skip server tests on Java 16 as Gradle Plugin is not available
...
See gh-27476
2021-07-23 19:44:29 +01:00
Andy Wilkinson
f830ce5e17
Merge branch '2.5.x'
2021-07-23 17:40:29 +01:00
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
fc9f38351a
Merge branch '2.5.x'
...
Closes gh-27479
2021-07-23 17:34: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
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
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
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
ff3b05a421
Add json starter to integration test repo
2020-04-30 20:55:35 -07:00
Phillip Webb
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
2020-04-28 19:20:24 -07:00
Phillip Webb
bf41da5322
Update copyright year of changed files
2020-04-21 18:12:27 -07:00
Madhura Bhave
1342e4970a
Provide a condition for detecting war deployments
...
Closes gh-19421
2020-04-09 18:52:06 -07:00
Phillip Webb
2198614359
Fix incorrect spring replace due to `"` change
2020-01-22 17:11:31 -08:00
Phillip Webb
e0013454b5
Use parentheses when declaring dependencies
...
Update all dependencies declarations to use the form `scope(reference)`
rather than `scope reference`.
Prior to this commit we declared dependencies without parentheses unless
we were forced to add them due to an `exclude`.
2020-01-22 16:02:38 -08:00
Phillip Webb
0209cd3e4c
Polish quote form used in Gradle scripts
...
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
2020-01-22 15:49:52 -08:00
Phillip Webb
b4229239ab
Protect against NPE in server tests
...
Update `AbstractApplicationLauncher` to not attempt to shutdown
the process if startup fails.
2020-01-22 12:54:35 -08:00
Phillip Webb
bfd2ca7fd9
Polish Gradle expression references
...
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Phillip Webb
fd792cedaf
Polish DisabledIfDockerUnavailable
...
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Phillip Webb
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Andy Wilkinson
b5ae8b0af5
Disable tests that use Docker when Docker is unavailable
...
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
6d8f07d899
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19570
2020-01-08 11:42:56 +00:00
Andy Wilkinson
8b4c6c2cf9
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19415
2019-12-20 14:43:53 +00:00
Andy Wilkinson
f75c73eb7a
Use Testcontainers in the launch script integration tests
...
Closes gh-19366
2019-12-20 13:15:32 +00:00
dreis2211
ded476b5ec
Reduce visibility of test methods
...
See gh-19294
See gh-19287
2019-12-05 11:29:17 +00:00
Andy Wilkinson
79b5fd9d73
Polish "Allow the user that runs the app to be specified via an env var"
...
See gh-16973
2019-09-21 20:14:49 +01:00
Wagner Macedo
b57f35893c
Allow the user that runs the app to be specified via an env var
...
See gh-16973
2019-09-21 17:57:20 +01:00
Andy Wilkinson
1b237de5f5
Use Awaitility in our own tests
...
Closes gh-18227
2019-09-13 20:50:14 +01:00
Andy Wilkinson
9ed6b92ecc
Merge branch '2.1.x'
2019-09-02 17:22:09 +01:00
Andy Wilkinson
b8070a8339
Skip tests on Windows that exceed its file system's limitations
2019-09-02 17:18:20 +01:00
Andy Wilkinson
bbec7b0f37
Merge branch '2.1.x'
...
Closes gh-17994
2019-08-29 12:30:06 +01:00
Andy Wilkinson
9961647c7f
Improve handling of reserved characters in MetaInfResourceManager
...
Previously, MetaInfResourceManager that we use with Undertow to serve
static resources from jar's META-INF/resources did not correctly
handle characters in the path that should be percent-encoded when
used in a URL.
This commit updates MetaInfResourceManager to encode the path before
it is used to create a URL. Prior to this encoding, encoded slashes
(%2F) are decoded as, unlike other encoded characters in the request's
URL, encoded slashes are not decoded prior to calling the
ResourceManager.
Fixes gh-17853
2019-08-29 12:13:40 +01:00
Madhura Bhave
1b10ecbe1b
Merge branch '2.1.x'
2019-07-29 11:08:38 -07:00
Johnny Lim
77a262c542
Polish
...
See gh-17691
2019-07-29 11:01:23 -07:00
Madhura Bhave
4a309ed491
Merge branch '2.1.x'
2019-07-24 16:27:49 -07:00
Madhura Bhave
f13f96d705
Fix customizer for windows tests
...
JettyServerCustomizers beans do not get picked up automatically in 2.1.x
See gh-15553
2019-07-24 16:11:18 -07:00
Madhura Bhave
9bd1187f40
Merge branch '2.1.x'
...
Closes gh-17628
2019-07-24 13:39:45 -07:00
Madhura Bhave
bb85612723
Add concourse pipeline for Windows
...
Closes gh-15553
2019-07-24 13:25:54 -07:00
Phillip Webb
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00