Commit Graph

11903 Commits (853dbc3de3524842c0d9e4192d45cd9b7ddabd9e)

Author SHA1 Message Date
Phillip Webb 9da0bd8523 Update copyright year of changed files 4 years ago
Phillip Webb b6cb9c016f Detect bad properties in profile specific files
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
4 years ago
Madhura Bhave 5ed2b11e34 Fix typo 4 years ago
Andy Wilkinson 5cae1a2842 Merge branch '2.3.x' into 2.4.x
Closes gh-24790
4 years ago
Andy Wilkinson 7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
4 years ago
Stephane Nicoll c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
4 years ago
Andy Wilkinson c3dfb9bd29 Merge branch '2.3.x' into 2.4.x
Closes gh-24768
4 years ago
Andy Wilkinson 997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
4 years ago
Stephane Nicoll f02951fb17 Upgrade to Netty 4.1.56.Final
Closes gh-24764
4 years ago
Stephane Nicoll 2e69198f97 Upgrade to Neo4j OGM 3.2.19
Closes gh-24763
4 years ago
Stephane Nicoll 5fb1ca6043 Upgrade to Johnzon 1.2.9
Closes gh-24762
4 years ago
Stephane Nicoll 37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24761
4 years ago
Stephane Nicoll 3ae9639cbb Upgrade to Jackson Bom 2.11.4
Closes gh-24760
4 years ago
Stephane Nicoll 371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24759
4 years ago
Stephane Nicoll e48e48988a Upgrade to Hibernate 5.4.27.Final
Closes gh-24758
4 years ago
Stephane Nicoll 66daeab221 Upgrade to Hazelcast 3.12.11
Closes gh-24757
4 years ago
Stephane Nicoll 682c952306 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24756
4 years ago
Stephane Nicoll 7ab9fad062 Upgrade to Byte Buddy 1.10.19
Closes gh-24755
4 years ago
Stephane Nicoll b3bc79b10f Upgrade to AppEngine SDK 1.9.84
Closes gh-24754
4 years ago
Stephane Nicoll 8058370f3e Upgrade to Spring Framework 5.3.3
Closes gh-24699
4 years ago
Phillip Webb bd21c43d71 Simplify resource registration
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
4 years ago
Phillip Webb f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x
Closes gh-24748
4 years ago
Phillip Webb 72dd3b5628 Merge branch '2.2.x' into 2.3.x
Closes gh-24747
4 years ago
Phillip Webb f9e3e0d532 Register default resource path using a Resource
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
4 years ago
Phillip Webb 53a6fa2fed Respect spring.dao.exceptiontranslation setting
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
4 years ago
Phillip Webb cff3e4c831 Fix tests following upstream framework changes 4 years ago
Phillip Webb 039df1d96d Test spring.profiles.include in profile file
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
4 years ago
Phillip Webb 26a68ca2cf Polish 4 years ago
Stephane Nicoll 31de36565f Upgrade to Reactor 2020.0.3
Closes gh-24698
4 years ago
Andy Wilkinson 5ae9fbedcd Merge branch '2.3.x' into 2.4.x
Closes gh-24738
4 years ago
Andy Wilkinson 7625a979db Configure bootRun to use project's Java toolchain by default
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
4 years ago
Andy Wilkinson 3c3aa9e486 Merge branch '2.3.x' into 2.4.x
Closes gh-24735
4 years ago
Andy Wilkinson 064de4e073 Check configured JavaLauncher when determining version of the JVM
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
4 years ago
Stephane Nicoll 097f878981 Upgrade to Kafka 2.6.1
Closes gh-24247
4 years ago
Stephane Nicoll 50019a7f44 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24731
4 years ago
Stephane Nicoll aad3de2ba7 Upgrade to Spring Retry 1.3.1
Closes gh-24730
4 years ago
Stephane Nicoll d7e6f963ab Upgrade to Netty 4.1.56.Final
Closes gh-24729
4 years ago
Stephane Nicoll 5f63b22286 Upgrade to Johnzon 1.2.9
Closes gh-24728
4 years ago
Stephane Nicoll 8867544d0d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24727
4 years ago
Stephane Nicoll fc6fa74691 Upgrade to Jackson Bom 2.11.4
Closes gh-24726
4 years ago
Stephane Nicoll d691d63b1e Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24725
4 years ago
Stephane Nicoll bc0a1ff852 Upgrade to Hibernate 5.4.27.Final
Closes gh-24724
4 years ago
Stephane Nicoll 487f694872 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24723
4 years ago
Stephane Nicoll a60b5e0f70 Upgrade to Byte Buddy 1.10.19
Closes gh-24722
4 years ago
Stephane Nicoll 180493422d Upgrade to AppEngine SDK 1.9.84
Closes gh-24721
4 years ago
Andy Wilkinson 9e389c8376 Merge branch '2.3.x' into 2.4.x
Closes gh-24710
4 years ago
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
4 years ago
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
4 years ago
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
4 years ago
Stephane Nicoll 40f1f9a25c Start building against Spring Kafka 2.6.5 snapshots
See gh-24703
4 years ago
Stephane Nicoll a27b87a118 Start building against Spring AMQP 2.3.3 snapshots
See gh-24702
4 years ago
Stephane Nicoll 0bfb072467 Start building against Spring Integration 5.4.3 snapshots
See gh-24701
4 years ago
Stephane Nicoll 5bfc0285c6 Start building against Spring Data 2020.0.3 snapshots
See gh-24700
4 years ago
Stephane Nicoll 11d20eba82 Start building against Spring Framework 5.3.3 snapshots
See gh-24699
4 years ago
Stephane Nicoll 9f70b71036 Start building against Reactor 2020.0.3 snapshots
See gh-24698
4 years ago
Scott Frederick 210438ee5b Merge branch '2.3.x' into 2.4.x
Closes gh-24689
4 years ago
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
4 years ago
Scott Frederick ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
4 years ago
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation
See gh-24660
4 years ago
Phillip Webb 48661e79f5 Merge branch '2.3.x' into 2.4.x
Closes gh-24683
4 years ago
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
4 years ago
Phillip Webb 76aa33b65a Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
4 years ago
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
4 years ago
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
4 years ago
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
4 years ago
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x
Closes gh-24678
4 years ago
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl
Fixes gh-24168
4 years ago
Phillip Webb 5b126b01c0 Replace binder as contributors are processed
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
4 years ago
Phillip Webb ac4243d615 Merge branch '2.3.x' into 2.4.x
Closes gh-24672
4 years ago
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull
Closes gh-24647
4 years ago
Phillip Webb 2b497b6aff Merge branch '2.3.x' into 2.4.x
Closes gh-24670
4 years ago
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull
Closes gh-24647
4 years ago
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x
See gh-24647
4 years ago
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
4 years ago
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x
See gh-24647
4 years ago
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
4 years ago
Phillip Webb c9f9246c59 Merge branch '2.3.x' into 2.4.x
Closes gh-24657
4 years ago
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers"
See gh-24606
4 years ago
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
4 years ago
Phillip Webb ab8080353e Merge branch '2.3.x' into 2.4.x
Closes gh-24654
4 years ago
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
4 years ago
Scott Frederick 505340909a Support symlinks in configtree property paths
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
4 years ago
Madhura Bhave 615a8ae56e Ignore documents that do not apply when checking mandatory locations
Closes gh-24584
4 years ago
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x
Closes gh-24649
4 years ago
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
4 years ago
Stephane Nicoll e1ec70ac36 Merge branch '2.3.x' into 2.4.x
Closes gh-24643
4 years ago
Stephane Nicoll f33c7bc27c Polish "Remove unnecessary semicolon"
See gh-24628
4 years ago
Andrey Kolchanov 097104584c Remove unnecessary semicolon
See gh-24628
4 years ago
Madhura Bhave 86e94b95c3 Merge branch '2.3.x' into 2.4.x 4 years ago
Madhura Bhave 9928d74a9e Revert fix to enable cors for actuator endpoints
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.

