Commit Graph

368 Commits (caf49783d44a2488e55becb531507567bd62e45a)

Author SHA1 Message Date
Phillip Webb 2c518f1dff Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb a76e5c043e Update copyright year of changed files 3 years ago
Andy Wilkinson aa3d72cb05 Merge branch '2.5.x'
See gh-27047
3 years ago
Andy Wilkinson 5139c79c4f Merge branch '2.4.x' into 2.5.x
See gh-27045
3 years ago
Andy Wilkinson 4d694ddaa8 Fix bom plugin management versions
See gh-27044
3 years ago
Andy Wilkinson 5d6a612b4b Merge branch '2.5.x'
Closes gh-27047
3 years ago
Andy Wilkinson ec2a7b9a5b Merge branch '2.4.x' into 2.5.x
Closes gh-27045
3 years ago
Andy Wilkinson 363de4cfa5 Add dependency lock and constraint version alignment to Bomr
Closes gh-27044
3 years ago
Andy Wilkinson 06778abb61 Merge branch '2.5.x'
See gh-26934
3 years ago
Andy Wilkinson 577c58b798 Merge branch '2.4.x' into 2.5.x
See gh-26933
3 years ago
Andy Wilkinson ac8c6a6fb7 Tune config of source and target compatilility with toolchain
See gh-26932
3 years ago
Andy Wilkinson 2106114f64 Merge branch '2.5.x'
Closes gh-26934
3 years ago
Andy Wilkinson 560d272db3 Merge branch '2.4.x' into 2.5.x
Closes gh-26933
3 years ago
Andy Wilkinson 6e43dd879b Allow Eclipse to properly detect source and target compatibility
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].

This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.

Closes gh-26932

[1] https://github.com/eclipse/buildship/issues/978
3 years ago
Andy Wilkinson 0f52bbc560 Stop using ConfigureUtil in BomExtension
While we're building with Gradle 6.9 at the moment and ConfigureUtil
has only been deprecated in Gradle 7.1, it doesn't do any harm to
stop using it now.

Closes gh-26928
3 years ago
Phillip Webb 28abcf88a0 Upgrade to spring-asciidoctor-backends 0.0.2
Closes gh-26846
3 years ago
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
3 years ago
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
3 years ago
Phillip Webb f798f26596 Merge branch '2.4.x' 3 years ago
Phillip Webb 6424e3de12 Merge branch '2.4.x'
Closes gh-26671
4 years ago
Phillip Webb 14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
4 years ago
Phillip Webb 39e3746cf6 Force Eclipse to use JavaSE-1.8 runtime
Add `EclipseConventions` to force the JavaSE-1.8 runtime to be applied
to the imported projects.

Closes gh-26669
4 years ago
Phillip Webb 60a8fae65c Upgrade to spring-asciidoctor-backends 0.0.1
Closes gh-26293
4 years ago
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
4 years ago
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
4 years ago
Andy Wilkinson a6dd97e40d Polish
See gh-26576
4 years ago
Andy Wilkinson 763e58e392 Merge branch '2.4.x'
Closes gh-26576
4 years ago
Andy Wilkinson ad5ba2e414 Compile Kotlin code will all warnings treated as errors
Closes gh-26083
4 years ago
Andy Wilkinson aaceb9565c Upgrade to Kotlin 1.5.0
Closes gh-26553
4 years ago
Andy Wilkinson f7d28567c0 Merge branch '2.4.x'
Closes gh-26520
4 years ago
dreis2211 6179b99710 Remove add-opens workaround in ToolchainPlugin
See gh-26465
4 years ago
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
4 years ago
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots
See gh-26394
4 years ago
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
4 years ago
Andy Wilkinson f17af829ee Merge branch '2.4.x'
Closes gh-26354
4 years ago
Andy Wilkinson 75bb50bd02 Merge branch '2.3.x' into 2.4.x
Closes gh-26353
4 years ago
Andy Wilkinson deca737b01 Configure source and target compatibility at the task level
Closes gh-26350
4 years ago
Andy Wilkinson 5a3c354e6c Merge branch '2.4.x'
Closes gh-26303
4 years ago
Andy Wilkinson 4abd6b1387 Merge branch '2.3.x' into 2.4.x
Closes gh-26302
4 years ago
Andy Wilkinson 3cc1ed28ca Order test tasks to run after Checkstyle and formatting checks
Closes gh-26284
4 years ago
Phillip Webb 3d9eb9e413 Switch to spring-asciidoctor-backends SNAPSHOT
See gh-26293
4 years ago
Andy Wilkinson 1be8c8fda9 Merge branch '2.4.x'
See gh-26261
4 years ago
Andy Wilkinson 4417e16963 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
Andy Wilkinson 3a3eb1bc31 Fix workaround for JDK-8156584
See gh-26252
4 years ago
Andy Wilkinson c548693fa1 Merge branch '2.4.x'
See gh-26261
4 years ago
Andy Wilkinson 097a436314 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
Andy Wilkinson ecd1e536cc Refine workaround for JDK-8156584
The previous workaround worked but prevented caching of every test
task as the value of system property pointing to the custom security
properties file varied from build to build.

