Author: jdcasey
Date: Fri Sep 19 13:39:48 2008
New Revision: 697230
URL: http://svn.apache.org/viewvc?rev=697230&view=rev
Log:
[MASSEMBLY-306] Adding integration test to verify that NPE is fixed.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=697230&r1=697229&r2=697230&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Sep 19 13:39:48 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>12-SNAPSHOT</version>
+ <version>11</version>
</parent>
<artifactId>maven-assembly-plugin</artifactId>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt?rev=697230&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt
Fri Sep 19 13:39:48 2008
@@ -0,0 +1,2 @@
+clean
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml?rev=697230&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
Fri Sep 19 13:39:48 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<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>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>massembly-306</artifactId>
+ <packaging>jar</packaging>
+ <name>massembly-306</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+
+ <!-- Both the range AND the scope are critical here,
+ since this artifact will be EXCLUDED from the depSet. -->
+ <version>[1.2.13]</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
