From 9bb0663bba64dce6e308f4ffd204a1870534b4e8 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 10 Mar 2023 08:54:03 +0100 Subject: [PATCH 1/2] Upgrade lifecycle plugins to 4.x --- .../maven/internal/impl/DefaultLifecycleRegistry.java | 2 +- .../packaging/AbstractLifecycleMappingProvider.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java index acd8fd74c2f9..e264fae0d301 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java +++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java @@ -219,7 +219,7 @@ static class WrapperLifecycleProvider extends BaseLifecycleProvider { static class CleanLifecycle implements Lifecycle { - private static final String MAVEN_CLEAN_PLUGIN_VERSION = "3.2.0"; + private static final String MAVEN_CLEAN_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; @Override public String id() { diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java index ab1e212bbab8..76a9b432b121 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java @@ -35,25 +35,25 @@ */ public abstract class AbstractLifecycleMappingProvider implements Provider { // START SNIPPET: versions - protected static final String RESOURCES_PLUGIN_VERSION = "3.3.1"; + protected static final String RESOURCES_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; - protected static final String COMPILER_PLUGIN_VERSION = "3.13.0"; + protected static final String COMPILER_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; protected static final String SUREFIRE_PLUGIN_VERSION = "3.2.5"; - protected static final String INSTALL_PLUGIN_VERSION = "3.1.1"; + protected static final String INSTALL_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; protected static final String DEPLOY_PLUGIN_VERSION = "3.1.1"; // packaging - protected static final String JAR_PLUGIN_VERSION = "3.4.1"; + protected static final String JAR_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; protected static final String EAR_PLUGIN_VERSION = "3.3.0"; protected static final String EJB_PLUGIN_VERSION = "3.2.1"; - protected static final String PLUGIN_PLUGIN_VERSION = "3.12.0"; + protected static final String PLUGIN_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; protected static final String RAR_PLUGIN_VERSION = "3.0.0"; From 40513e2b3be92c179003ca0d6ed3a64f16645fc0 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 2 Jul 2024 08:52:18 +0200 Subject: [PATCH 2/2] Upgrade to released versions --- .../internal/impl/DefaultLifecycleRegistry.java | 2 +- .../packaging/AbstractLifecycleMappingProvider.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java index e264fae0d301..b5dd5c8964bd 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java +++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java @@ -219,7 +219,7 @@ static class WrapperLifecycleProvider extends BaseLifecycleProvider { static class CleanLifecycle implements Lifecycle { - private static final String MAVEN_CLEAN_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + private static final String MAVEN_CLEAN_PLUGIN_VERSION = "4.0.0-beta-1"; @Override public String id() { diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java index 76a9b432b121..0dbb005781dd 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java @@ -35,25 +35,25 @@ */ public abstract class AbstractLifecycleMappingProvider implements Provider { // START SNIPPET: versions - protected static final String RESOURCES_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + protected static final String RESOURCES_PLUGIN_VERSION = "4.0.0-beta-1"; - protected static final String COMPILER_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + protected static final String COMPILER_PLUGIN_VERSION = "4.0.0-beta-1"; protected static final String SUREFIRE_PLUGIN_VERSION = "3.2.5"; - protected static final String INSTALL_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + protected static final String INSTALL_PLUGIN_VERSION = "4.0.0-beta-1"; - protected static final String DEPLOY_PLUGIN_VERSION = "3.1.1"; + protected static final String DEPLOY_PLUGIN_VERSION = "4.0.0-beta-1"; // packaging - protected static final String JAR_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + protected static final String JAR_PLUGIN_VERSION = "4.0.0-beta-1"; protected static final String EAR_PLUGIN_VERSION = "3.3.0"; protected static final String EJB_PLUGIN_VERSION = "3.2.1"; - protected static final String PLUGIN_PLUGIN_VERSION = "4.0.0-SNAPSHOT"; + protected static final String PLUGIN_PLUGIN_VERSION = "4.0.0-beta-1"; protected static final String RAR_PLUGIN_VERSION = "3.0.0";