Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7666] Update default binding and lifecycle plugin versions (#956) 

Finally use 3.x plugins for all.

---

https://issues.apache.org/jira/browse/MNG-7666
This commit is contained in:
Tamas Cservenak 2023-01-16 14:30:48 +01:00 committed by GitHub
parent 2fba4471c9
commit 01ba8291cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
View File

@ -28,12 +28,12 @@ import javax.inject.Singleton;
@Named(CleanLifecycleProvider.LIFECYCLE_ID) @Named(CleanLifecycleProvider.LIFECYCLE_ID)
@Singleton @Singleton
public final class CleanLifecycleProvider extends AbstractLifecycleProvider { public final class CleanLifecycleProvider extends AbstractLifecycleProvider {
protected static final String LIFECYCLE_ID = "clean"; static final String LIFECYCLE_ID = "clean";
// START SNIPPET: clean // START SNIPPET: clean
private static final String[] PHASES = {"pre-clean", "clean", "post-clean"}; private static final String[] PHASES = {"pre-clean", "clean", "post-clean"};
private static final String MAVEN_CLEAN_PLUGIN_VERSION = "3.1.0"; private static final String MAVEN_CLEAN_PLUGIN_VERSION = "3.2.0";
private static final String[] BINDINGS = { private static final String[] BINDINGS = {
"clean", "org.apache.maven.plugins:maven-clean-plugin:" + MAVEN_CLEAN_PLUGIN_VERSION + ":clean" "clean", "org.apache.maven.plugins:maven-clean-plugin:" + MAVEN_CLEAN_PLUGIN_VERSION + ":clean"

2
maven-core/src/main/java/org/apache/maven/lifecycle/providers/DefaultLifecycleProvider.java
View File

@ -28,7 +28,7 @@ import javax.inject.Singleton;
@Named(DefaultLifecycleProvider.LIFECYCLE_ID) @Named(DefaultLifecycleProvider.LIFECYCLE_ID)
@Singleton @Singleton
public final class DefaultLifecycleProvider extends AbstractLifecycleProvider { public final class DefaultLifecycleProvider extends AbstractLifecycleProvider {
protected static final String LIFECYCLE_ID = "default"; static final String LIFECYCLE_ID = "default";
// START SNIPPET: default // START SNIPPET: default
private static final String[] PHASES = { private static final String[] PHASES = {

8
maven-core/src/main/java/org/apache/maven/lifecycle/providers/SiteLifecycleProvider.java
View File

@ -28,14 +28,16 @@ import javax.inject.Singleton;
@Named(SiteLifecycleProvider.LIFECYCLE_ID) @Named(SiteLifecycleProvider.LIFECYCLE_ID)
@Singleton @Singleton
public final class SiteLifecycleProvider extends AbstractLifecycleProvider { public final class SiteLifecycleProvider extends AbstractLifecycleProvider {
protected static final String LIFECYCLE_ID = "site"; static final String LIFECYCLE_ID = "site";
// START SNIPPET: site // START SNIPPET: site
private static final String[] PHASES = {"pre-site", "site", "post-site", "site-deploy"}; private static final String[] PHASES = {"pre-site", "site", "post-site", "site-deploy"};
private static final String MAVEN_SITE_PLUGIN_VERSION = "3.12.1";
private static final String[] BINDINGS = { private static final String[] BINDINGS = {
"site", "org.apache.maven.plugins:maven-site-plugin:3.9.1:site", "site", "org.apache.maven.plugins:maven-site-plugin:" + MAVEN_SITE_PLUGIN_VERSION + ":site",
"site-deploy", "org.apache.maven.plugins:maven-site-plugin:3.9.1:deploy" "site-deploy", "org.apache.maven.plugins:maven-site-plugin:" + MAVEN_SITE_PLUGIN_VERSION + ":deploy"
}; };
// END SNIPPET: site // END SNIPPET: site

8
maven-core/src/main/java/org/apache/maven/lifecycle/providers/WrapperLifecycleProvider.java
View File

@ -28,12 +28,16 @@ import javax.inject.Singleton;
@Named(WrapperLifecycleProvider.LIFECYCLE_ID) @Named(WrapperLifecycleProvider.LIFECYCLE_ID)
@Singleton @Singleton
public final class WrapperLifecycleProvider extends AbstractLifecycleProvider { public final class WrapperLifecycleProvider extends AbstractLifecycleProvider {
protected static final String LIFECYCLE_ID = "wrapper"; static final String LIFECYCLE_ID = "wrapper";
// START SNIPPET: wrapper // START SNIPPET: wrapper
private static final String[] PHASES = {"wrapper"}; private static final String[] PHASES = {"wrapper"};
private static final String[] BINDINGS = {"wrapper", "org.apache.maven.plugins:maven-wrapper-plugin:3.1.0:wrapper"}; private static final String MAVEN_WRAPPER_PLUGIN_VERSION = "3.1.1";
private static final String[] BINDINGS = {
"wrapper", "org.apache.maven.plugins:maven-wrapper-plugin:" + MAVEN_WRAPPER_PLUGIN_VERSION + ":wrapper"
};
// END SNIPPET: wrapper // END SNIPPET: wrapper
@Inject @Inject

22
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
View File

@ -34,29 +34,29 @@ import static java.util.Objects.requireNonNull;
* Base lifecycle mapping provider, ie per-packaging plugin bindings for {@code default} lifecycle. * Base lifecycle mapping provider, ie per-packaging plugin bindings for {@code default} lifecycle.
*/ */
public abstract class AbstractLifecycleMappingProvider implements Provider<LifecycleMapping> { public abstract class AbstractLifecycleMappingProvider implements Provider<LifecycleMapping> {
protected static final String RESOURCES_PLUGIN_VERSION = "3.2.0"; protected static final String RESOURCES_PLUGIN_VERSION = "3.3.0";
protected static final String COMPILER_PLUGIN_VERSION = "3.8.1"; protected static final String COMPILER_PLUGIN_VERSION = "3.10.1";
protected static final String SUREFIRE_PLUGIN_VERSION = "3.0.0-M5"; protected static final String SUREFIRE_PLUGIN_VERSION = "3.0.0-M8";
protected static final String INSTALL_PLUGIN_VERSION = "3.0.0-M1"; protected static final String INSTALL_PLUGIN_VERSION = "3.1.0";
protected static final String DEPLOY_PLUGIN_VERSION = "3.0.0-M2"; protected static final String DEPLOY_PLUGIN_VERSION = "3.0.0";
// packaging // packaging
protected static final String JAR_PLUGIN_VERSION = "3.2.0"; protected static final String JAR_PLUGIN_VERSION = "3.3.0";
protected static final String EAR_PLUGIN_VERSION = "3.1.2"; protected static final String EAR_PLUGIN_VERSION = "3.3.0";
protected static final String EJB_PLUGIN_VERSION = "3.1.0"; protected static final String EJB_PLUGIN_VERSION = "3.2.1";
protected static final String PLUGIN_PLUGIN_VERSION = "3.6.0"; protected static final String PLUGIN_PLUGIN_VERSION = "3.7.1";
protected static final String RAR_PLUGIN_VERSION = "2.4"; // TODO: Update!!! protected static final String RAR_PLUGIN_VERSION = "3.0.0";
protected static final String WAR_PLUGIN_VERSION = "3.3.1"; protected static final String WAR_PLUGIN_VERSION = "3.3.2";
private final LifecycleMapping lifecycleMapping; private final LifecycleMapping lifecycleMapping;