Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
d4031f3424 Merge pull request #36077 from eddumelendez 
* gh-36077:
  Use Selenium's bom

Closes gh-36077
 2023-06-27 14:24:29 +01:00
Eddú Meléndez
29ebaab0cb Use Selenium's bom 
See gh-36077
 2023-06-27 14:24:06 +01:00
Andy Wilkinson
98d459d76c Revert "Merge branch '3.1.x'" 
See gh-36092
 2023-06-27 14:16:20 +01:00
Andy Wilkinson
6851904651 Merge branch '3.1.x' 
Closes gh-36092
 2023-06-27 14:03:09 +01:00
Andy Wilkinson
9a57611ef5 Merge branch '3.0.x' into 3.1.x 
Closes gh-36091
 2023-06-27 14:02:57 +01:00
Andy Wilkinson
ffbef7bb80 Test server.max-http-request-header-size with Undertow 
Closes gh-36047
 2023-06-27 13:50:04 +01:00
Andy Wilkinson
3da43404da Merge branch '3.1.x' 
Closes gh-36090
 2023-06-27 11:18:38 +01:00
Andy Wilkinson
d90223a317 Merge branch '3.0.x' into 3.1.x 
Closes gh-36089
 2023-06-27 11:18:25 +01:00
Andy Wilkinson
156bcb1dea Merge branch '2.7.x' into 3.0.x 
Closes gh-36088
 2023-06-27 11:18:13 +01:00
Andy Wilkinson
e8cbb9ae1b Stop using deprecated JavaExec property in spring-boot-smoke-test-ant 
Closes gh-36086
 2023-06-27 11:17:50 +01:00
Andy Wilkinson
c038d27c49 Merge branch '3.1.x' 
Closes gh-36085
 2023-06-27 11:11:34 +01:00
Andy Wilkinson
b4d7e1837e Merge branch '3.0.x' into 3.1.x 
Closes gh-36084
 2023-06-27 11:11:20 +01:00
Andy Wilkinson
774993b510 Merge branch '2.7.x' into 3.0.x 
Closes gh-36083
 2023-06-27 11:10:51 +01:00
Andy Wilkinson
0fdaba2487 Make TestSliceMetadata depend on source set's processResources task 
Closes gh-36082
 2023-06-27 11:10:30 +01:00
Andy Wilkinson
3bf1b76770 Merge branch '3.1.x' 
Closes gh-36080
 2023-06-27 09:41:34 +01:00
Andy Wilkinson
b20f2a76c6 Merge branch '3.0.x' into 3.1.x 
Closes gh-36079
 2023-06-27 09:41:19 +01:00
Andy Wilkinson
7d73b07161 Merge branch '2.7.x' into 3.0.x 
Closes gh-36078
 2023-06-27 09:41:07 +01:00
Andy Wilkinson
92e488345d Upgrade to nohttp 0.0.11 
Closes gh-36074
 2023-06-27 09:40:12 +01:00
Andy Wilkinson
dbb24286ff Separate stopping and destruction so web server can be restarted 
Previously, when a Servlet-based WebServer was stopped it would also
stop the ServletContext. This led to problems as Tomcat and Undertow
would then not allow a restart. Jetty would allow a restart but
duplicate servlet registrations would then be attempted.

This commit modifies the WebServer lifecycle to separate stopping
and destruction for both servlet and reactive web servers. This
allows a WebServer's stop() implementation to leave some components
running so that they can be restarted. To completely shut down a
WebServer destroy() must now be called.

Both Tomcat and Jetty WebServers have been updated to stop their
network connections when stop() is called but leave other components
running. This works with both servlet and reactive web servers.

Note that an Undertow-based Servlet web server does not support
stop and restart. Once stopped, a Servlet Deployment cannot be
restarted and it does not appear to be possible to separate the
lifecycle of its network connections and a Servlet deployment.

Reactor Netty and Undertow-based reactive web servers can now also
be stopped and then restarted. Calling stop() stops the whole server
but this does not cause a problem as there's no (application-exposed)
ServletContext involved. There may be room to optimize this in the
future if the need arises.

Closes gh-34955
 2023-06-26 20:58:59 +01:00
Scott Frederick
47cc65d912 Merge branch '3.1.x' 
Closes gh-36056
 2023-06-23 16:12:58 -06:00
