Commit Graph

363 Commits (main)

Author SHA1 Message Date
Moritz Halbritter d42f675959 Merge branch '2.7.x' 3 years ago
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
3 years ago
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
3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 3 years ago
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
3 years ago
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Andy Wilkinson 1fa541d4de Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4c422b9f3c Merge branch '2.5.x' into 2.6.x 3 years ago
Andy Wilkinson b60612dabb Disable LoaderIntegrationTests when Docker's unavailable
Closes gh-29385
3 years ago
Phillip Webb 13f6729b37 Merge branch '2.7.x' 3 years ago
Phillip Webb f6cdc27b2a Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb eca05c42fb Further refine LoaderIntegrationTests for CI
Update `LoaderIntegrationTests` to filter compatible JDKs early.

See gh-29385
3 years ago
Phillip Webb e18cbe5fe2 Merge branch '2.7.x' 3 years ago
Phillip Webb 392de30390 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb de8f8c3e64 Refine LoaderIntegrationTests for CI
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
3 years ago
Phillip Webb 2d1854a682 Merge branch '2.7.x' 3 years ago
Phillip Webb 44537d4494 Merge branch '2.5.x' into 2.6.x
Closes gh-29462
3 years ago
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
3 years ago
Phillip Webb 13f257a706 Merge branch '2.7.x' 3 years ago
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 27ad0804f5 Update copyright year of changed files 3 years ago
Phillip Webb 1b7db2750d Merge branch '2.7.x'
Closes gh-29373
3 years ago
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
3 years ago
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
3 years ago
dreis2211 d8deee7cf6 Update to JDK 17 in launch script tests
See gh-29201
3 years ago
Phillip Webb 003fb229fd Merge branch '2.7.x' 3 years ago
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
3 years ago
Andy Wilkinson 900085628a Raise the minimum supported version of Java to 17
Closes gh-28101
3 years ago
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
3 years ago
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
3 years ago
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
3 years ago
Andy Wilkinson c80283b85f Merge branch '2.5.x'
Closes gh-28653
3 years ago
Andy Wilkinson 92fd3b79a5 Merge branch '2.4.x' into 2.5.x
Closes gh-28652
3 years ago
Andy Wilkinson 08aac25c00 Limit logging produced by spring-boot-loader-tests's intTest task
Closes gh-28651
3 years ago
Andy Wilkinson c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
3 years ago
Andy Wilkinson 7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
3 years ago
Andy Wilkinson 22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
3 years ago
Stephane Nicoll 4ebac4cc66 Merge branch '2.5.x'
Closes gh-28279
3 years ago
Stephane Nicoll 0103eb123b Merge branch '2.4.x' into 2.5.x
Closes gh-28278
3 years ago
dreis2211 ae1167e026 Remove unused settings.xml in integration tests
See gh-28269
3 years ago
Andy Wilkinson 0b58d4858d Merge branch '2.5.x'
Closes gh-28200
3 years ago
Andy Wilkinson 322615d9c5 Merge branch '2.4.x' into 2.5.x
Closes gh-28199
3 years ago
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
3 years ago
Andy Wilkinson 29637706a9 Merge branch '2.5.x'
Closes gh-28166
3 years ago
Andy Wilkinson 14a57adb53 Merge branch '2.4.x' into 2.5.x
Closes gh-28165
3 years ago
Andy Wilkinson 35b16ea04e Minimize dependencies of launch script test app
Closes gh-28164
3 years ago
Phillip Webb 4c2c4ec16c Merge branch '2.5.x' 3 years ago
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb dfd36673f7 Update copyright year of changed files 3 years ago
dreis2211 cf0fcafd13 Polish
See gh-27940
3 years ago
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
3 years ago
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
3 years ago
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
3 years ago
Andy Wilkinson 14db8aec95 Skip server tests on Java 16 as Gradle Plugin is not available
See gh-27476
3 years ago
Andy Wilkinson f830ce5e17 Merge branch '2.5.x' 3 years ago
Andy Wilkinson 27ae302905 Merge branch '2.4.x' into 2.5.x 3 years ago
Andy Wilkinson 931409cdd4 Update copyright header in changed files 3 years ago
Andy Wilkinson fc9f38351a Merge branch '2.5.x'
Closes gh-27479
3 years ago
Andy Wilkinson bd3aec4f80 Merge branch '2.4.x' into 2.5.x
Closes gh-27478
3 years ago
Andy Wilkinson d9a24f32b4 Rework spring-boot-server-tests to avoid using Maven
Closes gh-27476
3 years ago
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
3 years ago
Andy Wilkinson a7334deb54 Merge branch '2.4.x' into 2.5.x
Closes gh-27234
3 years ago
Andy Wilkinson 57d7ba0836 Switch s-b-server-tests from libs-snapshot to snapshot and milestone
Closes gh-27233
3 years ago
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 9e1c78da99 Update copyright year of changed files 3 years ago
Stephane Nicoll d3c817b7ba Polish "Remove unnecessary throws declaration in tests"
See gh-26441
4 years ago
Andy Wilkinson d18af399f9 Merge branch '2.4.x'
Closes gh-26352
4 years ago
Andy Wilkinson 1417c1b0c4 Merge branch '2.3.x' into 2.4.x
Closes gh-26351
4 years ago
Andy Wilkinson 4c42810df9 Ensure that server tests pick up latest snapshots
Closes gh-25921
4 years ago
Andy Wilkinson 47516b50c3 Merge branch '2.4.x'
Closes gh-26246
4 years ago
Andy Wilkinson b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
4 years ago
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
4 years ago
Phillip Webb beaf03a008 Update copyright year of changed files 4 years ago
Andy Wilkinson 67c81100de Merge branch '2.4.x'
Closes gh-25991
4 years ago
Andy Wilkinson 2b9ba96287 Merge branch '2.3.x' into 2.4.x
Closes gh-25990
4 years ago
Andy Wilkinson 0bc5c2ba8c Ensure that containers' static resource handling not MVC's is used
Closes gh-25949
4 years ago
dreis2211 a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
4 years ago
Stephane Nicoll 6aaf9f47be Merge branch '2.4.x'
Closes gh-25524
4 years ago
dreis2211 1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
4 years ago
Andy Wilkinson 3b235e4960 Merge branch '2.4.x'
See gh-25482
4 years ago
Andy Wilkinson f85c7c9ef1 Merge branch '2.3.x' into 2.4.x
See gh-25481
4 years ago
Andy Wilkinson da3920bd46 Wait for process to exit to avoid race with file deletion
See gh-25457
4 years ago
Andy Wilkinson 4a74521174 Merge branch '2.4.x'
See gh-25482
4 years ago
Andy Wilkinson fefd49cce7 Merge branch '2.3.x' into 2.4.x
See gh-25481
4 years ago
Andy Wilkinson c5cfb8750b Delete files after destroying processes that may be accessing them
Closes gh-25457
4 years ago
Andy Wilkinson 59d8c97634 Merge branch '2.4.x'
Closes gh-25482
4 years ago
Andy Wilkinson e984f0ca31 Merge branch '2.3.x' into 2.4.x
Closes gh-25481
4 years ago
dreis2211 b0a6e92fb6 Speed up spring-boot-server-tests
See gh-25457
4 years ago
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
4 years ago
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
4 years ago
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
4 years ago
Phillip Webb d8b6960997 Merge branch '2.4.x'
Closes gh-25077
4 years ago
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
4 years ago
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
4 years ago
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
4 years ago
Phillip Webb abd0b484bc Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb b351288f48 Fix integration test app detection
See gh-18631
4 years ago
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
4 years ago
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
4 years ago
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
4 years ago
Stephane Nicoll 60530b9b5b Merge branch '2.3.x'
Closes gh-24348
4 years ago
Stephane Nicoll 07e32bf52e Merge branch '2.2.x' into 2.3.x
Closes gh-24347
4 years ago
Stephane Nicoll f64b7f8465 Use proper CentOS base image
See gh-24344
4 years ago
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
4 years ago
Stephane Nicoll 2e4b338704 Merge branch '2.3.x'
Closes gh-23155
4 years ago
Stephane Nicoll a341d00529 Review instructions for running launch script tests with Gradle
Closes gh-20606
4 years ago
Andy Wilkinson 07b6f83c7a Merge branch '2.3.x' 4 years ago
Andy Wilkinson 1233288df0 Disable JarLaunchScriptIntegrationTests without Docker
See gh-21388
4 years ago
Andy Wilkinson 3210bc59ca Merge branch '2.3.x'
Closes gh-22722
4 years ago
Andy Wilkinson 323b097623 Merge branch '2.2.x' into 2.3.x
Closes gh-22721
4 years ago
Andy Wilkinson 84ff233590 Polish "Test the launch script when executed directly"
See gh-21388
4 years ago
Alexey Vinogradov 02a6a84499 Test the launch script when executed directly
See gh-21388
4 years ago
Brian Clozel 89688d61ac Revert back to /snapshot repository for SNAPTHOTs
See gh-22640
4 years ago
Brian Clozel f185e07573 Add missing libs-snapshot repository declaration
See gh-22640
4 years ago
Andy Wilkinson 2e1366f61f Make spring-boot-dependencies available when building test app 4 years ago
Andy Wilkinson 8436fa9159 Make spring-boot -dependencies and -parent available
See gh-22066
4 years ago
Phillip Webb ff3b05a421 Add json starter to integration test repo 5 years ago
Phillip Webb ad1248e4ec Replace "folder" with "directory"
Consistently use the term "directory" instead of "folder"

