From 7283493031c9bb71f47fbb76693e7139ed27c90c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 10:41:39 +0000 Subject: [PATCH] Upgrade to Maven Help Plugin 3.4.0 Closes gh-34687 --- buildSrc/build.gradle | 2 +- .../org/springframework/boot/build/mavenplugin/MavenExec.java | 4 ++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-tools/spring-boot-maven-plugin/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5943581370..b8a2975f63 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1") implementation("com.tngtech.archunit:archunit:1.0.0") implementation("commons-codec:commons-codec:1.13") - implementation("org.apache.maven:maven-embedder:3.6.2") + implementation("org.apache.maven:maven-embedder:3.6.3") implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}") implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}") diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java index 70339d0714..fbbe5d651f 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java @@ -86,8 +86,8 @@ public class MavenExec extends JavaExec { return existing; } return project.getConfigurations().create("maven", (maven) -> { - maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-embedder:3.6.2")); - maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-compat:3.6.2")); + maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-embedder:3.6.3")); + maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-compat:3.6.3")); maven.getDependencies().add(project.getDependencies().create("org.slf4j:slf4j-simple:1.7.5")); maven.getDependencies() .add(project.getDependencies() diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8f1d2ac610..58a5bcdbd2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -862,7 +862,7 @@ bom { ] } } - library("Maven Help Plugin", "3.3.0") { + library("Maven Help Plugin", "3.4.0") { group("org.apache.maven.plugins") { plugins = [ "maven-help-plugin" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index c1cec420e5..32d39e5af5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -137,7 +137,7 @@ task xsdResources(type: Sync) { } prepareMavenBinaries { - versions "3.9.0", "3.8.5", "3.6.3", "3.5.4" + versions "3.9.0", "3.8.5", "3.6.3" } artifacts {