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 )
