You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
2.8 KiB
52 lines
2.8 KiB
9 months ago
|
From 943f668d4326a2ef174bcf6ce86ec347aff3487d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karl Heinz Marbaise <khmarbaise@apache.org>
|
||
|
|
Date: Sun, 26 May 2019 12:05:14 +0200
|
||
|
|
Subject: [PATCH] [MASSEMBLY-911] - Upgrade maven-artifact-transfer 0.11.0
|
||
|
|
|
||
|
|
---
|
||
|
|
pom.xml | 2 +-
|
||
|
|
.../repository/DefaultRepositoryAssembler.java | 14 +++++++-------
|
||
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pom.xml b/pom.xml
|
||
|
|
index e5eb3a34..6acf3c5f 100644
|
||
|
|
--- a/pom.xml
|
||
|
|
+++ b/pom.xml
|
||
|
|
@@ -116,7 +116,7 @@ under the License.
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.apache.maven.shared</groupId>
|
||
|
|
<artifactId>maven-artifact-transfer</artifactId>
|
||
|
|
- <version>0.9.0</version>
|
||
|
|
+ <version>0.11.0</version>
|
||
|
|
</dependency>
|
||
|
|
|
||
|
|
<dependency>
|
||
|
|
diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||
|
|
index 31318b0f..ffc6b120 100644
|
||
|
|
--- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||
|
|
+++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||
|
|
@@ -36,16 +36,16 @@
|
||
|
|
import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
|
||
|
|
import org.apache.maven.project.MavenProject;
|
||
|
|
import org.apache.maven.project.ProjectBuildingRequest;
|
||
|
|
-import org.apache.maven.shared.artifact.TransferUtils;
|
||
|
|
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
|
||
|
|
import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
|
||
|
|
import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
|
||
|
|
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
|
||
|
|
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
|
||
|
|
-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
|
||
|
|
-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.transfer.artifact.TransferUtils;
|
||
|
|
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
|
||
|
|
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
|
||
|
|
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
|
||
|
|
+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.apache.maven.shared.utils.io.FileUtils;
|
||
|
|
import org.codehaus.plexus.component.annotations.Component;
|
||
|
|
import org.codehaus.plexus.component.annotations.Requirement;
|