You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2019/07/25 02:15:54 UTC
[maven-invoker-plugin] branch master updated: [MINVOKER-244]
Upgrade maven-artifact-transfer to 0.10.1
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b6f1308 [MINVOKER-244] Upgrade maven-artifact-transfer to 0.10.1
b6f1308 is described below
commit b6f130821d4337c1c6f4692d806d804defec8feb
Author: olivier lamy <ol...@apache.org>
AuthorDate: Thu Jul 25 12:14:49 2019 +1000
[MINVOKER-244] Upgrade maven-artifact-transfer to 0.10.1
Signed-off-by: olivier lamy <ol...@apache.org>
---
pom.xml | 2 +-
.../apache/maven/plugins/invoker/AbstractInvokerMojo.java | 2 +-
.../org/apache/maven/plugins/invoker/InstallMojo.java | 15 ++++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index e20cf72..d0ece56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.9.1</version>
+ <version>0.10.1</version>
</dependency>
<!-- Doxia -->
diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
index a916345..4197c86 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
@@ -2596,7 +2596,7 @@ public abstract class AbstractInvokerMojo
*/
private Map<String, Object> getInterpolationValueSource( final boolean escapeXml )
{
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
if ( filterProperties != null )
{
diff --git a/src/main/java/org/apache/maven/plugins/invoker/InstallMojo.java b/src/main/java/org/apache/maven/plugins/invoker/InstallMojo.java
index 295d554..63543c9 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/InstallMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/InstallMojo.java
@@ -44,11 +44,12 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.dependencies.DefaultDependableCoordinate;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.artifact.filter.resolve.PatternExclusionsFilter;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -194,7 +195,6 @@ public class InstallMojo
* apart from the location, the custom repository will be indistinguishable from the real repository such that its
* usage is transparent to the integration tests.
*
- * @return The local repository for the integration tests, never <code>null</code>.
* @throws MojoExecutionException If the repository could not be created.
*/
private void createTestRepository()
@@ -618,7 +618,8 @@ public class InstallMojo
coordinate.setType( type );
coordinate.setClassifier( classifier );
- resolver.resolveDependencies( projectBuildingRequest, coordinate, null );
+ resolver.resolveDependencies( projectBuildingRequest, coordinate,
+ new PatternExclusionsFilter( Collections.<String>emptyList() ) );
}
catch ( DependencyResolverException e )
{