This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/mvn4 by this push:
new 75ba4b3 Switch a few core plugins to the new api
75ba4b3 is described below
commit 75ba4b3ac18a3cbe0ca17b7d72591525f72fa04b
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Feb 24 17:00:56 2022 +0100
Switch a few core plugins to the new api
---
pom.xml | 4 ++--
.../org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java | 3 +--
.../apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java | 1 -
src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java | 3 +--
src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java | 3 +--
src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java | 3 +--
src/main/resources/site-plugin.properties | 2 ++
src/main/resources/site-plugin_ca.properties | 2 ++
src/main/resources/site-plugin_cs.properties | 2 ++
src/main/resources/site-plugin_da.properties | 2 ++
src/main/resources/site-plugin_de.properties | 2 ++
src/main/resources/site-plugin_es.properties | 2 ++
src/main/resources/site-plugin_fr.properties | 2 ++
src/main/resources/site-plugin_gl.properties | 2 ++
src/main/resources/site-plugin_hu.properties | 2 ++
src/main/resources/site-plugin_it.properties | 2 ++
src/main/resources/site-plugin_ja.properties | 2 ++
src/main/resources/site-plugin_ko.properties | 2 ++
src/main/resources/site-plugin_lt.properties | 2 ++
src/main/resources/site-plugin_nl.properties | 2 ++
src/main/resources/site-plugin_no.properties | 2 ++
src/main/resources/site-plugin_pl.properties | 2 ++
src/main/resources/site-plugin_pt.properties | 2 ++
src/main/resources/site-plugin_pt_BR.properties | 2 ++
src/main/resources/site-plugin_ru.properties | 2 ++
src/main/resources/site-plugin_sk.properties | 2 ++
src/main/resources/site-plugin_sv.properties | 2 ++
src/main/resources/site-plugin_tr.properties | 2 ++
src/main/resources/site-plugin_zh_CN.properties | 2 ++
src/main/resources/site-plugin_zh_TW.properties | 2 ++
30 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1ddd445..487fff4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@ under the License.
<javaVersion>8</javaVersion>
<!-- for dependencies -->
<doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>2.0.0-M3-SNAPSHOT</doxiaSitetoolsVersion>
<jettyVersion>9.2.29.v20191105</jettyVersion>
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>2.0.0-M2-SNAPSHOT</scmVersion>
@@ -279,7 +279,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3-SNAPSHOT</version>
</dependency>
<!-- dependencies to annotations -->
diff --git
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
index 879a5b6..99b680d 100644
---
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.StringUtils;
@@ -62,7 +61,7 @@ public class EffectiveSiteMojo
* {@inheritDoc}
*/
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
DecorationModel decorationModel = prepareDecorationModel(
getLocales().get( 0 ) );
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 16398c8..834d109 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
@@ -33,7 +33,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
diff --git
a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
index 26be6d4..feecf14 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
@@ -26,7 +26,6 @@ import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -129,7 +128,7 @@ public class SiteJarMojo
* @see org.apache.maven.plugin.Mojo#execute()
*/
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
if ( skip )
{
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
index f4066d8..0479ad1 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
@@ -34,7 +34,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
@@ -94,7 +93,7 @@ public class SiteMojo
* {@inheritDoc}
*/
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
if ( skip )
{
diff --git a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
index b434698..706301c 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.site.run;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.site.render.AbstractSiteRenderingMojo;
@@ -69,7 +68,7 @@ public class SiteRunMojo
* @see org.apache.maven.plugin.AbstractMojo#execute()
*/
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
checkInputEncoding();
diff --git a/src/main/resources/site-plugin.properties
b/src/main/resources/site-plugin.properties
index d850027..4cd34cd 100644
--- a/src/main/resources/site-plugin.properties
+++ b/src/main/resources/site-plugin.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Description
report.category.column.document = Document
report.category.sectionTitle = Overview
diff --git a/src/main/resources/site-plugin_ca.properties
b/src/main/resources/site-plugin_ca.properties
index fabafae..bccb609 100644
--- a/src/main/resources/site-plugin_ca.properties
+++ b/src/main/resources/site-plugin_ca.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descripci\u00f3
report.category.column.document = Document
report.category.sectionTitle = Resum
diff --git a/src/main/resources/site-plugin_cs.properties
b/src/main/resources/site-plugin_cs.properties
index 994b187..167e8db 100644
--- a/src/main/resources/site-plugin_cs.properties
+++ b/src/main/resources/site-plugin_cs.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Popis
report.category.column.document = Dokument
report.category.sectionTitle = Souhrn
diff --git a/src/main/resources/site-plugin_da.properties
b/src/main/resources/site-plugin_da.properties
index 35a29b8..895d4bf 100644
--- a/src/main/resources/site-plugin_da.properties
+++ b/src/main/resources/site-plugin_da.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Beskrivelse
report.category.column.document = Dokument
report.category.sectionTitle = Oversigt
diff --git a/src/main/resources/site-plugin_de.properties
b/src/main/resources/site-plugin_de.properties
index 32c9c4a..4a85ccd 100644
--- a/src/main/resources/site-plugin_de.properties
+++ b/src/main/resources/site-plugin_de.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Beschreibung
report.category.column.document = Dokument
report.category.sectionTitle = \u00dcbersicht
diff --git a/src/main/resources/site-plugin_es.properties
b/src/main/resources/site-plugin_es.properties
index 8ed2064..8b69ac0 100644
--- a/src/main/resources/site-plugin_es.properties
+++ b/src/main/resources/site-plugin_es.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descripci\u00f3n
report.category.column.document = Documento
report.category.sectionTitle = Resumen
diff --git a/src/main/resources/site-plugin_fr.properties
b/src/main/resources/site-plugin_fr.properties
index 3ff1da8..803e744 100644
--- a/src/main/resources/site-plugin_fr.properties
+++ b/src/main/resources/site-plugin_fr.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Description
report.category.column.document = Document
report.category.sectionTitle = Vue d'ensemble
diff --git a/src/main/resources/site-plugin_gl.properties
b/src/main/resources/site-plugin_gl.properties
index 0cd08ef..05ffd69 100644
--- a/src/main/resources/site-plugin_gl.properties
+++ b/src/main/resources/site-plugin_gl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descrici\u00f3n
report.category.column.document = Documento
report.category.sectionTitle = Resumo
diff --git a/src/main/resources/site-plugin_hu.properties
b/src/main/resources/site-plugin_hu.properties
index d65a2a1..9d8b7bf 100644
--- a/src/main/resources/site-plugin_hu.properties
+++ b/src/main/resources/site-plugin_hu.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Le\u00edr\u00e1s
report.category.column.document = Dokumentum
report.category.sectionTitle = \u00c1ttekint\u00e9s
diff --git a/src/main/resources/site-plugin_it.properties
b/src/main/resources/site-plugin_it.properties
index 9ddd021..4b38ce4 100644
--- a/src/main/resources/site-plugin_it.properties
+++ b/src/main/resources/site-plugin_it.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descrizione
report.category.column.document = Documento
report.category.sectionTitle = Panoramica
diff --git a/src/main/resources/site-plugin_ja.properties
b/src/main/resources/site-plugin_ja.properties
index 8bd6558..98afd0d 100644
--- a/src/main/resources/site-plugin_ja.properties
+++ b/src/main/resources/site-plugin_ja.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = \u8aac\u660e
report.category.column.document = \u6587\u66f8
report.category.sectionTitle = \u6982\u8981
diff --git a/src/main/resources/site-plugin_ko.properties
b/src/main/resources/site-plugin_ko.properties
index ef9f5b7..993bff6 100644
--- a/src/main/resources/site-plugin_ko.properties
+++ b/src/main/resources/site-plugin_ko.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = \uc124\uba85
report.category.column.document = \ubb38\uc11c
report.category.sectionTitle = \uac1c\uc694
diff --git a/src/main/resources/site-plugin_lt.properties
b/src/main/resources/site-plugin_lt.properties
index 977f0f6..7a17221 100644
--- a/src/main/resources/site-plugin_lt.properties
+++ b/src/main/resources/site-plugin_lt.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Apra\u0161ymas
report.category.column.document = Dokumentas
report.category.sectionTitle = \u012Evadas
diff --git a/src/main/resources/site-plugin_nl.properties
b/src/main/resources/site-plugin_nl.properties
index 3fad756..177b235 100644
--- a/src/main/resources/site-plugin_nl.properties
+++ b/src/main/resources/site-plugin_nl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Beschrijving
report.category.column.document = Document
report.category.sectionTitle = Overzicht
diff --git a/src/main/resources/site-plugin_no.properties
b/src/main/resources/site-plugin_no.properties
index c9d4eaa..4aea474 100644
--- a/src/main/resources/site-plugin_no.properties
+++ b/src/main/resources/site-plugin_no.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Beskrivelse
report.category.column.document = Dokument
report.category.sectionTitle = Oversikt
diff --git a/src/main/resources/site-plugin_pl.properties
b/src/main/resources/site-plugin_pl.properties
index a381613..da41f8e 100644
--- a/src/main/resources/site-plugin_pl.properties
+++ b/src/main/resources/site-plugin_pl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Opis
report.category.column.document = Dokument
report.category.sectionTitle = Przegl\u0105d
diff --git a/src/main/resources/site-plugin_pt.properties
b/src/main/resources/site-plugin_pt.properties
index 3d98525..e1fa6de 100644
--- a/src/main/resources/site-plugin_pt.properties
+++ b/src/main/resources/site-plugin_pt.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descrip\u00e7\u00e3o
report.category.column.document = Documento
report.category.sectionTitle = Vis\u00e3o Geral
diff --git a/src/main/resources/site-plugin_pt_BR.properties
b/src/main/resources/site-plugin_pt_BR.properties
index 8967391..413c495 100644
--- a/src/main/resources/site-plugin_pt_BR.properties
+++ b/src/main/resources/site-plugin_pt_BR.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Descri\u00e7\u00e3o
report.category.column.document = Documento
report.category.sectionTitle = Vis\u00e3o Geral
diff --git a/src/main/resources/site-plugin_ru.properties
b/src/main/resources/site-plugin_ru.properties
index 0f36e9b..03ed835 100644
--- a/src/main/resources/site-plugin_ru.properties
+++ b/src/main/resources/site-plugin_ru.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description =
\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
report.category.column.document =
\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442
report.category.sectionTitle = \u041e\u0431\u0437\u043e\u0440
diff --git a/src/main/resources/site-plugin_sk.properties
b/src/main/resources/site-plugin_sk.properties
index 7062767..4058fc4 100644
--- a/src/main/resources/site-plugin_sk.properties
+++ b/src/main/resources/site-plugin_sk.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Popis
report.category.column.document = Dokument
report.category.sectionTitle = Preh\u013ead
diff --git a/src/main/resources/site-plugin_sv.properties
b/src/main/resources/site-plugin_sv.properties
index 4073b7e..d3324c6 100644
--- a/src/main/resources/site-plugin_sv.properties
+++ b/src/main/resources/site-plugin_sv.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Beskrivning
report.category.column.document = Dokument
report.category.sectionTitle = \u00d6versikt
diff --git a/src/main/resources/site-plugin_tr.properties
b/src/main/resources/site-plugin_tr.properties
index df3da99..370414c 100644
--- a/src/main/resources/site-plugin_tr.properties
+++ b/src/main/resources/site-plugin_tr.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = Tan\u00fdm
report.category.column.document = Dok\u00fcman
report.category.sectionTitle = Genel Bak\u00fd\u00fe
diff --git a/src/main/resources/site-plugin_zh_CN.properties
b/src/main/resources/site-plugin_zh_CN.properties
index b9d1537..fa18be3 100644
--- a/src/main/resources/site-plugin_zh_CN.properties
+++ b/src/main/resources/site-plugin_zh_CN.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = \u63cf\u8ff0
report.category.column.document = \u6587\u6863
report.category.sectionTitle = \u6982\u8ff0
diff --git a/src/main/resources/site-plugin_zh_TW.properties
b/src/main/resources/site-plugin_zh_TW.properties
index a18aedc..9db33dd 100644
--- a/src/main/resources/site-plugin_zh_TW.properties
+++ b/src/main/resources/site-plugin_zh_TW.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.category.column.description = \u63cf\u8ff0 (Description)
report.category.column.document = \u6587\u4ef6 (Document)
report.category.sectionTitle = \u6982\u8981 (Overview)
