Author: bentmann
Date: Tue Oct 20 21:26:49 2009
New Revision: 827803
URL: http://svn.apache.org/viewvc?rev=827803&view=rev
Log:
o Fixed assembly descriptor to exclude paths like
"target/test-classes/project/src/pom.xml"
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
(with props)
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
(with props)
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml?rev=827803&r1=827802&r2=827803&view=diff
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
(original)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
Tue Oct 20 21:26:49 2009
@@ -31,7 +31,7 @@
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
- <exclude>%regex[(?!.*src/).*${project.build.directory}.*]</exclude>
+
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
<!-- NOTE: Most of the following excludes should not be required
if the standard release process is followed. This is because the
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
Tue Oct 20 21:26:49 2009
@@ -0,0 +1,61 @@
+package org.apache.its;
+
+import static org.apache.its.util.TestUtils.archivePathFromChild;
+import static org.apache.its.util.TestUtils.archivePathFromProject;
+import static org.apache.its.util.TestUtils.assertZipContents;
+import static org.apache.its.util.TestUtils.getTestDir;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.HashSet;
+import java.util.Set;
+
+public class IT_ExcludeSrcDirWithinBuildOutputDir
+{
+
+ private static final String BASENAME = "output-dir-contains-src-name";
+ private static final String VERSION = "1";
+
+ @Test
+ public void execute()
+ throws VerificationException, IOException, URISyntaxException
+ {
+ File testDir = getTestDir( BASENAME );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ verifier.executeGoal( "package" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ File assembly = new File( testDir, "target/" + BASENAME + "-" +
VERSION + "-source-release.zip" );
+
+ Set<String> required = new HashSet<String>();
+
+ required.add( archivePathFromProject( BASENAME, VERSION, "/pom.xml" )
);
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/pom.xml" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/pom.xml" ) );
+
+ required.add( archivePathFromProject( BASENAME, VERSION,
"/src/test/resources/project/src/main/resources/test.properties" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/src/test/resources/project/src/main/resources/test.properties" ) );
+ required.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/src/test/resources/project/src/main/resources/test.properties" ) );
+
+ Set<String> banned = new HashSet<String>();
+
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/target/" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION,
"/target/test-classes/project/src/main/resources/test.properties" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/target/" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1",
"/target/test-classes/project/src/main/resources/test.properties" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/target/" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2",
"/target/test-classes/project/src/main/resources/test.properties" ) );
+
+ assertZipContents( required, banned, assembly );
+ }
+
+}
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
Tue Oct 20 21:26:49 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>output-dir-contains-src-name</artifactId>
+ <groupId>org.apache.assembly.it</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>output-dir-contains-src-name-child1</artifactId>
+</project>
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
Tue Oct 20 21:26:49 2009
@@ -0,0 +1 @@
+# Dummy properties
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
Tue Oct 20 21:26:49 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>output-dir-contains-src-name</artifactId>
+ <groupId>org.apache.assembly.it</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>output-dir-contains-src-name-child2</artifactId>
+</project>
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
Tue Oct 20 21:26:49 2009
@@ -0,0 +1 @@
+# Dummy properties
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
Tue Oct 20 21:26:49 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.assembly.it</groupId>
+ <artifactId>output-dir-contains-src-name</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>output-dir-contains-src-name-child1</module>
+ <module>output-dir-contains-src-name-child2</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <inherited>false</inherited>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <!-- required for PLXUTILS-120 -->
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>source-release</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties?rev=827803&view=auto
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
(added)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
Tue Oct 20 21:26:49 2009
@@ -0,0 +1 @@
+# Dummy properties
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml?rev=827803&r1=827802&r2=827803&view=diff
==============================================================================
---
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
(original)
+++
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
Tue Oct 20 21:26:49 2009
@@ -22,6 +22,12 @@
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
+ <dependency>
+ <!-- required for PLXUTILS-120 -->
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.1</version>
+ </dependency>
</dependencies>
<executions>
