fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,435 Commits 22 Branches 339 Tags
Commit Graph

4056 Commits

Author SHA1 Message Date
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