Return-Path: 
 <commits-return-29409-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 66326 invoked from network); 20 Dec 2009 17:51:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Dec 2009 17:51:47 -0000
Received: (qmail 25557 invoked by uid 500); 20 Dec 2009 17:51:47 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 25449 invoked by uid 500); 20 Dec 2009 17:51:47 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 25440 invoked by uid 99); 20 Dec 2009 17:51:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2009 17:51:47 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2009 17:51:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 856A7238898B; Sun, 20 Dec 2009 17:51:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r892623 - in
 /maven/plugins/trunk/maven-deploy-plugin/src/it:
 alt-deploy-repo-with-dist-mgmt/ alt-deploy-repo-without-dist-mgmt/
 alt-deploy-repo/
Date: Sun, 20 Dec 2009 17:51:20 -0000
To: commits@maven.apache.org
From: bentmann@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091220175120.856A7238898B@eris.apache.org>

Author: bentmann
Date: Sun Dec 20 17:51:19 2009
New Revision: 892623

URL: http://svn.apache.org/viewvc?rev=892623&view=rev
Log:
[MDEPLOY-50] deploy:deploy fails without distributionManagment despite altDeploymentRepository being specified

o Added IT to check that fix for MDEPLOY-98 solves this as well

Added:
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/
      - copied from r892608, maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo/
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/
      - copied from r892608, maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo/
Removed:
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo/
Modified:
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml Sun Dec 20 17:51:19 2009
@@ -22,13 +22,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.deploy.adr</groupId>
+  <groupId>org.apache.maven.its.deploy.adrwdm</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
 
   <description>
-    Tests the deployment to an alternative repository specified on the CLI.
+    Tests the deployment to an alternative repository specified on the CLI when the POM also specifies
+    distribution management.
   </description>
 
   <properties>

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/setup.bsh?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/setup.bsh Sun Dec 20 17:51:19 2009
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/adr" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/adrwdm" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-with-dist-mgmt/verify.bsh Sun Dec 20 17:51:19 2009
@@ -3,9 +3,9 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/deploy/adr/test/maven-metadata.xml",
-    "org/apache/maven/its/deploy/adr/test/1.0/test-1.0.pom",
-    "org/apache/maven/its/deploy/adr/test/1.0/test-1.0.jar",
+    "org/apache/maven/its/deploy/adrwdm/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/adrwdm/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/adrwdm/test/1.0/test-1.0.jar",
 };
 
 for ( String path : paths )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml Sun Dec 20 17:51:19 2009
@@ -22,26 +22,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.deploy.adr</groupId>
+  <groupId>org.apache.maven.its.deploy.adrwodm</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
 
   <description>
-    Tests the deployment to an alternative repository specified on the CLI.
+    Tests the deployment to an alternative repository specified on the CLI when the POM does not specify
+    distribution management (MDEPLOY-50).
   </description>
 
   <properties>
     <maven.test.skip>true</maven.test.skip>
   </properties>
 
-  <distributionManagement>
-    <repository>
-      <id>it</id>
-      <url>file:///${basedir}/target/void</url>
-    </repository>
-  </distributionManagement>
-
   <build>
     <plugins>
       <plugin>

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh Sun Dec 20 17:51:19 2009
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/adr" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/adrwodm" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh?rev=892623&r1=892608&r2=892623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/alt-deploy-repo-without-dist-mgmt/verify.bsh Sun Dec 20 17:51:19 2009
@@ -3,9 +3,9 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/deploy/adr/test/maven-metadata.xml",
-    "org/apache/maven/its/deploy/adr/test/1.0/test-1.0.pom",
-    "org/apache/maven/its/deploy/adr/test/1.0/test-1.0.jar",
+    "org/apache/maven/its/deploy/adrwodm/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/adrwodm/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/adrwodm/test/1.0/test-1.0.jar",
 };
 
 for ( String path : paths )