This commit refines the workaround to copy the file into the build
directory of the test task's project and reference it using a URL
that's relative to the task's working directory. This ensures that
the value of the system property doesn't change from build to build.

Closes gh-26252
4 years ago
Andy Wilkinson 03149eda9e Merge branch '2.4.x'
Closes gh-26278
4 years ago
Andy Wilkinson 9cd15a1360 Merge branch '2.3.x' into 2.4.x
Closes gh-26276
4 years ago
Andy Wilkinson 79ecf596ec Set path sensitivity when configuring additional task inputs
Previously a number of file- or directory-based task inputs were
configured with specifying their path sensitivity. This meant
that the default absolute path sensitivity was used. For caches
that are cacheable this would result in a cache miss when the
inputs were identical other than being located at a different
absolute path as they are when running a CI build vs a local build.

This commit updates the configuration of additional task inputs
to use relative path sensitivity. A property name for each input has
also been configured. This makes them easier to identify in build
scans.

Closes gh-26270
4 years ago
Andy Wilkinson e7c1c8937d Merge branch '2.4.x'
Closes gh-26261
4 years ago
Andy Wilkinson 79d27344e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26260
4 years ago
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
4 years ago
dreis2211 5219697eb7 Fix GitHub tag determination following main branch rename
See gh-26253
4 years ago
Phillip Webb beaf03a008 Update copyright year of changed files 4 years ago
Phillip Webb b4c9bb0d5c Merge branch '2.4.x'
Closes gh-26122
4 years ago
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
4 years ago
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
4 years ago
Andy Wilkinson 47709ec0e4 Align buildSrc's Kotlin version with main project's
See gh-26080
4 years ago
Stephane Nicoll 68046dd748 Update copyright year of changed file
See gh-25986
4 years ago
dreis2211 ea55ca9971 Remove unused method parameters
See gh-25986
4 years ago
Andy Wilkinson 734abc8127 Merge branch '2.4.x'
See gh-25988
4 years ago
Andy Wilkinson 92f9cfaf25 Merge branch '2.3.x' into 2.4.x
See gh-25987
4 years ago
Andy Wilkinson 709db5582b Ensure that classes and resources are in place before documenting
Closes gh-25948
4 years ago
Andy Wilkinson 92dfcc5994 Merge branch '2.4.x'
Closes gh-25988
4 years ago
Andy Wilkinson 7cffb89647 Merge branch '2.3.x' into 2.4.x
Closes gh-25987
4 years ago
Andy Wilkinson d7b43a3c68 Filter out non-public classes when documenting auto-config classes
Fixes gh-25948
4 years ago
Andy Wilkinson 660dc5fcd7 Merge branch '2.4.x'
Closes gh-25900
4 years ago
Andy Wilkinson 8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
4 years ago
Andy Wilkinson 7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
4 years ago
Phillip Webb 807ea1af0d Update copyright year of changed files 4 years ago
Andy Wilkinson 5b111093c6 Merge branch '2.4.x'
Closes gh-25896
4 years ago
Andy Wilkinson 1e4f130133 Merge branch '2.3.x' into 2.4.x
Closes gh-25895
4 years ago
Andy Wilkinson 76f74482d4 Make Asciidoctor tasks run when Java examples are updated
Closes gh-25892
4 years ago
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
4 years ago
dreis2211 a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
4 years ago
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
4 years ago
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 82127fdaa3 Update copyright year of changed files 4 years ago
Phillip Webb 616917c8dc Upgrade spring-asciidoctor-backends to 0.0.1-M1
Closes gh-25553
4 years ago
Phillip Webb 663fd8ce5e Update copyright year of changed files 4 years ago
Andy Wilkinson 13dda798c5 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 2359b37e69 Polish 4 years ago
Andy Wilkinson 4ed1cbfab0 Merge branch '2.4.x'
Closes gh-25696
4 years ago
Andy Wilkinson 4865c23a41 Merge branch '2.3.x' into 2.4.x
Closes gh-25695
4 years ago
Andy Wilkinson bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr
Closes gh-25345
4 years ago
Stephane Nicoll e517ee8635 Merge branch '2.4.x'
Closes gh-25618
4 years ago
izeye 09f4d4b9bf Polish
See gh-25617
4 years ago
Phillip Webb 3b095972cc Migrate to spring-asciidoctor-backends
Migrate to the renamed spring-asciidoctor-backends project.

