This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch dropOldPlexus in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit c1609bb86417c74b40c5dd7b048d2bf4971d99fd Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Oct 19 17:08:15 2025 +0200 Drop old Plexus and replace with org.eclipse.sisu.plexus --- .../maven/plugins/site/AbstractSiteMojo.java | 7 +++--- .../plugins/site/deploy/AbstractDeployMojo.java | 29 +++++++++++----------- .../site/render/AbstractSiteRenderingMojo.java | 10 +++++--- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java b/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java index 44fe1adb..75f6e9f3 100644 --- a/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java @@ -18,12 +18,13 @@ */ package org.apache.maven.plugins.site; +import javax.inject.Inject; + import java.util.List; import java.util.Locale; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.i18n.I18N; @@ -54,13 +55,13 @@ public abstract class AbstractSiteMojo extends AbstractMojo { /** * SiteTool. */ - @Component + @Inject protected SiteTool siteTool; /** * Internationalization. */ - @Component + @Inject protected I18N i18n; /** diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java index 204f2fc6..f280cdd0 100644 --- a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java @@ -18,11 +18,14 @@ */ package org.apache.maven.plugins.site.deploy; +import javax.inject.Inject; + import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.List; import java.util.Locale; +import java.util.Map; import org.apache.maven.doxia.site.inheritance.URIPathDescriptor; import org.apache.maven.doxia.tools.SiteTool; @@ -31,7 +34,6 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Site; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.site.AbstractSiteMojo; import org.apache.maven.project.MavenProject; @@ -53,8 +55,6 @@ import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.observers.Debug; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.repository.Repository; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; /** * Abstract base class for deploy mojos. @@ -123,10 +123,10 @@ public abstract class AbstractDeployMojo extends AbstractSiteMojo { private Site deploySite; - @Component - private PlexusContainer container; + @Inject + private Map<String, Wagon> wagons; - @Component + @Inject SettingsDecrypter settingsDecrypter; /** @@ -277,16 +277,15 @@ public abstract class AbstractDeployMojo extends AbstractSiteMojo { if (protocol == null) { throw new MojoExecutionException("Unspecified protocol"); } - try { - Wagon wagon = container.lookup(Wagon.class, protocol.toLowerCase(Locale.ROOT)); - if (!wagon.supportsDirectoryCopy()) { - throw new MojoExecutionException( - "Wagon protocol '" + repository.getProtocol() + "' doesn't support directory copying"); - } - return wagon; - } catch (ComponentLookupException e) { - throw new MojoExecutionException("Cannot find wagon which supports the requested protocol: " + protocol, e); + Wagon wagon = wagons.get(protocol.toLowerCase(Locale.ROOT)); + if (wagon == null) { + throw new MojoExecutionException("Cannot find wagon which supports the requested protocol: " + protocol); + } + if (!wagon.supportsDirectoryCopy()) { + throw new MojoExecutionException( + "Wagon protocol '" + repository.getProtocol() + "' doesn't support directory copying"); } + return wagon; } public AuthenticationInfo getAuthenticationInfo(String id) { diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java index 9628c6bb..72270446 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java @@ -20,6 +20,7 @@ package org.apache.maven.plugins.site.render; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -57,7 +58,6 @@ import org.apache.maven.reporting.MavenReportException; import org.apache.maven.reporting.exec.MavenReportExecution; import org.apache.maven.reporting.exec.MavenReportExecutor; import org.apache.maven.reporting.exec.MavenReportExecutorRequest; -import org.codehaus.plexus.util.ReaderFactory; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; @@ -192,7 +192,9 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo * @return The input files encoding, never <code>null</code>. */ protected String getInputEncoding() { - return (inputEncoding == null || inputEncoding.isEmpty()) ? ReaderFactory.FILE_ENCODING : inputEncoding; + return (inputEncoding == null || inputEncoding.isEmpty()) + ? Charset.defaultCharset().displayName() + : inputEncoding; } /** @@ -215,8 +217,8 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo protected void checkInputEncoding() { if (inputEncoding == null || inputEncoding.isEmpty()) { - getLog().warn("Input file encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING - + ", i.e. build is platform dependent!"); + getLog().warn("Input file encoding has not been set, using platform encoding " + + Charset.defaultCharset().displayName() + ", i.e. build is platform dependent!"); } }
