Author: jdcasey
Date: Thu Sep 1 20:51:27 2011
New Revision: 1164267
URL: http://svn.apache.org/viewvc?rev=1164267&view=rev
Log:
[MASSEMBLY-570] Adding integration test to make sure wildcard in the middle of
an artifactId is matched.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,2 @@
+clean
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,52 @@
+<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>mid-artifactId-wildcard-massembly570</artifactId>
+ <name>mid-artifactId-wildcard-massembly570</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,19 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>maven-libs</outputDirectory>
+ <includes>
+ <include>org.apache.maven.plugins:maven-*-plugin</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh?rev=1164267&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
Thu Sep 1 20:51:27 2011
@@ -0,0 +1,20 @@
+import java.io.*;
+
+File dir = new File( basedir,
"target/mid-artifactId-wildcard-massembly570-1-bin/maven-libs" );
+
+File[] files = {
+ new File( dir, "maven-clean-plugin-2.4.1.jar" ),
+ new File( dir, "maven-jar-plugin-2.3.2.jar")
+};
+
+boolean missing = false;
+for( int i = 0; i<files.length; i++ )
+{
+ if ( !files[i].exists() )
+ {
+ System.out.println( "Missing jar: " + files[i] + " (should be included
via wildcard pattern)." );
+ missing = true;
+ }
+}
+
+return !missing;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
