root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
43,107 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

4128 Commits

Author SHA1 Message Date
Moritz Halbritter 947ac8df73 Map MinIdle and MaxValidationTime to R2DBC pools 
Closes gh-34724
 2023-05-10 10:16:43 +02:00
Stefano Cordio d802ca017b Small assertions improvements 
See gh-34796
 2023-05-10 08:38:07 +02:00
Johnny Lim ff9fd1abeb Polish 
See gh-35185
 2023-05-10 08:31:36 +02:00
Christoph Dreis 2d1a403605 Fix javadoc in OAuth2AuthorizationServerPropertiesMapper 
See gh-35366
 2023-05-09 16:38:45 +01:00
Andy Wilkinson 2b6b178560 Merge branch '3.0.x' 
Closes gh-35362
 2023-05-09 12:24:04 +01:00
Andy Wilkinson 6c1c8fb405 Merge branch '2.7.x' into 3.0.x 
Closes gh-35361
 2023-05-09 12:23:49 +01:00
Andy Wilkinson 7427e2d527 Polish "Fix test for backing off when a TransactionManager is already defined" 
See gh-35336
 2023-05-09 12:04:38 +01:00
davin111 cf5500fc78 Fix test for backing off when a TransactionManager is already defined 
See gh-35336
 2023-05-09 12:03:06 +01:00
Scott Frederick a474e54cf3 Merge branch '3.0.x' 
Closes gh-35244
 2023-05-05 16:20:41 -05:00
Scott Frederick cf180fa1cc Merge branch '2.7.x' into 3.0.x 
Closes gh-35243
 2023-05-05 16:07:23 -05:00
Scott Frederick 5d91c24f63 Update Couchbase image tag used in tests 
Closes gh-35228
 2023-05-05 14:45:58 -05:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Scott Frederick 1143396531 Add smoke tests to verify Couchbase SSL connections 
See gh-34811
 2023-05-04 17:09:52 -05:00
Scott Frederick d4107a8185 Add smoke tests to verify Cassandra SSL connections 
See gh-25602
 2023-05-04 16:11:28 -05:00
Phillip Webb 8e18862582 Merge branch '3.0.x' 2023-05-02 15:41:26 -07:00
Phillip Webb 8d1fb3be4f Fix index error on test 
See gh-35241
 2023-05-02 15:41:07 -07:00
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb 6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Phillip Webb cd5f0dff21 Merge branch '3.0.x' 
Closes gh-35242
 2023-05-02 14:51:24 -07:00
Phillip Webb 722cbc66c6 Merge branch '2.7.x' into 3.0.x 
Closes gh-35241
 2023-05-02 14:51:13 -07:00
Phillip Webb 5ef0ee0ed4 Prevent early initialization of SessionRepository beans 
Replace `SessionRepositoryFilterConfiguration` filter registration bean
with a `DelegatingFilterProxyRegistrationBean` so that
`SessionRepository` beans are not initialized early.

Fixes gh-35240
 2023-05-02 14:47:15 -07:00
Scott Frederick 3bb271e320 Add smoke test to verify Redis SSL connection 
See gh-34815
 2023-05-02 13:52:50 -05:00
Andy Wilkinson aafe343ce6 Merge branch '3.0.x' 
Closes gh-35237
 2023-05-02 16:19:54 +01:00
Andy Wilkinson 9a39bf284b Merge branch '2.7.x' into 3.0.x 
Closes gh-35235
 2023-05-02 16:19:30 +01:00
Andy Wilkinson 7c2c2ebb1b Make ApplicationAvailabilityBean receive events with lazy init 
Fixes gh-35161
 2023-05-02 16:19:08 +01:00
Moritz Halbritter 735c43ce9b Merge branch '2.7.x' into 3.0.x 2023-05-02 14:38:48 +02:00
Moritz Halbritter 312f0c17ed Set initial ElasticSearch heap size in integration tests 2023-05-02 14:37:13 +02:00
Moritz Halbritter 944d77491b Set initial heap size for ElasticSearch integration tests 2023-05-02 14:25:35 +02:00
Moritz Halbritter 1ce88f25b4 Merge branch '3.0.x' 2023-05-02 14:08:37 +02:00
Moritz Halbritter 037cb8c5b0 Merge branch '2.7.x' into 3.0.x 2023-05-02 13:57:37 +02:00
Moritz Halbritter c1cef099d2 Limit maximum heap of ElasticSearch in tests 2023-05-02 13:40:59 +02:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac 
See gh-35228
 2023-05-02 13:40:59 +02:00