See gh-25553
4 years ago
Phillip Webb 6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
4 years ago
Stephane Nicoll 6aaf9f47be Merge branch '2.4.x'
Closes gh-25524
4 years ago
dreis2211 1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
4 years ago
Andy Wilkinson 961a34a5ee Merge branch '2.4.x'
Closes gh-25497
4 years ago
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
4 years ago
dreis2211 1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
4 years ago
Andy Wilkinson e3ad6b5c35 Merge branch '2.4.x'
Closes gh-25407
4 years ago
Andy Wilkinson 29bbbc3b79 Merge branch '2.3.x' into 2.4.x
Closes gh-25406
4 years ago
Andy Wilkinson 11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache
Closes gh-25405
4 years ago
Andy Wilkinson 8cb24a426d Include all non-snapshot repositories when checking for upgrades
Closes gh-25391
4 years ago
Stephane Nicoll 817a4c5397 Merge branch '2.4.x'
Closes gh-25386
4 years ago
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
4 years ago
Mustafa Ulu abc90db32f Fix wording error in build-info goal description
See gh-25382
4 years ago
Andy Wilkinson 52f398318b Merge branch '2.4.x'
Closes gh-25258
4 years ago
Andy Wilkinson e763627e86 Merge branch '2.3.x' into 2.4.x
Closes gh-25257
4 years ago
Andy Wilkinson 63402a2984 Truncate files before writing new content to them
Previously, UpgradeApplicator would open build.gradle
using open options that left the fields existing content intact. It
would then write the new content at the beginning of the file. If
the new content was n bytes shorter than the existing content, this
would leave n bytes of the existing content at the end of the file.

This commit updates UpgradeApplicator to truncate the existing file
when it opens it. This ensures that the existing content is
completely replaced by the new content, irrespective of their lengths.