Closes gh-21218
5 years ago
Phillip Webb bf41da5322 Update copyright year of changed files 5 years ago
Madhura Bhave 1342e4970a Provide a condition for detecting war deployments
Closes gh-19421
5 years ago
Phillip Webb 2198614359 Fix incorrect spring replace due to `"` change 5 years ago
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`.
5 years ago
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.
5 years ago
Phillip Webb b4229239ab Protect against NPE in server tests
Update `AbstractApplicationLauncher` to not attempt to shutdown
the process if startup fails.
5 years ago
Phillip Webb bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
5 years ago
Phillip Webb fd792cedaf Polish DisabledIfDockerUnavailable
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
5 years ago
Phillip Webb 862462b791 Update copyright year of changed files 5 years ago
Andy Wilkinson b5ae8b0af5 Disable tests that use Docker when Docker is unavailable
Closes gh-19616
5 years ago
Andy Wilkinson ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
5 years ago
Andy Wilkinson 6d8f07d899 Merge branch '2.1.x' into 2.2.x
Closes gh-19570
5 years ago
Andy Wilkinson 8b4c6c2cf9 Merge branch '2.1.x' into 2.2.x
Closes gh-19415
5 years ago
Andy Wilkinson f75c73eb7a Use Testcontainers in the launch script integration tests
Closes gh-19366
5 years ago
dreis2211 ded476b5ec Reduce visibility of test methods
See gh-19294
See gh-19287
5 years ago
Andy Wilkinson 79b5fd9d73 Polish "Allow the user that runs the app to be specified via an env var"
See gh-16973
5 years ago
Wagner Macedo b57f35893c Allow the user that runs the app to be specified via an env var
See gh-16973
5 years ago
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests
Closes gh-18227
5 years ago
Andy Wilkinson 9ed6b92ecc Merge branch '2.1.x' 5 years ago
Andy Wilkinson b8070a8339 Skip tests on Windows that exceed its file system's limitations 5 years ago
Andy Wilkinson bbec7b0f37 Merge branch '2.1.x'
Closes gh-17994
5 years ago
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
5 years ago
Madhura Bhave 1b10ecbe1b Merge branch '2.1.x' 5 years ago
Johnny Lim 77a262c542 Polish
See gh-17691
5 years ago
Madhura Bhave 4a309ed491 Merge branch '2.1.x' 5 years ago
Madhura Bhave f13f96d705 Fix customizer for windows tests
JettyServerCustomizers beans do not get picked up automatically in 2.1.x

See gh-15553
5 years ago
Madhura Bhave 9bd1187f40 Merge branch '2.1.x'
Closes gh-17628
5 years ago
Madhura Bhave bb85612723 Add concourse pipeline for Windows
Closes gh-15553
5 years ago
Phillip Webb 8bc780762a Merge branch '2.1.x' 5 years ago
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 5 years ago