Moritz Halbritter 9f109fe785 Disable Couchbase integration tests on aarch64 linux and mac 
See gh-35228
 2023-05-02 13:40:59 +02:00
Andy Wilkinson 419d8c22b2 Merge branch '3.0.x' 
Closes gh-35231
 2023-05-02 11:58:58 +01:00
Andy Wilkinson 8f291abc2b Merge branch '2.7.x' into 3.0.x 
Closes gh-35230
 2023-05-02 11:58:33 +01:00
Juhan Aasaru 3b70286747 Correct list of annotations equivalent to @SpringBootApplication 
See gh-35180
 2023-05-02 11:57:18 +01:00
Andy Wilkinson b1d0433d74 Handle Kafka servers as strings and rely on Kafka's parsing 
Closes gh-34770
 2023-05-02 08:38:40 +01:00
Phillip Webb fc5339f81c Polish 2023-04-30 23:27:06 -07:00
Phillip Webb 403481ff96 Add 'required' parameter to ConnectionDetailsFactories 
Update `ConnectionDetailsFactories` so that callers can now declare if
a result is required or not and improve exception hierarchy.

See gh-35168
 2023-04-29 21:10:07 -07:00
Andy Wilkinson 09527995d1 Polish 2023-04-28 17:56:12 +01:00
Moritz Halbritter 176cc20c36 Polish FlywayConfiguration 2023-04-28 13:15:39 +02:00
Moritz Halbritter 27ab98b49d Polish ConnectionDetailsFactories 2023-04-28 13:15:39 +02:00
Andy Wilkinson d7da77bda8 Remove support for service connections to InfluxDB 
Closes gh-35189
 2023-04-28 09:49:39 +01:00
Scott Frederick 428434c873 Polish SslOptions usage 
Change getter methods to return arrays, as this is how most client
library usages need the options.

See gh-34814
 2023-04-27 16:37:46 -05:00
Scott Frederick 226c3005d4 Add SSL bundle support to Redis auto-configuration 
Update Redis auto-configuration with Lettuce and Jedis drivers to
allow SSL configuration with an SSL bundle.

Closes gh-34815
 2023-04-27 15:24:55 -05:00
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x' 
Closes gh-35173
 2023-04-26 12:48:50 +01:00
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x 
Closes gh-35172
 2023-04-26 12:48:16 +01:00
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization 
Closes gh-35164
 2023-04-26 11:47:03 +01:00
Phillip Webb b5c9e7c06a Polish SslOptions usage 
Add helper method and tighten usage so that exceptions are thrown when
options cannot be applied.

See gh-34814
 2023-04-25 22:39:47 -07:00
Phillip Webb 423c60acfa Add SSL bundle support to Elasticsearch auto-configuration 
Update Elasticsearch RestClient auto-configuration so that an SSL
can be configured via an SSL bundle.

Closes gh-35155
 2023-04-25 17:20:05 -07:00
Phillip Webb 19221f00f3 Deprecate `spring.cassandra.ssl` configuration property 
Deprecate the `spring.cassandra.ssl` configuration property in favor
of `spring.cassandra.ssl.enabled`.

See gh-25602
 2023-04-24 16:39:55 -07:00
Scott Frederick ff35cc80d7 Allow Couchbase SSL to be enabled without custom trust material 
Closes gh-35147
 2023-04-24 14:51:58 -05:00
Scott Frederick 1d44b45b5d Deprecate Couchbase SSL keyStore properties 
The properties `spring.couchbase.env.ssl.key-store`
and `spring.couchbase.env.ssl.key-store-password`
are deprecated in favor of configuring an SSL bundle with
`spring.couchbase.env.ssl.bundle`. The older properties
have somewhat confusing names, since they are used to
configure a trust store in Couchbase, and they don't
provide all the options that an SSL bundle provides.

Closes gh-35135
 2023-04-24 14:45:40 -05:00
Andy Wilkinson 9cd04c55fb Merge branch '3.0.x' 
Closes gh-35132
 2023-04-24 16:01:51 +01:00
Andy Wilkinson 598e090e8f Merge branch '2.7.x' into 3.0.x 
Closes gh-35131
 2023-04-24 15:07:43 +01:00
