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 2008/09/18 21:19:27 UTC
svn commit: r696771 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/it/projects/dependency-sets/dep-with-transitive-filter/
src/it/projects/dependency-sets/dep-with-transitive-filter/src/
src/it/projects/dependency-sets/dep-with-transitive-filt...
Author: jdcasey
Date: Thu Sep 18 12:19:26 2008
New Revision: 696771
URL: http://svn.apache.org/viewvc?rev=696771&view=rev
Log:
[MASSEMBLY-354] Fix behavior concerning useTransitiveFiltering == true and include patterns that contain wildcards.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.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=696771&r1=696770&r2=696771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Sep 18 12:19:26 2008
@@ -54,6 +54,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.6-SNAPSHOT</version>
@@ -147,11 +152,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-common-artifact-filters</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-tools</artifactId>
<version>1.0-alpha-1</version>
<scope>test</scope>
@@ -311,12 +311,12 @@
</pluginRepositories>
<properties>
+ <invokerPluginVersion>1.2.1</invokerPluginVersion>
+ <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
<it.pomIncludes>**/pom.xml</it.pomIncludes>
<it.streamLogs>false</it.streamLogs>
<testVersion>${pom.version}</testVersion>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
- <invokerPluginVersion>1.2.1</invokerPluginVersion>
</properties>
<build>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/goals.txt?rev=696771&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/goals.txt Thu Sep 18 12:19:26 2008
@@ -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-with-transitive-filter/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=696771&view=auto
==============================================================================
--- 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-with-transitive-filter/pom.xml Thu Sep 18 12:19:26 2008
@@ -0,0 +1,55 @@
+<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>project</artifactId>
+ <name>project</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-impl</artifactId>
+ <version>2.0.4.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <!--
+ <version>2.2-beta-3-SNAPSHOT</version>
+ -->
+ <executions>
+ <execution>
+ <id>assemly</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-with-transitive-filter/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml?rev=696771&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml Thu Sep 18 12:19:26 2008
@@ -0,0 +1,20 @@
+<assembly>
+ <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.wagon*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java?rev=696771&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java Thu Sep 18 12:19:26 2008
@@ -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-with-transitive-filter/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java?rev=696771&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java Thu Sep 18 12:19:26 2008
@@ -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-with-transitive-filter/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh?rev=696771&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh Thu Sep 18 12:19:26 2008
@@ -0,0 +1,16 @@
+import java.io.*;
+
+File wagonJackrabbitJar = new File( basedir, "target/project-1-bin.dir/maven-libs/wagon-webdav-jackrabbit-1.0-beta-4.jar" );
+File xercesMinimalJar = new File( basedir, "target/project-1-bin.dir/maven-libs/xercesMinimal-1.9.6.2.jar" );
+
+if ( !wagonJackrabbitJar.exists() )
+{
+ System.out.println( "Wagon provider jar is missing (should be included via include wildcard pattern)." );
+}
+
+if ( !xercesMinimalJar.exists() )
+{
+ System.out.println( "Xerces minimal jar (from nekohtml, brought in by wagon jackrabbit provider) is missing (should be included via include wildcard pattern)." );
+}
+
+return wagonJackrabbitJar.exists() && xercesMinimalJar.exists();
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml?rev=696771&r1=696770&r2=696771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml Thu Sep 18 12:19:26 2008
@@ -1,12 +1,14 @@
<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.maven.plugin.assembly.test</groupId>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
<artifactId>massembly-241</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
<name>massembly-241</name>
- <url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml?rev=696771&r1=696770&r2=696771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml Thu Sep 18 12:19:26 2008
@@ -4,6 +4,8 @@
<format>dir</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
<dependencySets>
<dependencySet>
<outputDirectory>maven-libs</outputDirectory>