Closes gh-25256
4 years ago
Andy Wilkinson 123111cc7a Merge branch '2.4.x'
Closes gh-25227
4 years ago
Andy Wilkinson 12c3c80744 Merge branch '2.3.x' into 2.4.x
Closes gh-25226
4 years ago
Andy Wilkinson 413256501f Require a milestone when upgrading dependencies
Closes gh-25225
4 years ago
Andy Wilkinson fc7319fbf6 Merge branch '2.4.x'
Closes gh-25181
4 years ago
Andy Wilkinson f5176f3569 Merge branch '2.3.x' into 2.4.x
Closes gh-25180
4 years ago
Andy Wilkinson 2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
4 years ago
Vitalii Mahas a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
4 years ago
Andy Wilkinson 2ff256d759 Merge branch '2.4.x'
Closes gh-25177
4 years ago
Andy Wilkinson 3c8a974558 Merge branch '2.3.x' into 2.4.x
Closes gh-25176
4 years ago
Andy Wilkinson b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
4 years ago
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
4 years ago
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
4 years ago
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
4 years ago
Andy Wilkinson 067f5a52cc Merge branch '2.4.x'
Closes gh-24784
4 years ago
Andy Wilkinson 139152ccce Merge branch '2.3.x' into 2.4.x
Closes gh-24783
4 years ago
Andy Wilkinson 5a02996eca Fix release train version's comparison with other version types
Fixes gh-24782
4 years ago
Stephane Nicoll 63444ae957 Merge branch '2.4.x'
Closes gh-24627
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
Stephane Nicoll 08b692581a Prepare 2.4.x branch 4 years ago
Brian Clozel dc9cdb71f5 Merge branch '2.3.x'
Closes gh-24381
4 years ago
Brian Clozel d2895e7453 Upgrade to Spring Doc Resources 0.2.5
Fixes gh-24146
4 years ago
Phillip Webb e0a061707e Fix checkstyle header violation
See gh-24337
4 years ago
Phillip Webb 30c27274e2 Merge branch '2.3.x'
Closes gh-24339
4 years ago
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
4 years ago
Stephane Nicoll b3165f1b36 Merge branch '2.3.x'
Closes gh-24196
4 years ago
Stephane Nicoll ac05356427 Merge branch '2.2.x' into 2.3.x
Closes gh-24195
4 years ago
Andy Wilkinson bce2029bc6 Merge branch '2.3.x'
Closes gh-24132
4 years ago
Andy Wilkinson 189046bd4f Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars"
Closes gh-24131
4 years ago
Brian Clozel fe359bcbfb Merge branch '2.3.x'
Closes gh-24067
4 years ago
Brian Clozel e98db484bc Upgrade to spring-doc-resources 0.2.4
Closes gh-24066
4 years ago
Andy Wilkinson 38821c15da Merge branch '2.3.x'
Closes gh-24057
4 years ago
Andy Wilkinson 1e100677c7 Reduce scope of META-INF customizations to main, source, and javadoc jars
Closes gh-23955
4 years ago
Andy Wilkinson d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
4 years ago
Andy Wilkinson 49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
4 years ago
Andy Wilkinson b50f8359b5 Merge branch '2.3.x'
Closes gh-24003
4 years ago
Andy Wilkinson e820400748 Polish manifests of source and javadoc jars
Previously, the main jar file and the source and javadoc jar files all
had the same changes applied to their manifests.

The commit changes the Implementation-Title of source and javadoc jars
so that the title indicates that's what they are. Rather than using
the project's description as the title (as is done for the main jar),
the titles for source and javadoc jars will now be "Source for
${project.name}" and "Javadoc for ${project.name}" respectively.

Closes gh-23974
4 years ago
Phillip Webb fe28ad88db Merge branch '2.3.x' 4 years ago
Phillip Webb 33d66b7f82 Fix to spring-doc-resources version
See gh-23824
4 years ago
Phillip Webb 98dbfd572f Merge branch '2.3.x'
Closes gh-23971
4 years ago
Phillip Webb 2992f40222 Upgrade to spring-doc-resources 0.2.3.RELEASE
Closes gh-23824
4 years ago
Andy Wilkinson dcb42c36f9 Ensure that additional metadata is available to annotation processor
Fixes gh-23934
4 years ago
Andy Wilkinson 3be4e225e7 Merge branch '2.3.x'
Closes gh-23954
4 years ago
Andy Wilkinson 9b12d2d7cb Ensure that additional metadata is available to annotation processor
Fixes gh-23934
4 years ago
Andy Wilkinson 1c4b4cb0cd Provide config properties for configuring WebFlux's locale resolution
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.

This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.

Closes gh-23449
4 years ago