Andy Wilkinson 90952a2dd9 Do not turn a null Flyway-specific password into an empty string 
It prevents using PGPASS for authentication with Postgres.

Fixes gh-35110
 2023-04-24 14:44:04 +01:00
Andy Wilkinson 7ffacf43f3 Use main DataSource when there are no migration-specific conn details 
Fixes gh-35109
 2023-04-24 13:18:56 +01:00
Phillip Webb 6ea2547de4 Add SSL bundle support to WebClient auto-configuration 
Introduce `WebClientSsl` interface and auto-configuration to allow a
WebClient builder to have custom SSL configuration applied.

The previous `ClientHttpConnectorConfiguration` has been been changed
to now create `ClientHttpConnectorFactory` instances which can be used
directly or by `AutoConfiguredWebClientSsl`.

Closes gh-18556
 2023-04-21 20:39:18 -07:00
Phillip Webb c59c8cc674 Change SslOptions to use null for defaults rather than empty sets 
Update `SslOptions` so that `null` is used for default values rather
than empty sets. Most libraries use `null` to indicate defaults so
aligning our class makes things easier.

See gh-34814
 2023-04-21 16:18:44 -07:00
Scott Frederick fd5fd1491a Add SSL bundle support to MongoDB auto-configuration 
Update MongoDB auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-35042
 2023-04-21 01:13:09 -07:00
Scott Frederick 1618aa2dac Add SSL bundle support to Couchbase auto-configuration 
Update Couchbase auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-34811
 2023-04-21 01:13:09 -07:00
Scott Frederick 682457377a Add SSL bundle support to Cassandra auto-configuration 
Update Cassandra auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-25602
 2023-04-21 01:13:09 -07:00
Scott Frederick 66db13b962 Refactor web server support to use SslBundles 
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.

See gh-34814
 2023-04-21 01:02:47 -07:00
Scott Frederick 8e1f24f98f Add SSL bundle auto-configuration support 
Add auto-configuration for SSL bundles including new configuration
properties that can be used to define a bundle.

SSL bundle properties are provided under the `spring.ssl.bundle` key.
Currently `jks` and `pem` variants are support. Both are configured
as a `Map` where the bundle name is the key.

A typical example would be:

    spring:
      ssl:
        bundle:
          pem:
            mybundle
              key:
                password: secret
              keystore:
                certificate: classpath:mycert.pem
                private-key: classpath:mykey.pem

A `SslBundleRegistrar` interface is also provided to allow programmatic
contributions to the auto-configured `SslBundleRegistry`.

See gh-34814
 2023-04-21 01:01:54 -07:00
Andy Wilkinson cbc03783d0 Allow startup to contiune when ConnectionDetailsFactory load fails 
Prior to this commit, a failure to load a ConnectionDetailsFactory
caused startup to fail. This causes problems when some of a
factory's required classes were not available, for examle when using
spring-boot-docker-compose without Actuator.

Fixes gh-35100
 2023-04-20 15:00:46 +01:00
Andy Wilkinson a03fe8befc Enable customization of JWK Set URI decoder builders 
Closes gh-20750
 2023-04-19 17:23:53 +01:00
Stephane Nicoll 366f7a85c9 Merge branch '3.0.x' 
Closes gh-35069
 2023-04-19 18:01:43 +02:00
Stephane Nicoll 6933796f2a Merge branch '2.7.x' into 3.0.x 
Closes gh-35068
 2023-04-19 18:01:16 +02:00
Stephane Nicoll 1b832d82f8 Polish "Back off if a custom ApplicationAvailability bean is present" 
See gh-34347
 2023-04-19 17:25:10 +02:00
Taeik Lim 5e95ba8448 Back off if a custom ApplicationAvailability bean is present 
See gh-34347
 2023-04-19 17:24:59 +02:00
Andy Wilkinson f5e654748c Polish "Add customizer for conversion service used by Spring Batch" 
See gh-34769
 2023-04-19 14:15:08 +01:00
Claudio Nave cafa6f5d9c Add customizer for conversion service used by Spring Batch 
See gh-34769
 2023-04-19 13:25:31 +01:00
Stephane Nicoll a323bd90a8 Polish "Reintroduce support for ActiveMQ" 
See gh-35048
 2023-04-19 13:08:14 +02:00
