Commit Graph

30069 Commits

Author SHA1 Message Date
Madhura Bhave
e8a936dfd9 Merge branch '2.3.x' into 2.4.x 2020-12-22 12:24:00 -08:00
Madhura Bhave
b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
2020-12-22 12:18:47 -08:00
Madhura Bhave
a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24313
2020-12-22 12:13:17 -08:00
Madhura Bhave
a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter
Closes gh-24551
2020-12-22 11:17:30 -08:00
Stephane Nicoll
33dda3ad68 Merge pull request #24239 from meistermeier
* pr/24239:
  Polish "Detect Persistent and RelationshipProperties with Neo4j"
  Detect Persistent and RelationshipProperties with Neo4j

Closes gh-24239
2020-12-22 12:32:08 +01:00
Stephane Nicoll
0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
2020-12-22 12:30:48 +01:00
Gerrit Meier
ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
2020-12-22 12:15:03 +01:00
Stephane Nicoll
1f71927a9f Merge branch '2.3.x' into 2.4.x
Closes gh-24587
2020-12-22 09:45:42 +01:00
Stephane Nicoll
9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
2020-12-22 09:44:49 +01:00
Stephane Nicoll
cd9e8a8592 Merge pull request #24453 from dreis2211
* pr/24453:
  Add JavaVersion entry for JDK 16

Closes gh-24453
2020-12-21 10:03:13 +01:00
dreis2211
f9fbadb8d9 Add JavaVersion entry for JDK 16
See gh-24453
2020-12-21 09:59:52 +01:00
Stephane Nicoll
09fa16c58c Merge branch '2.3.x' into 2.4.x 2020-12-21 09:59:33 +01:00
Stephane Nicoll
306b964ce3 Fix multi-release JAR test on JDK 16
See gh-24453
2020-12-21 09:59:01 +01:00
Stephane Nicoll
327ce1b20d Merge pull request #24550 from dreis2211
* pr/24550:
  Remove deprecated SpringBootContextLoader#getArgs()

Closes gh-24550
2020-12-21 09:44:46 +01:00
dreis2211
fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs()
See gh-24550
2020-12-21 09:44:28 +01:00
Stephane Nicoll
2c0bfb7674 Merge branch '2.3.x' into 2.4.x
Closes gh-24578
2020-12-21 09:38:37 +01:00
Stephane Nicoll
4a3ce0c960 Merge pull request #24558 from izeye
* pr/24558:
  Polish

Closes gh-24558
2020-12-21 09:38:11 +01:00
izeye
97dd4c0871 Polish
See gh-24558
2020-12-21 09:35:41 +01:00
Madhura Bhave
af67e6fa54 Merge branch '2.3.x' into 2.4.x 2020-12-18 18:03:22 -08:00
Madhura Bhave
b82f5a408a Add a note about disabling git info
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave
f9d1a4526c Merge branch '2.3.x' into 2.4.x
Closes gh-24572
2020-12-18 17:26:44 -08:00
Madhura Bhave
a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave
c231f3da10 Merge branch '2.3.x' into 2.4.x
Closes gh-24570
2020-12-18 17:15:01 -08:00
Madhura Bhave
302ba77812 Improve documentation regarding git commit info
Closes gh-24205
2020-12-18 17:13:30 -08:00
Phillip Webb
5317d8a9bb Change scope of bootstrap registered Binder
Update `ConfigDataEnvironment` so that the `Binder` is registered as
a prototype bootstrap instance. This allows it to be accessed early
but still replaced when a more complete version is available.

Fixes gh-24559
2020-12-18 15:16:11 -08:00
Phillip Webb
e1b158ec66 Add BootstrapRegistry Scope support
Update `BootstrapRegistry` so that it can be used to register instances
in either a `singleton` or `prototype` scope. The prototype scope has
been added so that instances can be registered and replaced later
if needed.

See gh-24559
2020-12-18 15:14:04 -08:00
Phillip Webb
f568aa489c Fixup title anchors 2020-12-18 15:06:11 -08:00
Madhura Bhave
01537bc54f Merge branch '2.3.x' into 2.4.x
Closes gh-24565
2020-12-18 14:16:45 -08:00
Madhura Bhave
c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated
Closes gh-24531
2020-12-18 14:15:27 -08:00
Madhura Bhave
55d9951d90 Merge branch '2.3.x' into 2.4.x
Closes gh-24563
2020-12-18 14:05:20 -08:00
Madhura Bhave
1db271c2c5 Reorder documentation about building images
Closes gh-24560
2020-12-18 14:02:29 -08:00
Andy Wilkinson
e083be7de1 Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows 2020-12-18 15:26:03 +00: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
Phillip Webb
5ca01ce5a8 Make StandardConfigDataResource.getResource public
Update `StandardConfigDataResource`  to make the `getResource()` method
public so that it can be used by Spring Cloud.

Closes gh-24504
2020-12-16 16:49:39 -08:00
Phillip Webb
d195815488 Only throw PortInUseException if port is set
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.

Closes gh-24529
2020-12-16 16:45:16 -08:00
Madhura Bhave
4822516fb7 Merge branch '2.3.x' into 2.4.x 2020-12-16 15:33:58 -08:00
Phillip Webb
7fd4c53352 Deal with unsupported DisposableServer operations
Update `NettyWebServer` to deal with any `UnsupportedOperationException`
thrown from `DisposableServer`. Specifically, this commit allows the
`NettyWebServer` to work with domain socket backed servers which cannot
provide a port.

Fixes gh-24529
2020-12-16 15:29:54 -08:00
Madhura Bhave
361198ebba Fix tests
See gh-11987
2020-12-16 15:25:02 -08:00
Madhura Bhave
a1ea5b49ec Merge branch '2.3.x' into 2.4.x
Closes gh-24542
2020-12-16 14:57:50 -08:00
Madhura Bhave
09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
2020-12-16 14:55:36 -08:00
Scott Frederick
4e603d9239 Merge branch '2.3.x' into 2.4.x
Closes gh-24538
2020-12-16 15:59:28 -06:00
Scott Frederick
e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
2020-12-16 15:58:53 -06:00
Phillip Webb
d6890e39a7 Merge branch '2.3.x' into 2.4.x
Closes gh-24536
2020-12-16 13:10:35 -08:00
Phillip Webb
2cd1459a9a Merge pull request #24532 from dreis2211
* pr/24532:
  Avoid duplicates in MergedContextConfiguration

Closes gh-24532
2020-12-16 13:09:58 -08:00
Scott Frederick
dfcabe1665 Merge branch '2.3.x' into 2.4.x
Fixes gh-24521 in 2.4.2
2020-12-16 14:53:55 -06:00
dreis2211
0ec603cdad Avoid duplicates in MergedContextConfiguration
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
2020-12-16 12:50:54 -08:00