Author: rfscholte
Date: Wed Mar 11 20:56:11 2015
New Revision: 1666011
URL: http://svn.apache.org/r1666011
Log:
Use RepositorySystem, which validates the session first before calling the
Deployer
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java?rev=1666011&r1=1666010&r2=1666011&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
Wed Mar 11 20:56:11 2015
@@ -26,11 +26,11 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.deployment.DeployRequest;
import org.sonatype.aether.deployment.DeploymentException;
-import org.sonatype.aether.impl.Deployer;
import org.sonatype.aether.metadata.Metadata;
import org.sonatype.aether.metadata.Metadata.Nature;
import org.sonatype.aether.util.artifact.DefaultArtifact;
@@ -42,7 +42,7 @@ public class Maven30ArtifactDeployer
{
@Requirement
- private Deployer deployer;
+ private RepositorySystem repositorySystem;
public void deploy( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
@@ -78,7 +78,7 @@ public class Maven30ArtifactDeployer
// deploy
try
{
- deployer.deploy( session, request );
+ repositorySystem.deploy( session, request );
}
catch ( DeploymentException e )
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java?rev=1666011&r1=1666010&r2=1666011&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
Wed Mar 11 20:56:11 2015
@@ -26,12 +26,12 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.deployment.DeployRequest;
import org.eclipse.aether.deployment.DeploymentException;
-import org.eclipse.aether.impl.Deployer;
import org.eclipse.aether.metadata.DefaultMetadata;
import org.eclipse.aether.metadata.Metadata;
import org.eclipse.aether.metadata.Metadata.Nature;
@@ -41,7 +41,7 @@ public class Maven31ArtifactDeployer imp
{
@Requirement
- private Deployer deployer;
+ private RepositorySystem repositorySystem;
public void deploy( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.artifact.Artifact>
mavenArtifacts )
@@ -76,7 +76,7 @@ public class Maven31ArtifactDeployer imp
// deploy
try
{
- deployer.deploy( session, request );
+ repositorySystem.deploy( session, request );
}
catch ( DeploymentException e )
{
