You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/25 14:09:01 UTC

svn commit: r729420 - in /maven/plugins/trunk/maven-deploy-plugin/src/it: attach-release-jar/ mdeploy-45-test/ release-jar/ release-pom/ snapshot-jar/ snapshot-pom/

Author: bentmann
Date: Thu Dec 25 05:09:01 2008
New Revision: 729420

URL: http://svn.apache.org/viewvc?rev=729420&view=rev
Log:
o Used distinct group ids for the tests

Added:
    maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh   (with props)
Modified:
    maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/verify.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/pom.xml
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/setup.bsh
    maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/verify.bsh

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml Thu Dec 25 05:09:01 2008
@@ -22,8 +22,8 @@
 <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.plugins.deploy</groupId>
-  <artifactId>attach-release-jar</artifactId>
+  <groupId>org.apache.maven.its.deploy.arj</groupId>
+  <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/setup.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/setup.bsh Thu Dec 25 05:09:01 2008
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/plugins/deploy/attach-release-jar" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/arj" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/verify.bsh Thu Dec 25 05:09:01 2008
@@ -3,10 +3,10 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/plugins/deploy/attach-release-jar/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/attach-release-jar/1.0/attach-release-jar-1.0.pom",
-    "org/apache/maven/its/plugins/deploy/attach-release-jar/1.0/attach-release-jar-1.0.jar",
-    "org/apache/maven/its/plugins/deploy/attach-release-jar/1.0/attach-release-jar-1.0-sources.jar",
+    "org/apache/maven/its/deploy/arj/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/arj/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/arj/test/1.0/test-1.0.jar",
+    "org/apache/maven/its/deploy/arj/test/1.0/test-1.0-sources.jar",
 };
 
 for ( String path : paths )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/pom.xml Thu Dec 25 05:09:01 2008
@@ -1,47 +1,71 @@
-<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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.codehaus.jira.testprojects</groupId>
-	<artifactId>mdeploy45-webui</artifactId>
-	<name>sample web project with classified artifact output</name>
-	<url>http://jira.codehaus.org/browse/MDEPLOY-45</url>
-	<version>0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
-	<properties>
-	 <mdp45.artifact.classifier>mdp45</mdp45.artifact.classifier>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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.45</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>MDEPLOY-45</name>
+  <description>sample web project with classified artifact output</description>
+  <url>http://jira.codehaus.org/browse/MDEPLOY-45</url>
+
+  <properties>
+   <mdp45.artifact.classifier>mdp45</mdp45.artifact.classifier>
+  </properties>
+
+  <distributionManagement>
+    <repository>
+      <id>repo1</id>
+      <name>Maven Central Repository</name>
+      <url>scp://foo.org/m2/release</url>
+    </repository>
+    <snapshotRepository>
+      <id>repo1</id>
+      <name>Maven Central Repository</name>
+      <url>scp://foo.org/m2/snapshot</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
         <version>@project.version@</version>
-				<configuration>
-			    <!-- because i don't know your distribution management, deployments will be written to ${basedir}/target -->
-					<altDeploymentRepository>mine::default::file://${basedir}/target</altDeploymentRepository>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-        <!--version>2.1-alpha-2-SNAPSHOT</version-->
+        <configuration>
+          <!-- because i don't know your distribution management, deployments will be written to ${basedir}/target -->
+          <altDeploymentRepository>mine::default::file://${basedir}/target</altDeploymentRepository>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.0.2</version>
-				<configuration>
-				 <!-- this will cause an error  -->
-					<classifier>${mdp45.artifact.classifier}</classifier>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<distributionManagement>
-		<repository>
-			<id>repo1</id>
-			<name>Maven Central Repository</name>
-			<url>scp://foo.org/m2/release</url>
-		</repository>
-		<snapshotRepository>
-			<id>repo1</id>
-			<name>Maven Central Repository</name>
-			<url>scp://foo.org/m2/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
+        <configuration>
+          <!-- this will cause an error  -->
+          <classifier>${mdp45.artifact.classifier}</classifier>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Added: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh?rev=729420&view=auto
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh (added)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh Thu Dec 25 05:09:01 2008
@@ -0,0 +1,14 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/45" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+file = new File( basedir, "target/repo" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;

Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/setup.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh Thu Dec 25 05:09:01 2008
@@ -34,7 +34,7 @@
         return false;
     }
     
-    File deployedFile = new File ( target, "org/codehaus/jira/testprojects/mdeploy45-webui/0.1-SNAPSHOT/mdeploy45-webui-0.1-SNAPSHOT-mdp45.war" );
+    File deployedFile = new File ( target, "org/apache/maven/its/deploy/45/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-mdp45.war" );
     if ( !deployedFile.exists() || deployedFile.isDirectory() )
     {
         System.err.println( "deployedFile file is missing or a directory." );

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml Thu Dec 25 05:09:01 2008
@@ -22,8 +22,8 @@
 <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.plugins.deploy</groupId>
-  <artifactId>release-jar</artifactId>
+  <groupId>org.apache.maven.its.deploy.rj</groupId>
+  <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/setup.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/setup.bsh Thu Dec 25 05:09:01 2008
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/plugins/deploy/release-jar" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/rj" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/verify.bsh Thu Dec 25 05:09:01 2008
@@ -3,9 +3,9 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/plugins/deploy/release-jar/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/release-jar/1.0/release-jar-1.0.pom",
-    "org/apache/maven/its/plugins/deploy/release-jar/1.0/release-jar-1.0.jar",
+    "org/apache/maven/its/deploy/rj/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/rj/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/rj/test/1.0/test-1.0.jar",
 };
 
 for ( String path : paths )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml Thu Dec 25 05:09:01 2008
@@ -22,8 +22,8 @@
 <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.plugins.deploy</groupId>
-  <artifactId>release-pom</artifactId>
+  <groupId>org.apache.maven.its.deploy.rp</groupId>
+  <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/setup.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/setup.bsh Thu Dec 25 05:09:01 2008
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/plugins/deploy/release-pom" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/rp" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/verify.bsh Thu Dec 25 05:09:01 2008
@@ -3,8 +3,8 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/plugins/deploy/release-pom/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/release-pom/1.0/release-pom-1.0.pom",
+    "org/apache/maven/its/deploy/rp/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/rp/test/1.0/test-1.0.pom",
 };
 
 for ( String path : paths )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/pom.xml Thu Dec 25 05:09:01 2008
@@ -22,8 +22,8 @@
 <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.plugins.deploy</groupId>
-  <artifactId>snapshot-jar</artifactId>
+  <groupId>org.apache.maven.its.deploy.sj</groupId>
+  <artifactId>test</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/setup.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/setup.bsh Thu Dec 25 05:09:01 2008
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/plugins/deploy/snapshot-jar" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/sj" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-jar/verify.bsh Thu Dec 25 05:09:01 2008
@@ -3,10 +3,10 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/plugins/deploy/snapshot-jar/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/snapshot-jar/1.0-SNAPSHOT/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/snapshot-jar/1.0-SNAPSHOT/snapshot-jar-1.0-SNAPSHOT.pom",
-    "org/apache/maven/its/plugins/deploy/snapshot-jar/1.0-SNAPSHOT/snapshot-jar-1.0-SNAPSHOT.jar",
+    "org/apache/maven/its/deploy/sj/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/maven-metadata.xml",
+    "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
+    "org/apache/maven/its/deploy/sj/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar",
 };
 
 for ( String path : paths )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/pom.xml?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/pom.xml Thu Dec 25 05:09:01 2008
@@ -22,8 +22,8 @@
 <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.plugins.deploy</groupId>
-  <artifactId>snapshot-pom</artifactId>
+  <groupId>org.apache.maven.its.deploy.sp</groupId>
+  <artifactId>test</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/setup.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/setup.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/setup.bsh Thu Dec 25 05:09:01 2008
@@ -3,7 +3,7 @@
 
 import org.codehaus.plexus.util.*;
 
-File file = new File( localRepositoryPath, "org/apache/maven/its/plugins/deploy/snapshot-pom" );
+File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/sp" );
 System.out.println( "Deleting " + file );
 FileUtils.deleteDirectory( file );
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/verify.bsh?rev=729420&r1=729419&r2=729420&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/verify.bsh (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/snapshot-pom/verify.bsh Thu Dec 25 05:09:01 2008
@@ -3,9 +3,9 @@
 
 String[] paths =
 {
-    "org/apache/maven/its/plugins/deploy/snapshot-pom/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/snapshot-pom/1.0-SNAPSHOT/maven-metadata.xml",
-    "org/apache/maven/its/plugins/deploy/snapshot-pom/1.0-SNAPSHOT/snapshot-pom-1.0-SNAPSHOT.pom",
+    "org/apache/maven/its/deploy/sp/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/sp/test/1.0-SNAPSHOT/maven-metadata.xml",
+    "org/apache/maven/its/deploy/sp/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
 };
 
 for ( String path : paths )