See gh-11987
4 years ago
Stephane Nicoll c19f7e696e Polish
See gh-24597
4 years ago
Stephane Nicoll 1bc1258341 Polish "Make a field final"
See gh-24629
4 years ago
Andrey Kolchanov 0e3990931e Make a field final
See gh-24629
4 years ago
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
4 years ago
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
4 years ago
izeye 5e3f618f9d Polish
See gh-24604
4 years ago
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll d0a1c49873 Polish
See gh-24604
4 years ago
Stephane Nicoll 1261e08371 Merge branch '2.3.x' into 2.4.x
Closes gh-24602
4 years ago
Stephane Nicoll d86eba3b6b Upgrade to Thymeleaf 3.0.12
Closes gh-24599
4 years ago
Stephane Nicoll ff59bb3abf Configure resources filtering encoding
Closes gh-24576
4 years ago
Stephane Nicoll 4cdfd6f13d Polish "Handle missing manifest files in JarTypeFilter"
See gh-24597
4 years ago
Rob Edwards 86eecb01b3 Handle missing manifest files in JarTypeFilter
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).

See gh-24597
4 years ago
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
4 years ago
Madhura Bhave a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24313
4 years ago
Madhura Bhave a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter
Closes gh-24551
4 years ago
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
4 years ago
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
4 years ago
Stephane Nicoll 1f71927a9f Merge branch '2.3.x' into 2.4.x
Closes gh-24587
4 years ago
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
4 years ago
dreis2211 f9fbadb8d9 Add JavaVersion entry for JDK 16
See gh-24453
4 years ago
Stephane Nicoll 09fa16c58c Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 306b964ce3 Fix multi-release JAR test on JDK 16
See gh-24453
4 years ago
dreis2211 fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs()
See gh-24550
4 years ago
Stephane Nicoll 2c0bfb7674 Merge branch '2.3.x' into 2.4.x
Closes gh-24578
4 years ago
izeye 97dd4c0871 Polish
See gh-24558
4 years ago
Madhura Bhave af67e6fa54 Merge branch '2.3.x' into 2.4.x 4 years ago
Madhura Bhave b82f5a408a Add a note about disabling git info
See gh-24205
4 years ago
Madhura Bhave f9d1a4526c Merge branch '2.3.x' into 2.4.x
Closes gh-24572
4 years ago
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
4 years ago
Madhura Bhave c231f3da10 Merge branch '2.3.x' into 2.4.x
Closes gh-24570
4 years ago
Madhura Bhave 302ba77812 Improve documentation regarding git commit info
Closes gh-24205
4 years ago
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
4 years ago
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
4 years ago
Phillip Webb f568aa489c Fixup title anchors 4 years ago
Madhura Bhave 01537bc54f Merge branch '2.3.x' into 2.4.x
Closes gh-24565
4 years ago
Madhura Bhave c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated
Closes gh-24531
4 years ago
Madhura Bhave 55d9951d90 Merge branch '2.3.x' into 2.4.x
Closes gh-24563
4 years ago
Madhura Bhave 1db271c2c5 Reorder documentation about building images
Closes gh-24560
4 years ago
Andy Wilkinson e083be7de1 Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows 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
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
4 years ago
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
4 years ago
Madhura Bhave 4822516fb7 Merge branch '2.3.x' into 2.4.x 4 years ago
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
4 years ago
Madhura Bhave 361198ebba Fix tests
See gh-11987
4 years ago
Madhura Bhave a1ea5b49ec Merge branch '2.3.x' into 2.4.x
Closes gh-24542
4 years ago
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
4 years ago
Scott Frederick 4e603d9239 Merge branch '2.3.x' into 2.4.x
Closes gh-24538
4 years ago
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
4 years ago
Phillip Webb d6890e39a7 Merge branch '2.3.x' into 2.4.x
Closes gh-24536
4 years ago
Scott Frederick dfcabe1665 Merge branch '2.3.x' into 2.4.x
Fixes gh-24521 in 2.4.2
4 years ago
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
4 years ago
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
4 years ago
Andy Wilkinson 5fdb2ae2fd Protect PluginApplicationActions against absent plugin classes
Closes gh-24526
4 years ago
Phillip Webb 38e4c2a179 Add ConfigDataEnvironmentUpdateListener support
Add an overloaded `ConfigDataEnvironmentPostProcessor.applyTo` method
that accepts a listener that can used to track the updates that were
applied to the `Environment`.

The listener can be used to track the which `ConfigDataLocation` and
the `ConfigDataResource` were used to add a `PropertySource`. The lister
can also be used to tell which profiles were applied.

This enhancement is being added in a patch release because it's will
be useful for Spring Cloud 2020.0.0.

Closes gh-24504
4 years ago
Phillip Webb 5e1a69e90e Polish 4 years ago