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 2009/01/20 23:38:52 UTC
svn commit: r736150 - in /maven/plugins/trunk/maven-deploy-plugin: pom.xml
src/it/non-default-pom/ src/it/non-default-pom/non-default-pom.xml
src/it/non-default-pom/setup.bsh src/it/non-default-pom/verify.bsh
Author: bentmann
Date: Tue Jan 20 14:38:51 2009
New Revision: 736150
URL: http://svn.apache.org/viewvc?rev=736150&view=rev
Log:
o Migrated core IT for MNG-851 over to the affected plugin
Added:
maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/
maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-deploy-plugin/pom.xml
Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=736150&r1=736149&r2=736150&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Tue Jan 20 14:38:51 2009
@@ -113,6 +113,7 @@
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
+ <pomInclude>*/non-default-pom.xml</pomInclude>
</pomIncludes>
<preBuildHookScript>setup</preBuildHookScript>
<postBuildHookScript>verify</postBuildHookScript>
Added: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml?rev=736150&view=auto
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml (added)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml Tue Jan 20 14:38:51 2009
@@ -0,0 +1,66 @@
+<?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.ndp</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <description>
+ Tests the deployment of a POM whose file is not named pom.xml
+ </description>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <distributionManagement>
+ <repository>
+ <id>it</id>
+ <url>file:///${basedir}/target/repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ </distributionManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/non-default-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh?rev=736150&view=auto
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh (added)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh Tue Jan 20 14:38:51 2009
@@ -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/ndp" );
+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/non-default-pom/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh?rev=736150&view=auto
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh (added)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh Tue Jan 20 14:38:51 2009
@@ -0,0 +1,21 @@
+import java.io.*;
+import java.util.*;
+
+String[] paths =
+{
+ "org/apache/maven/its/deploy/ndp/test/maven-metadata.xml",
+ "org/apache/maven/its/deploy/ndp/test/1.0-SNAPSHOT/maven-metadata.xml",
+ "org/apache/maven/its/deploy/ndp/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
+};
+
+for ( String path : paths )
+{
+ File file = new File( new File( basedir, "target/repo" ), path );
+ System.out.println( "Checking for existence of " + file );
+ if ( !file.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
+ }
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/non-default-pom/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision