Commit Graph

50613 Commits

Author SHA1 Message Date
Lukasz Jernas
d38a68ebcd Fix typo in testing docs
See gh-35128
2023-04-24 13:26:19 +02:00
Phillip Webb
a0b854024b Add a 'Docker Compose Support' section to the reference docs
Update the reference documentation with details about the recently
introduced Docker Compose Support.

Closes gh-35026
2023-04-21 23:18:54 -07:00
Phillip Webb
e19aa81813 Polish formatting 2023-04-21 23:18:44 -07: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
Phillip Webb
77c468c956 Add test to check SSL RestTemplate requests work against server
Add a test to `AbstractClientHttpRequestFactoriesTests` to ensure
that SSL configuration works when calling a real Tomcat server.

See gh-34810
2023-04-21 14:06:55 -07:00
Phillip Webb
72c1f667f5 Fix @Since javadoc in RestTemplateBuilder
See gh-34810
2023-04-21 14:06:46 -07:00
Scott Frederick
b6befd133c Add SSL bundle support to RestTemplateBuilder auto-configuration
Update RestTemplateBuilder auto-configuration so that an SSL can be
configured via an SSL bundle.

Closes gh-34810
2023-04-21 01:13:10 -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
909c09c8ab Provide centralized configuration of SSL properties
Closes gh-34814
2023-04-21 01:13:09 -07:00
Scott Frederick
a03f857059 Document update SSL support
Add a new SSL section to the reference documentation to describe SSL
bundles.

See gh-34814
2023-04-21 01:13:05 -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
Scott Frederick
e3677f7ff6 Add SSL bundle support to spring-boot module
Add classes to support SSL bundles which can be used to apply SSL
settings in a centralized way. An `SslBundle` can be registered with
an `SslBundleRegistry` and obtained from an `SslBundles` instance. The
`DefaultSslBundleRegistry` provides a default in-memory implementation.

Different client libraries often configure SSL in slightly different
ways. To accommodate this, the `SslBundle` provides a layered approach
of obtaining SSL information:

	- `getStores` provides access to the key store and trust stores
	  as well as any required key store password.

	- `getManagers` provides access to the `KeyManagerFactory`,
	  `TrustManagerFactory` as well as the `KeyManger` and
	  `TrustManager` arrays that they create.

	- `createSslContext` provides a convenient way to obtain a new
	  `SSLContext` instance.

In addition, the `SslBundle` also provides details about the key being
used, the protocol to use and any options that should be applied to the
SSL engine.

See gh-34814
2023-04-21 01:01:11 -07:00
Andy Wilkinson
e61adc6cbf Allow even more time for Redpanda to start 2023-04-20 17:41:40 +01:00
Andy Wilkinson
b64adbc34b Fix disabled conditions on AbstractDockerComposeIntegrationTests 2023-04-20 16:12:36 +01: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
Stephane Nicoll
ff36f52f4e Merge branch '3.0.x' 2023-04-20 14:34:18 +02:00
Stephane Nicoll
553de9f2fa Merge branch '2.7.x' into 3.0.x 2023-04-20 14:34:07 +02:00
Stephane Nicoll
8435736570 Upgrade Java 20 version in CI image
Closes gh-35077
2023-04-20 14:33:56 +02:00
Stephane Nicoll
cde830c964 Upgrade Java 17 version in CI image and .sdkmanrc
Closes gh-35078
2023-04-20 14:33:18 +02:00
Stephane Nicoll
671e1a7c93 Upgrade CI to Docker 23.0.4
Closes gh-35092
2023-04-20 14:32:34 +02:00
Stephane Nicoll
bf630bd166 Upgrade Java 20 version in CI image
Closes gh-35072
2023-04-20 14:31:26 +02:00
Stephane Nicoll
8c96967c16 Upgrade Java 17 version in CI image and .sdkmanrc
Closes gh-35071
2023-04-20 14:30:56 +02:00
Stephane Nicoll
6e15177650 Upgrade CI to Docker 23.0.4
Closes gh-35070
2023-04-20 14:29:13 +02:00
Stephane Nicoll
81ade5d3b5 Upgrade Java 20 version in CI image
Closes gh-35073
2023-04-20 14:27:39 +02:00
Stephane Nicoll
b6705b7f45 Upgrade Java 17 version in CI image
Closes gh-35079
2023-04-20 14:26:36 +02:00
Stephane Nicoll
8195700c96 Upgrade Java 11 version in CI image
Closes gh-35076
2023-04-20 14:25:56 +02:00
Stephane Nicoll
59ac9295fa Upgrade Java 8 version in CI image and .sdkmanrc
Closes gh-35074
2023-04-20 14:25:21 +02:00
Stephane Nicoll
573aec7d3a Upgrade CI to Docker 23.0.4
Closes gh-35075
2023-04-20 14:22:04 +02:00
Andy Wilkinson
bc58df3467 Prohibit upgrades to Liquibase 4.21.1
See gh-34983
2023-04-20 12:22:55 +01:00
Andy Wilkinson
26c98eded9 Upgrade to Tomcat 10.1.8
Closes gh-35095
2023-04-20 12:22:54 +01:00
Andy Wilkinson
dbab743018 Upgrade to Spring Integration 6.1.0-RC1
Closes gh-34973
2023-04-20 12:22:54 +01:00
Andy Wilkinson
68b25598b9 Upgrade to Spring GraphQL 1.2.0-RC1
Closes gh-34972
2023-04-20 12:22:54 +01:00
Andy Wilkinson
5965df39b5 Upgrade to Selenium HtmlUnit 4.8.3
Closes gh-35094
2023-04-20 12:22:54 +01:00
Andy Wilkinson
503e88f2ec Upgrade to Logback 1.4.7
Closes gh-35093
2023-04-20 12:22:53 +01:00
Andy Wilkinson
f0afb2d22f Merge branch '3.0.x' 2023-04-20 12:22:34 +01:00
Spring Builds
bed40c6ee9 Next development version (v3.0.7-SNAPSHOT) 2023-04-20 10:44:26 +00:00
Andy Wilkinson
76b2866602 Merge branch '3.0.x' 2023-04-20 09:54:47 +01:00
Andy Wilkinson
b80f4cc985 Upgrade to Tomcat 10.1.8
Closes gh-35089
2023-04-20 09:54:24 +01:00
Andy Wilkinson
ca618e84d3 Upgrade to Spring Integration 6.0.5
Closes gh-35012
2023-04-20 09:54:23 +01:00
Andy Wilkinson
35fd0a3f69 Upgrade to Logback 1.4.7
Closes gh-35088
2023-04-20 09:54:23 +01:00
Andy Wilkinson
40834c5cb9 Merge branch '2.7.x' into 3.0.x 2023-04-20 09:53:54 +01:00
Spring Builds
253cbad49d Next development version (v2.7.12-SNAPSHOT) 2023-04-20 08:26:47 +00:00
Andy Wilkinson
04780650a1 Merge branch '3.0.x'
Closes gh-35087
2023-04-20 08:04:37 +01:00
Andy Wilkinson
32444fed4b Merge branch '2.7.x' into 3.0.x
Closes gh-35086
2023-04-20 08:04:18 +01:00
Madhura Bhave
3522714c13 Use endpoint mappings in CloudFoundry integration
Closes gh-35085
2023-04-20 07:50:44 +01:00
Andy Wilkinson
c55d398f95 Validate health group includes and excludes
Closes gh-34360
2023-04-19 19:51:57 +01:00