This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
The following commit(s) were added to refs/heads/master by this push: new e4cf66c updated parent pom and maven-reporting-impl e4cf66c is described below commit e4cf66c9a3351f44edc1cd64c48bc0e819605e8a Author: Hervé Boutemy <hbout...@apache.org> AuthorDate: Sat Aug 25 23:49:49 2018 +0200 updated parent pom and maven-reporting-impl --- pom.xml | 9 +++++++-- src/it/check-site-report/pom.xml | 8 +++++++- src/it/check-source-release-report/pom.xml | 8 +++++++- src/it/list-plugins-prerequisites/pom.xml | 8 +++++++- .../java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java | 2 +- .../java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java | 2 +- .../maven/dist/tools/source/DistCheckSourceReleaseMojo.java | 2 +- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1510146..958c8fb 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>31</version> + <version>32</version> <relativePath>../../../pom/maven/pom.xml</relativePath> </parent> @@ -80,13 +80,18 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${mvnversion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> <version>${mvnversion}</version> </dependency> <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>2.3</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>org.eclipse.aether</groupId> diff --git a/src/it/check-site-report/pom.xml b/src/it/check-site-report/pom.xml index 0a87931..0c25dd7 100644 --- a/src/it/check-site-report/pom.xml +++ b/src/it/check-site-report/pom.xml @@ -11,9 +11,15 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven</groupId> + <artifactId>maven-parent</artifactId> + <version>32</version> + </parent> + <groupId>org.apache.maven.dist.tools.its</groupId> <artifactId>check-site-report</artifactId> <version>0.0.1-SNAPSHOT</version> diff --git a/src/it/check-source-release-report/pom.xml b/src/it/check-source-release-report/pom.xml index e75bb8f..03efa1d 100644 --- a/src/it/check-source-release-report/pom.xml +++ b/src/it/check-source-release-report/pom.xml @@ -11,9 +11,15 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven</groupId> + <artifactId>maven-parent</artifactId> + <version>32</version> + </parent> + <groupId>org.apache.maven.dist.tools.its</groupId> <artifactId>check-source-release-report</artifactId> <version>0.0.1-SNAPSHOT</version> diff --git a/src/it/list-plugins-prerequisites/pom.xml b/src/it/list-plugins-prerequisites/pom.xml index 7b086c4..d797b8f 100644 --- a/src/it/list-plugins-prerequisites/pom.xml +++ b/src/it/list-plugins-prerequisites/pom.xml @@ -11,9 +11,15 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven</groupId> + <artifactId>maven-parent</artifactId> + <version>32</version> + </parent> + <groupId>org.apache.maven.dist.tools.its</groupId> <artifactId>check-prerequisites-site-report</artifactId> <version>0.0.1-SNAPSHOT</version> diff --git a/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java b/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java index 30eb29d..82e4416 100644 --- a/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java +++ b/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java @@ -26,7 +26,7 @@ import java.util.Locale; import org.apache.maven.dist.tools.index.DistCheckIndexPageMojo; import org.apache.maven.dist.tools.site.DistCheckSiteMojo; import org.apache.maven.dist.tools.source.DistCheckSourceReleaseMojo; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.reporting.MavenReportException; diff --git a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java index 6fed550..14c6c63 100644 --- a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java +++ b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java @@ -32,7 +32,7 @@ import org.apache.maven.dist.tools.AbstractDistCheckMojo; import org.apache.maven.dist.tools.ConfigurationLineInfo; import org.apache.maven.dist.tools.JsoupRetry; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; diff --git a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java index 1967f7d..eb9fa8a 100644 --- a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java +++ b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java @@ -33,7 +33,7 @@ import org.apache.maven.dist.tools.ConfigurationLineInfo; import org.apache.maven.dist.tools.JsoupRetry; import org.apache.maven.doxia.markup.HtmlMarkup; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter;