You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:11 UTC
[maven-linkcheck-plugin] branch mvn4 created (now a930c87)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git.
at a930c87 mvn4 aggregator
This branch includes the following new commits:
new a930c87 mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-linkcheck-plugin] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
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-linkcheck-plugin.git
commit a930c87ddbd8b06880ffd0a48b598cff6e05c4a4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:09 2022 +0100
mvn4 aggregator
---
pom.xml | 28 +++++++++++++++-------
.../maven/plugins/linkcheck/SiteInvoker.java | 12 +---------
src/main/resources/linkcheck-report.properties | 2 ++
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19b86da..b52bdbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
@@ -62,10 +62,10 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>1.9.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.9.2</doxia-sitetoolsVersion>
- <mavenVersion>2.2.1</mavenVersion>
- <javaVersion>7</javaVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-16T16:07:00Z</project.build.outputTimestamp>
</properties>
@@ -88,7 +88,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -104,7 +104,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>${mavenVersion}</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -114,7 +114,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<!-- doxia -->
@@ -128,7 +128,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
+ <version>${doxiaSitetoolsVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -175,6 +175,16 @@ under the License.
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>reporting</id>
diff --git a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
index 38eab4d..99e595e 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
@@ -105,17 +105,7 @@ public class SiteInvoker
FileUtils.createTempFile( "invoker-site-plugin", ".txt", new File( project.getBuild().getDirectory() ) );
// clone project and set a new reporting output dir
- MavenProject clone;
- try
- {
- clone = (MavenProject) project.clone();
- }
- catch ( CloneNotSupportedException e )
- {
- IOException ioe = new IOException( "CloneNotSupportedException: " + e.getMessage() );
- ioe.setStackTrace( e.getStackTrace() );
- throw ioe;
- }
+ MavenProject clone = project.clone();
// MLINKCHECK-1
if ( clone.getOriginalModel().getReporting() == null )
diff --git a/src/main/resources/linkcheck-report.properties b/src/main/resources/linkcheck-report.properties
index becb8bb..91a6ab6 100644
--- a/src/main/resources/linkcheck-report.properties
+++ b/src/main/resources/linkcheck-report.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.linkcheck.name=Linkcheck
report.linkcheck.description=This is a link to the Linkcheck report.
report.linkcheck.title=Linkcheck