diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 58f42138b4..539cbb7840 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -179,9 +179,9 @@ THE SOFTWARE.
plexus-classworlds
- org.jvnet.hudson
- hudson-maven-artifact-manager
- 1.0
+ org.jenkins-ci.lib
+ lib-jenkins-maven-artifact-manager
+ 1.1
commons-io
diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
index 7466b81b90..0fb692ad72 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
@@ -30,6 +30,8 @@ import hudson.maven.MavenBuildProxy;
import hudson.model.BuildListener;
import hudson.model.FingerprintMap;
import hudson.model.Hudson;
+
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -148,6 +150,7 @@ public final class MavenArtifact implements Serializable {
final String canonicalExtension = canonicalName.substring(canonicalName.lastIndexOf('.')+1);
ArtifactHandler ah = handlerManager.getArtifactHandler(type);
Map handlers = Maps.newHashMap();
+
handlers.put( type, new DefaultArtifactHandler(type) {
public String getExtension() {
return canonicalExtension;
@@ -159,6 +162,7 @@ public final class MavenArtifact implements Serializable {
Artifact a = factory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
a.setFile(getFile(build));
+
return a;
}
diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
index 1b4e99742c..f2d3bf5106 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
@@ -113,8 +113,15 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord
ArtifactFactory factory = embedder.lookup(ArtifactFactory.class);
PrintStream logger = listener.getLogger();
boolean maven3orLater = MavenUtil.maven3orLater(parent.getModuleSetBuild().getMavenVersionUsed());
- if (!deploymentRepository.isUniqueVersion() && maven3orLater) {
- logger.println("uniqueVersion == false is not anymore supported in maven 3");
+ boolean uniqueVersion = true;
+ if (!deploymentRepository.isUniqueVersion()) {
+ if (maven3orLater) {
+ logger.println("uniqueVersion == false is not anymore supported in maven 3");
+ } else {
+ ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion( false );
+ uniqueVersion = false;
+ }
+ } else {
((WrappedArtifactRepository) deploymentRepository).setUniqueVersion( true );
}
Artifact main = mainArtifact.toArtifact(handlerManager,factory,parent);
@@ -123,21 +130,22 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord
// deploy the main artifact. This also deploys the POM
logger.println(Messages.MavenArtifact_DeployingMainArtifact(main.getFile().getName()));
- deployMavenArtifact( main, deploymentRepository, embedder );
+
+ ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class,uniqueVersion ? "default":"maven2");
+
+ deployer.deploy( main.getFile(), main, deploymentRepository, embedder.getLocalRepository() );
+
+ //deployMavenArtifact( main, deploymentRepository, embedder, uniqueVersion );
for (MavenArtifact aa : attachedArtifacts) {
Artifact a = aa.toArtifact(handlerManager,factory, parent);
logger.println(Messages.MavenArtifact_DeployingAttachedArtifact(a.getFile().getName()));
- deployMavenArtifact( a, deploymentRepository, embedder );
+ deployer.deploy( a.getFile(), a, deploymentRepository, embedder.getLocalRepository() );
}
}
-
- protected void deployMavenArtifact(Artifact artifact, ArtifactRepository deploymentRepository, MavenEmbedder embedder)
- throws ArtifactDeploymentException, ComponentLookupException {
-
- ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class,"maven2");
- deployer.deploy(artifact.getFile(),artifact,deploymentRepository,embedder.getLocalRepository());
- }
+
+
+
/**
* Installs the artifact to the local Maven repository.
*/
diff --git a/test/pom.xml b/test/pom.xml
index ba321441e2..44095261ab 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -55,7 +55,7 @@ THE SOFTWARE.
com.sun.maven
maven-junit-plugin
- 1.6
+ 1.7
@@ -165,6 +165,11 @@ THE SOFTWARE.
mock-javamail
1.7
+
+ junit
+ junit
+ 4.8.2
+