Skip to content

Commit

Permalink
Bump maven-artifact-transfer from 0.9.0 to 0.13.1
Browse files Browse the repository at this point in the history
Bumps [maven-artifact-transfer](https://github.com/apache/maven-artifact-transfer) from 0.9.0 to 0.13.1.
- [Release notes](https://github.com/apache/maven-artifact-transfer/releases)
- [Commits](apache/maven-artifact-transfer@maven-artifact-transfer-0.9.0...maven-artifact-transfer-0.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and slachiewicz committed Aug 13, 2021
1 parent c4b70b5 commit 0294df2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -157,7 +157,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>0.9.0</version>
<version>0.13.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java
Expand Up @@ -52,11 +52,11 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.codehaus.mojo.flatten.cifriendly.CiInterpolator;
import org.codehaus.mojo.flatten.model.resolution.FlattenModelResolver;
import org.codehaus.plexus.util.StringUtils;
Expand Down Expand Up @@ -297,7 +297,7 @@ public class FlattenMojo
* </tr>
* <tr>
* <td>resolveCiFriendliesOnly</td>
* <td>Only resolves variables revision, sha1 and changelist. Keeps everything else.
* <td>Only resolves variables revision, sha1 and changelist. Keeps everything else.
* See <a href="https://maven.apache.org/maven-ci-friendly.html">Maven CI Friendly</a> for further details.</td>
* </tr>
* </tbody>
Expand Down
Expand Up @@ -33,9 +33,9 @@
import org.apache.maven.model.resolution.UnresolvableModelException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
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.transfer.artifact.resolve.ArtifactResult;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;

import java.io.File;
import java.util.List;
Expand Down
@@ -0,0 +1,5 @@
package org.apache.maven.shared.transfer.dependencies.resolve.internal;

public class DefaultTestDependencyResolver extends DefaultDependencyResolver
{
}
Expand Up @@ -37,7 +37,8 @@
import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependencies.resolve.internal.DefaultDependencyResolver;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.transfer.dependencies.resolve.internal.DefaultTestDependencyResolver;
import org.codehaus.mojo.flatten.model.resolution.FlattenModelResolver;
import org.junit.Test;

Expand Down Expand Up @@ -82,7 +83,7 @@ public void testCreateEffectivePom()
setDeclaredField( artifactFactory, "artifactHandlerManager", artifactHandlerManager );
Map<String, ArtifactHandler> artifactHandlers = new HashMap<String, ArtifactHandler>();
setDeclaredField( artifactHandlerManager, "artifactHandlers", artifactHandlers );
DefaultDependencyResolver depencencyResolver = new DefaultDependencyResolver();
DependencyResolver depencencyResolver = new DefaultTestDependencyResolver();
DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest();
FlattenModelResolver resolver = new FlattenModelResolver( localRepository, artifactFactory,
depencencyResolver, projectBuildingRequest, Collections.<MavenProject>emptyList() );
Expand Down

0 comments on commit 0294df2

Please sign in to comment.