Commit Graph

430 Commits (a7a4e97b3c49e3de624912ff89ae0af583924253)

Author SHA1 Message Date
Andy Wilkinson 51dc02e37b Merge branch '2.5.x'
See gh-28485
3 years ago
Andy Wilkinson 28d323ee3a Merge branch '2.4.x' into 2.5.x
See gh-28484
3 years ago
Andy Wilkinson b9e3660833 Revert running tests in parallel
See gh-19876
3 years ago
Andy Wilkinson c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
3 years ago
Andy Wilkinson 7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
3 years ago
Andy Wilkinson 22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
3 years ago
Phillip Webb 66aa713b85 Merge branch '2.5.x' 3 years ago
Phillip Webb 467e063d4b Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb 8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
3 years ago
Phillip Webb e95b0b5257 Polish 3 years ago
Andy Wilkinson 37a7144426 Merge branch '2.5.x'
Closes gh-28343
3 years ago
Andy Wilkinson 1a30c660f3 Merge branch '2.4.x' into 2.5.x
Closes gh-28342
3 years ago
Andy Wilkinson adb9226dec Prohibit org.apache.geronimo.specs dependencies in our starters
Closes gh-28338
3 years ago
Andy Wilkinson 2d837a6eae Merge branch '2.5.x'
Closes gh-28337
3 years ago
Andy Wilkinson 3800f060b5 Merge branch '2.4.x' into 2.5.x
Closes gh-28336
3 years ago
Andy Wilkinson 2fb8c8d27e Check starters for unnecessary exclusions
Closes gh-28332
3 years ago
Andy Wilkinson 191b50241d Merge branch '2.5.x'
Closes gh-28331
3 years ago
Andy Wilkinson d3037103fe Merge branch '2.4.x' into 2.5.x
Closes gh-28330
3 years ago
Andy Wilkinson 9f13941c2f Prohibit org.jboss.spec.* dependencies
Closes gh-28329
3 years ago
Phillip Webb 2034ad4827 Merge branch '2.5.x' 3 years ago
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb 0561992c2a Update copyright year of changed files 3 years ago
Andy Wilkinson 1a505964ee Merge branch '2.5.x'
Closes gh-28207
3 years ago
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
3 years ago
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
3 years ago
Andy Wilkinson 0b58d4858d Merge branch '2.5.x'
Closes gh-28200
3 years ago
Andy Wilkinson 322615d9c5 Merge branch '2.4.x' into 2.5.x
Closes gh-28199
3 years ago
Andy Wilkinson 8c3820f87e Fix up-to-date checking of syncAppSource tasks
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.

This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.

Closes gh-28197
3 years ago
Andy Wilkinson ea68672594 Merge branch '2.5.x'
Closes gh-28153
3 years ago
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
3 years ago
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
3 years ago
dreis2211 cf0fcafd13 Polish
See gh-27940
3 years ago
Andy Wilkinson 7c034c33e2 Merge branch '2.5.x'
Closes gh-27967
3 years ago
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
3 years ago
Andy Wilkinson 273600bcdd Retain distinction between compile and runtime deps of optional deps
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
3 years ago
Andy Wilkinson 69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
3 years ago
Andy Wilkinson 3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
3 years ago
Andy Wilkinson 9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
3 years ago
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
3 years ago
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
3 years ago
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
3 years ago
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
3 years ago
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
3 years ago
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
3 years ago
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
3 years ago
izeye 07da144826 Use 2012 for copyright beginning year
See gh-27734
3 years ago
Andy Wilkinson 44884cc495 Merge branch '2.5.x'
Closes gh-27752
3 years ago
Andy Wilkinson 10ceb504ae Merge branch '2.4.x' into 2.5.x
Closes gh-27751
3 years ago
Andy Wilkinson 32c184e31c Revert changes made to work around JDK-8156584
Closes gh-26848
3 years ago
Andy Wilkinson af13125796 Merge branch '2.5.x'
Closes gh-27498
3 years ago
Andy Wilkinson 9127588082 Merge branch '2.4.x' into 2.5.x
Closes gh-27497
3 years ago
Andy Wilkinson ea6cb74ccf Ignore Spring Boot when finding dependency upgrades
Closes gh-27447
3 years ago
Andy Wilkinson a5ec7560f5 Merge branch '2.5.x'
Closes gh-27314
3 years ago
dreis2211 e4978f604c Fix JDK 16 pipeline
See gh-27310
3 years ago
Andy Wilkinson 9ccd6a6f2f Merge branch '2.5.x'
Closes gh-27307
3 years ago
Andy Wilkinson 705feeed6a Polish "Allow additional JVM args when running tests via toolchain"
See gh-27089
3 years ago
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain
See gh-27089
3 years ago
Scott Frederick 18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
3 years ago
Andy Wilkinson fcf7240f3c Merge branch '2.5.x'
See gh-27047
3 years ago
Andy Wilkinson f7140d0401 Merge branch '2.4.x' into 2.5.x
See gh-27045
3 years ago
Andy Wilkinson 316d2cce89 Don't offer upgrade for version that is already aligned
See gh-27044
3 years ago
Phillip Webb 6102f10639 Merge branch '2.5.x' 3 years ago
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