Revision 1708010

Jump to revision:
Author:	rfscholte
Date:	Sun Oct 11 19:00:45 2015 UTC (8 years, 6 months ago)
Changed paths:	13
Log Message:	Merge with 3.0-branch

Changed paths

Path	Details
maven/plugins/trunk/maven-deploy-plugin/	modified , props changed
maven/plugins/trunk/maven-deploy-plugin/pom.xml	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactDeployerStub.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub2.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java	modified , text changed
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.jar	deleted
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom (Copied from maven/plugins/branches/m-deploy-p-3.0/src/test/resources/unit/basic-deploy-pom/target/deploy-test-file-1.0-SNAPSHOT.pom, r1679410)	added