Martin BENDA 3e9908a797 Reintroduce support for ActiveMQ 
See gh-35048
 2023-04-19 11:00:40 +02:00
Andy Wilkinson 7b3e687f05 Deprecate OAuth2ClientPropertiesRegistrationAdapter 
This commit deprecates OAuth2ClientPropertiesRegistrationAdapter as
it wasn't really an adapter because it provides a static utility
method rather than adapting one contract to another. A replacement,
OAuth2ClientPropertiesMapper, is introduced that maps the OAuth2
client properties to the required types.

Closes gh-34714
 2023-04-18 20:43:34 +01:00
Andy Wilkinson 4eb7558707 Polish "Add properties to support device grant" 
See gh-34957
 2023-04-18 19:34:13 +01:00
Steve Riesenberg 25b582c822 Add properties to support device grant 
This commit adds the following properties under
spring.security.oauth2.authorizationserver.client.[registration-id]:

* endpoint.device-authorization-uri
* endpoint.device-verification-uri
* token.device-code-time-to-live

See gh-34957
 2023-04-18 19:15:12 +01:00
Andy Wilkinson e2ee1ed50d Fix password handling in Flyway auto-configuration 
Previously, FlywayProperties returned an empty string when its
password had not been set. This prevented the desired fallback to
JdbcConnectionDetails.

Fixes gh-35046
 2023-04-18 11:52:50 +01:00
Phillip Webb 81a972af8d Refactor testcontainers service connections 
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.

A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.

Closes gh-35017
 2023-04-17 00:45:39 -07:00
Phillip Webb 2951cc7594 Polish 2023-04-17 00:42:28 -07:00
Phillip Webb 1849b82334 Don't apply configuration-properties from auto-configuration plugin 
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
 2023-04-17 00:41:25 -07:00
Phillip Webb 053c968fb4 Polish 2023-04-14 17:44:15 -07:00
Phillip Webb 00dc942e94 Migrate to Spring Security lambda config 
Closes gh-35011
 2023-04-14 17:39:48 -07:00
Andy Wilkinson 397f16ce2d Upgrade to Flyway 9.16.3 
Closes gh-34990
 2023-04-14 17:59:46 +01:00
Stephane Nicoll c4c4eb93ae Start building against Spring Security 6.1.0-RC1 snapshots 
See gh-34969
 2023-04-14 14:52:57 +02:00
Andy Wilkinson d4980ea993 Always define connection details beans 
Closes gh-34776
 2023-04-13 18:02:35 +01:00
Andy Wilkinson 466b81f13d Merge branch '3.0.x' 2023-04-13 14:41:40 +01:00
Andy Wilkinson 0e51cd583a Merge branch '2.7.x' into 3.0.x 2023-04-13 14:27:00 +01:00
Andy Wilkinson e70226b48e Adapt to breaking changes in Spring Security internals 
See gh-34948
 2023-04-13 14:11:20 +01:00
Phillip Webb e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Stephane Nicoll 9a4a522004 Polish "Start building against Spring Security 6.0.3 snapshots" 
See gh-34952
 2023-04-12 12:29:58 +02:00
Stephane Nicoll 3f022867f4 Polish "Start building against Spring Security 5.7.8 snapshots" 
See gh-34948
 2023-04-12 12:26:43 +02:00
Stephane Nicoll 2dcb849c0f Merge branch '3.0.x' 
Closes gh-34939
 2023-04-11 16:39:00 +02:00
Stephane Nicoll 320db790e7 Merge branch '2.7.x' into 3.0.x 
Closes gh-34938
 2023-04-11 16:38:46 +02:00
Stephane Nicoll 4b8829364e Polish "Use removeIf rather than Iterator-based removal" 
See gh-34762
 2023-04-11 16:32:26 +02:00
SeasonPan 0d13e31827 Use removeIf rather than Iterator-based removal 
See gh-34762
 2023-04-11 16:20:43 +02:00
Stephane Nicoll 029e47c647 Merge branch '3.0.x' 
Closes gh-34937
 2023-04-11 16:15:33 +02:00
Stephane Nicoll 55125c7a5c Update copyright header of changed file 
See gh-34844
 2023-04-11 16:13:23 +02:00
Sanghyuk Jung d4fe272ce5 Remove outdated reference to JPA in BatchProperties 
See gh-34844
 2023-04-11 16:12:31 +02:00