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
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
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
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
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
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
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
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
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07: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
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
c5cfb8750b
Delete files after destroying processes that may be accessing them
...
Closes gh-25457
2021-03-03 16:42:49 +00:00
dreis2211
b0a6e92fb6
Speed up spring-boot-server-tests
...
See gh-25457
2021-03-03 13:34:41 +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
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
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
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
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +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
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
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Andy Wilkinson
cc85746942
Merge branch '2.1.x'
...
Closes gh-17575
2019-07-18 17:17:05 +01:00
Andy Wilkinson
591250f75e
Polish "Hide loader classes from Tomcat's ServletContext resource paths"
...
See gh-17538
2019-07-18 17:05:31 +01:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
Phillip Webb
a66c4d3096
Unify method visibility of private classes
...
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.
Closes gh-7316
2019-07-03 11:39:47 -07:00
Phillip Webb
266d6334b2
Fix checkstyle RedundantModifier test violations
2019-06-07 20:46:33 -07:00
Phillip Webb
cde4f0d688
Fix checkstyle violations
2019-06-07 13:27:14 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Andy Wilkinson
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed
Update build and setup configuration to use HTTPS
...
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson
d6a869fa98
Switch to Jakarta EE API dependencies where possible
...
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Phillip Webb
a6c9c92f2e
Merge branch '2.0.x'
2018-07-28 01:35:43 +01:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Andy Wilkinson
76ea2d9dd4
Ensure that the server tests app can resolve milestone poms
2018-05-16 20:23:04 +01:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Andy Wilkinson
49089546f8
Merge branch '1.5.x' into 2.0.x
2018-05-02 10:57:29 +01:00
Johnny Lim
b941c5f1a6
Polish
...
Closes gh-12981
2018-04-27 09:29:16 +02:00
Phillip Webb
69cbf1318c
Second attempt to fix server test CI failures
...
Switch process redirection off and instead consume streams
and copy to System.out/System.err.
See gh-12689
2018-03-29 19:54:41 -07:00
Phillip Webb
7498e7f2cd
Revert "Attempt to fix server test CI failures"
...
This reverts commit 32782429af
.
2018-03-29 19:23:11 -07:00
Phillip Webb
32782429af
Attempt to fix server test CI failures
...
Switch surefire configuration so that forking isn't used. This seems to
prevent the "Corrupted STDOUT by directly writing to native stream"
errors and will hopefully reduce failures on the CI server.
See gh-12689
2018-03-29 18:05:34 -07:00
Phillip Webb
a4b0be089d
Polish
2018-03-14 14:05:26 -07:00