You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2011/09/02 01:11:46 UTC
svn commit: r1164297 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets:
dep-transfilter-wildcard-massembly544/
dep-transfilter-wildcard-massembly544/src/
dep-transfilter-wildcard-massembly544/src/main/ dep-transfilter-wild...
Author: jdcasey
Date: Thu Sep 1 23:11:45 2011
New Revision: 1164297
URL: http://svn.apache.org/viewvc?rev=1164297&view=rev
Log:
[MASSEMBLY-544] Adding test to verify wildcard without coordinate segments
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/goals.txt?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/goals.txt Thu Sep 1 23:11:45 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/dep-transfilter-wildcard-massembly544/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml Thu Sep 1 23:11:45 2011
@@ -0,0 +1,53 @@
+<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>dep-transfilter-wildcard-massembly544</artifactId>
+ <name>dep-transfilter-wildcard-massembly544</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0-beta-4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0.4</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/dep-transfilter-wildcard-massembly544/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml Thu Sep 1 23:11:45 2011
@@ -0,0 +1,22 @@
+<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>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>org.apache.maven*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java Thu Sep 1 23:11:45 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/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java Thu Sep 1 23:11:45 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/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh?rev=1164297&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh Thu Sep 1 23:11:45 2011
@@ -0,0 +1,21 @@
+import java.io.*;
+
+File dir = new File( basedir, "target/dep-transfilter-wildcard-massembly544-1-bin/maven-libs" );
+File[] files = {
+ new File( dir, "wagon-webdav-jackrabbit-1.0-beta-4.jar" ),
+ new File( dir, "xercesMinimal-1.9.6.2.jar" ),
+ new File( dir, "maven-reporting-api-2.0.4.jar" ),
+ new File( dir, "doxia-sink-api-1.0-alpha-7.jar" )
+};
+
+boolean result = true;
+for( int i = 0; i<files.length; i++ )
+{
+ if ( !files[i].exists() )
+ {
+ System.out.println( "Cannot find jar: " + files[i] + " (should be included via transitive pattern)." );
+ result = false;
+ }
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml?rev=1164297&r1=1164296&r2=1164297&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml Thu Sep 1 23:11:45 2011
@@ -32,9 +32,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <!--
- <version>2.2-beta-3-SNAPSHOT</version>
- -->
<executions>
<execution>
<id>assemly</id>