You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/11/28 00:52:08 UTC

[maven-dist-tool] 04/05: Require Maven 3.6.3

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch misc-fixes
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git

commit a723f003eed3d644d5aea7bb10629035f4e64763
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Nov 27 19:37:12 2020 +0100

    Require Maven 3.6.3
---
 pom.xml                                            | 28 ++++------------------
 .../maven/dist/tools/site/DistCheckSiteMojo.java   | 19 +++++++++++----
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a99cef..8e7f6b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
     <version>34</version>
-    <relativePath>../../../pom/maven/pom.xml</relativePath>
+    <relativePath />
   </parent>
 
   <groupId>org.apache.maven.dist.tools</groupId>
@@ -52,7 +52,7 @@
 
   <properties>
     <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
-    <mvnversion>3.0.5</mvnversion>
+    <mvnversion>3.6.3</mvnversion>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>    
   </properties>
@@ -80,11 +80,6 @@
     </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>
@@ -94,29 +89,14 @@
       <version>3.0.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>0.9.0.M2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>0.9.0.M2</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.4.01</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-aether-provider</artifactId>
+      <artifactId>maven-resolver-provider</artifactId>
       <version>${mvnversion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.2.0</version>
+      <version>${mvnversion}</version>
     </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
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 14c6c63..f708fe6 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
@@ -33,12 +33,15 @@ 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.impl.SinkEventAttributeSet;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.reporting.MavenReportException;
 import org.jsoup.HttpStatusException;
 import org.jsoup.nodes.Document;
@@ -76,10 +79,13 @@ public class DistCheckSiteMojo
     protected ArtifactRepository localRepository;
 
     /**
-     * Maven project builder.
+     * Project builder.
      */
     @Component
-    protected MavenProjectBuilder mavenProjectBuilder;
+    protected ProjectBuilder projectBuilder;
+
+    @Parameter( defaultValue = "${session}", readonly = true )
+    protected MavenSession session;
     
     /**
      * Take screenshot with web browser
@@ -265,8 +271,11 @@ public class DistCheckSiteMojo
         {
             Artifact artifact =
                 artifactFactory.createProjectArtifact( cli.getGroupId(), cli.getArtifactId(), version );
-            MavenProject artifactProject =
-                mavenProjectBuilder.buildFromRepository( artifact, artifactRepositories, localRepository, false );
+            ProjectBuildingRequest request = new DefaultProjectBuildingRequest(
+                    session.getProjectBuildingRequest() )
+                .setRemoteRepositories( artifactRepositories )
+                .setLocalRepository( localRepository );
+            MavenProject artifactProject = projectBuilder.build( artifact, false, request ).getProject();
 
             String siteUrl = sites.get( cli.getArtifactId() );
             if ( siteUrl == null )