Commit Graph

218 Commits

Author SHA1 Message Date
Andy Wilkinson
e7c1c8937d Merge branch '2.4.x'
Closes gh-26261
2021-04-27 17:34:52 +01:00
Andy Wilkinson
79d27344e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26260
2021-04-27 17:32:49 +01:00
Andy Wilkinson
912c82e50d Work around https://bugs.openjdk.java.net/browse/JDK-8156584
sun.security.x509.AlgorithmId.get(String) isn't thread-safe and can
lead to null be returned for an algorithm that should be present.

This commit aims to work around this problem by avoiding the call
to AlgorithmId.get(String). It does so by configuring the
PKCS12 key protection algorithm to one that starts with
pbewithhmacsha (case insensitive). This short-circuits the logic
in PKCS12KeyStore.mapPBEAlgorithmToOID(String) and avoids the call to
AlgorithmId.get(String). Thanks again to @dreis2211 for the
suggestion.

The work around is only used when building with Java 8 as the problem
was fixed in Java 9.

Closes gh-26252
2021-04-27 17:27:28 +01:00
dreis2211
5219697eb7 Fix GitHub tag determination following main branch rename
See gh-26253
2021-04-27 15:26:26 +01:00
Phillip Webb
beaf03a008 Update copyright year of changed files 2021-04-15 12:22:48 -07:00
Phillip Webb
b4c9bb0d5c Merge branch '2.4.x'
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb
fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson
47709ec0e4 Align buildSrc's Kotlin version with main project's
See gh-26080
2021-04-13 20:49:10 +01:00
Stephane Nicoll
68046dd748 Update copyright year of changed file
See gh-25986
2021-04-12 08:42:17 +02:00
dreis2211
ea55ca9971 Remove unused method parameters
See gh-25986
2021-04-12 08:40:13 +02:00
Andy Wilkinson
734abc8127 Merge branch '2.4.x'
See gh-25988
2021-04-09 17:47:09 +01:00
Andy Wilkinson
92f9cfaf25 Merge branch '2.3.x' into 2.4.x
See gh-25987
2021-04-09 17:46:54 +01:00
Andy Wilkinson
709db5582b Ensure that classes and resources are in place before documenting
Closes gh-25948
2021-04-09 17:45:38 +01:00
Andy Wilkinson
92dfcc5994 Merge branch '2.4.x'
Closes gh-25988
2021-04-09 17:11:02 +01:00
Andy Wilkinson
7cffb89647 Merge branch '2.3.x' into 2.4.x
Closes gh-25987
2021-04-09 17:10:32 +01:00
Andy Wilkinson
d7b43a3c68 Filter out non-public classes when documenting auto-config classes
Fixes gh-25948
2021-04-09 17:09:19 +01:00
Andy Wilkinson
660dc5fcd7 Merge branch '2.4.x'
Closes gh-25900
2021-04-07 12:24:33 +01:00
Andy Wilkinson
8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
2021-04-07 12:24:07 +01:00
Andy Wilkinson
7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
2021-04-07 11:43:39 +01:00
Phillip Webb
807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Andy Wilkinson
5b111093c6 Merge branch '2.4.x'
Closes gh-25896
2021-04-06 19:39:05 +01:00
Andy Wilkinson
1e4f130133 Merge branch '2.3.x' into 2.4.x
Closes gh-25895
2021-04-06 19:37:27 +01:00
Andy Wilkinson
76f74482d4 Make Asciidoctor tasks run when Java examples are updated
Closes gh-25892
2021-04-06 19:35:38 +01:00
Brian Clozel
fe1011c23d Add Netty memory leak detection config property
This commit adds a new `spring.netty.leak-detection` configuration
property that selects the level of memory leak detection for the Netty
engine.

This configuration is applied statically to Netty; this means all
(non-shaded) Netty usages as client or server will be impacted by this
change.

Developers might use this property during development or tests to find
causes of memory leaks when dealing with Netty buffers.

Closes gh-14338
2021-03-30 18:05:25 +02:00
dreis2211
a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
2021-03-26 19:38:54 +00:00
Andy Wilkinson
90b4ced7a6 Move DataSource init auto-config out of DataSourceAutoConfiguration
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.

This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.

The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.

Closes gh-25323
2021-03-24 14:57:29 +00:00
Phillip Webb
11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Phillip Webb
616917c8dc Upgrade spring-asciidoctor-backends to 0.0.1-M1
Closes gh-25553
2021-03-18 21:43:52 -07:00
Phillip Webb
663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Andy Wilkinson
13dda798c5 Merge branch '2.3.x' into 2.4.x 2021-03-16 19:43:45 +00:00
Andy Wilkinson
2359b37e69 Polish 2021-03-16 19:43:35 +00:00
Andy Wilkinson
4ed1cbfab0 Merge branch '2.4.x'
Closes gh-25696
2021-03-16 19:26:35 +00:00
Andy Wilkinson
4865c23a41 Merge branch '2.3.x' into 2.4.x
Closes gh-25695
2021-03-16 19:24:15 +00:00
Andy Wilkinson
bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr
Closes gh-25345
2021-03-16 19:09:38 +00:00
Stephane Nicoll
e517ee8635 Merge branch '2.4.x'
Closes gh-25618
2021-03-13 18:22:57 +01:00
izeye
09f4d4b9bf Polish
See gh-25617
2021-03-13 18:08:54 +01:00
Phillip Webb
3b095972cc Migrate to spring-asciidoctor-backends
Migrate to the renamed spring-asciidoctor-backends project.

See gh-25553
2021-03-09 09:55:52 -08:00
Phillip Webb
6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
2021-03-08 22:07:17 -08:00
Stephane Nicoll
6aaf9f47be Merge branch '2.4.x'
Closes gh-25524
2021-03-06 08:16:35 +01:00
dreis2211
1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
2021-03-06 08:15:56 +01:00
Andy Wilkinson
961a34a5ee Merge branch '2.4.x'
Closes gh-25497
2021-03-04 19:15:03 +00:00
Andy Wilkinson
1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
2021-03-04 18:54:58 +00:00
dreis2211
1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Andy Wilkinson
e3ad6b5c35 Merge branch '2.4.x'
Closes gh-25407
2021-02-24 12:27:41 +00:00
Andy Wilkinson
29bbbc3b79 Merge branch '2.3.x' into 2.4.x
Closes gh-25406
2021-02-24 12:27:23 +00:00
Andy Wilkinson
11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache
Closes gh-25405
2021-02-24 12:26:03 +00:00
Andy Wilkinson
8cb24a426d Include all non-snapshot repositories when checking for upgrades
Closes gh-25391
2021-02-22 17:53:11 +00:00
Stephane Nicoll
817a4c5397 Merge branch '2.4.x'
Closes gh-25386
2021-02-22 10:46:13 +01:00