Scott Frederick
a03d32e0f3 Merge pull request #36038 from eddumelendez 
* pr/36038:
  Polish "Add SslAutoConfiguration to slice test annotations"
  Add SslAutoConfiguration to slice test annotations

Closes gh-36038
 2023-06-23 16:12:31 -06:00
Scott Frederick
c277517953 Polish "Add SslAutoConfiguration to slice test annotations" 
See gh-36038
 2023-06-23 16:11:49 -06:00
Eddú Meléndez
321c526bf7 Add SslAutoConfiguration to slice test annotations 
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.

See gh-36038
 2023-06-23 15:51:42 -06:00
Scott Frederick
c32877493c Merge branch '3.1.x' 
Closes gh-36055
 2023-06-23 15:47:00 -06:00
Scott Frederick
b9b314622f Merge branch '3.0.x' into 3.1.x 
Closes gh-36054
 2023-06-23 15:46:44 -06:00
Scott Frederick
4a3abdd7c3 Merge branch '2.7.x' into 3.0.x 
Closes gh-36053
 2023-06-23 15:46:27 -06:00
Scott Frederick
a9d3acb12c Merge pull request #36048 from izeye 
* pr/36048:
  Add Javadoc since to ImageReference.inTaglessForm()

Closes gh-36048
 2023-06-23 15:45:56 -06:00
Johnny Lim
59d4bf97a1 Add Javadoc since to ImageReference.inTaglessForm() 
See gh-36048
 2023-06-23 15:45:29 -06:00
Scott Frederick
67725d4781 Merge branch '3.1.x' 
Closes gh-36052
 2023-06-23 15:26:53 -06:00
Scott Frederick
eba7b32bed Merge pull request #36016 from jstansel 
* gh-36016:
  Fix typo in docker compose service connections note

Closes gh-36016
 2023-06-23 15:26:32 -06:00
James Stansell
ea41a22284 Fix typo in docker compose service connections note 
See gh-36016
 2023-06-23 15:25:30 -06:00
Scott Frederick
90dd7449bb Merge branch '3.1.x' 
Closes gh-36051
 2023-06-23 15:20:25 -06:00
Scott Frederick
92b2573a60 Merge branch '3.0.x' into 3.1.x 
Closes gh-36050
 2023-06-23 15:20:06 -06:00
Scott Frederick
eeeb2ad72a Merge branch '2.7.x' into 3.0.x 
Closes gh-36049
 2023-06-23 15:19:44 -06:00
Scott Frederick
5ecca4be36 Merge pull request #35986 from izeye 
* gh-35986:
  Remove redundant Files.delete() calls in tests

Closes gh-35986
 2023-06-23 15:19:16 -06:00
Johnny Lim
4a2c9d99dc Remove redundant Files.delete() calls in tests 
See gh-35986
 2023-06-23 15:14:59 -06:00
Scott Frederick
493987fc1a Allow key password to be set for a PemSslStoreBundle 
Closes gh-35983
 2023-06-23 14:40:42 -06:00
Andy Wilkinson
b645eb32ac Remove deprecated code that was to be removed in 3.2 
Closes gh-36034
 2023-06-23 18:14:22 +01:00
Andy Wilkinson
50d8b20d6c Re-enable forward merge issues for merges into main 2023-06-23 16:01:26 +01:00
Andy Wilkinson
357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36044
 2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x 
Closes gh-36043
 2023-06-23 15:50:02 +01:00
Andy Wilkinson
7b0aa7dcbb Merge pull request #35915 from ThomazPassarelli 
* gh-35915:
  Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
  Replace calls to verifyComplete() to avoid indefinite blocking

Closes gh-35915
 2023-06-23 14:44:44 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking" 
See gh-35915
 2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking 
See gh-35915
 2023-06-23 12:16:26 +01:00
Moritz Halbritter
8f7fdc507e Polish CorrelationIdFormatter 2023-06-23 08:26:32 +02:00
Jonatan Ivanov
228b8eb8e4 Polish log correlation docs 
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern

Closes gh-36035
See gh-33280
See gh-35593
 2023-06-22 14:51:02 -07:00
Andy Wilkinson
89164ddf5f Merge branch '3.1.x' 2023-06-22 14:12:54 +01:00
Andy Wilkinson
e33cec5488 Merge branch '3.0.x' into 3.1.x 2023-06-22 14:12:43 +01:00
Andy Wilkinson
de9f249ef9 Merge branch '2.7.x' into 3.0.x 2023-06-22 14:12:21 +01:00