You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/11/23 20:02:27 UTC

[maven-dependency-plugin] branch MDEP-568 created (now fc2264b)

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

rfscholte pushed a change to branch MDEP-568
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.


      at fc2264b  fixed MDEP-568: instead of relying on "requiresDependencyResolution" to download artifacts, download the artifacts in the plugin code after filtering them with the provided parameters.

This branch includes the following new commits:

     new fc2264b  fixed MDEP-568: instead of relying on "requiresDependencyResolution" to download artifacts, download the artifacts in the plugin code after filtering them with the provided parameters.

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-dependency-plugin] 01/01: fixed MDEP-568: instead of relying on "requiresDependencyResolution" to download artifacts, download the artifacts in the plugin code after filtering them with the provided parameters.

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MDEP-568
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git

commit fc2264b1b8faf44923ca0e6a2950c69ef4ee4c9e
Author: Andreas Janning <an...@qaware.de>
AuthorDate: Mon Jul 16 16:20:11 2018 -0700

    fixed MDEP-568: instead of relying on "requiresDependencyResolution" to download artifacts, download the artifacts in the plugin code after filtering them with the provided parameters.
---
 .../mdep-568-go-offline-exclude/invoker.properties | 18 +++++++
 .../projects/mdep-568-go-offline-exclude/pom.xml   | 57 ++++++++++++++++++++++
 .../mdep-568-go-offline-exclude/test.properties    | 19 ++++++++
 .../dependency/resolvers/GoOfflineMojo.java        | 41 ++++++++++++----
 4 files changed, 126 insertions(+), 9 deletions(-)

diff --git a/src/it/projects/mdep-568-go-offline-exclude/invoker.properties b/src/it/projects/mdep-568-go-offline-exclude/invoker.properties
new file mode 100644
index 0000000..e596121
--- /dev/null
+++ b/src/it/projects/mdep-568-go-offline-exclude/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:go-offline
diff --git a/src/it/projects/mdep-568-go-offline-exclude/pom.xml b/src/it/projects/mdep-568-go-offline-exclude/pom.xml
new file mode 100644
index 0000000..a69b7b8
--- /dev/null
+++ b/src/it/projects/mdep-568-go-offline-exclude/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the 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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.dependency</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Test</name>
+  <description>
+    Test dependency:go-offline
+  </description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>non.existant.group</groupId>
+      <artifactId>fake</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>non.existant.artifact</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/src/it/projects/mdep-568-go-offline-exclude/test.properties b/src/it/projects/mdep-568-go-offline-exclude/test.properties
new file mode 100644
index 0000000..6e8a5e5
--- /dev/null
+++ b/src/it/projects/mdep-568-go-offline-exclude/test.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+excludeGroupIds = non.existant.group
+excludeArtifactIds= non.existant.artifact
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
index df74357..8ef7efe 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
@@ -21,13 +21,15 @@ package org.apache.maven.plugins.dependency.resolvers;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.dependency.utils.DependencyUtil;
 import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugins.dependency.utils.DependencyUtil;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
-
-import java.util.Set;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
 
 /**
  * Goal that resolves all project dependencies, including plugins and reports and their dependencies.
@@ -35,14 +37,24 @@ import java.util.Set;
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @since 2.0
  */
-@Mojo( name = "go-offline", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
+@Mojo( name = "go-offline", requiresDependencyCollection = ResolutionScope.TEST, threadSafe = true )
 @Execute( goal = "resolve-plugins" )
 public class GoOfflineMojo
     extends AbstractResolveMojo
 {
 
     /**
-     * Main entry into mojo. Gets the list of dependencies and iterates through displaying the resolved version.
+     * Include parent poms in the dependency resolution list.
+     *
+     * @since 3.1.2
+     */
+    @Parameter( property = "includeParents", defaultValue = "false" )
+    private boolean includeParents;
+
+    /**
+     * Main entry into mojo. Gets the list of dependencies, filters them by the include/exclude parameters
+     * provided and iterates through downloading the resolved version.
+     * if the version is not present in the local repository.
      *
      * @throws MojoExecutionException with a message if an error occurs.
      */
@@ -50,13 +62,24 @@ public class GoOfflineMojo
     protected void doExecute()
         throws MojoExecutionException
     {
-        Set<Artifact> artifacts = getProject().getArtifacts();
 
-        if ( !isSilent() )
+        DependencyStatusSets results = this.getDependencySets( false, includeParents );
+
+        ProjectBuildingRequest buildingRequest = newResolveArtifactProjectBuildingRequest();
+        for ( Artifact artifact : results.getResolvedDependencies() )
         {
-            for ( Artifact artifact : artifacts )
+            try
+            {
+                getArtifactResolver().resolveArtifact( buildingRequest, artifact );
+                if ( !isSilent() )
+                {
+                    this.getLog().info( "Resolved: "
+                            + DependencyUtil.getFormattedFileName( artifact, false ) );
+                }
+            }
+            catch ( ArtifactResolverException e )
             {
-                this.getLog().info( "Resolved: " + DependencyUtil.getFormattedFileName( artifact, false ) );
+                throw new MojoExecutionException( "Failed to resolve artifact: " + artifact, e );
             }
         }
     }