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/08/27 00:33:52 UTC
svn commit: r689271 - in /maven/plugins/trunk/maven-assembly-plugin/src:
it/projects/multimodule/massembly-298/
it/projects/multimodule/massembly-298/child1/
it/projects/multimodule/massembly-298/child1/src/
it/projects/multimodule/massembly-298/child1...
Author: jdcasey
Date: Tue Aug 26 15:33:51 2008
New Revision: 689271
URL: http://svn.apache.org/viewvc?rev=689271&view=rev
Log:
[MASSEMBLY-298] Add support unpackOptions/includes and unpackOptions/excludes in module binaries.
Patch submitted by: Nathaniel Harward
Integration test by: me (John Casey)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml Tue Aug 26 15:33:51 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>massembly-298</artifactId>
+ <groupId>org.test</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.test</groupId>
+ <artifactId>child1</artifactId>
+ <name>Child 1</name>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,13 @@
+package org.test.child1;
+
+/**
+ * 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/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,13 @@
+package org.test.child1;
+
+/**
+ * Hello world!
+ *
+ */
+public class App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,38 @@
+package org.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/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml Tue Aug 26 15:33:51 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>massembly-298</artifactId>
+ <groupId>org.test</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.test</groupId>
+ <artifactId>child2</artifactId>
+ <name>Child 2</name>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,13 @@
+package org.test.child2;
+
+/**
+ * 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/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,13 @@
+package org.test.other;
+
+/**
+ * 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/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java Tue Aug 26 15:33:51 2008
@@ -0,0 +1,38 @@
+package org.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/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt Tue Aug 26 15:33:51 2008
@@ -0,0 +1 @@
+install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml Tue Aug 26 15:33:51 2008
@@ -0,0 +1,35 @@
+<?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>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.test</groupId>
+ <artifactId>massembly-298</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <name>Parent</name>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml Tue Aug 26 15:33:51 2008
@@ -0,0 +1,40 @@
+
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.test:child1</include>
+ </includes>
+ <binaries>
+ <outputDirectory>${artifact.artifactId}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/test/child1/App2*</include>
+ </includes>
+ </unpackOptions>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.test:child2</include>
+ </includes>
+ <binaries>
+ <outputDirectory>${artifact.artifactId}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>org/test/other/*</exclude>
+ </excludes>
+ </unpackOptions>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh?rev=689271&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh Tue Aug 26 15:33:51 2008
@@ -0,0 +1,38 @@
+import java.io.*;
+import java.util.zip.*;
+
+ZipFile zf = new ZipFile( new File( basedir, "target/massembly-298-1-bin.zip" ) );
+
+ZipEntry child1InclEntry = zf.getEntry( "child1/org/test/child1/App2.class" );
+
+if ( child1InclEntry == null )
+{
+ System.out.println( "Included file from child1 not found." );
+ return false;
+}
+
+ZipEntry child1ExclEntry = zf.getEntry( "child1/org/test/child1/App.class" );
+
+if ( child1ExclEntry != null )
+{
+ System.out.println( "Non-included file from child1 should not be present, but was found." );
+ return false;
+}
+
+ZipEntry child2InclEntry = zf.getEntry( "child2/org/test/child2/App.class" );
+
+if ( child2InclEntry == null )
+{
+ System.out.println( "Included file from child2 not found." );
+ return false;
+}
+
+ZipEntry child2ExclEntry = zf.getEntry( "child2/org/test/other/App.class" );
+
+if ( child2ExclEntry != null )
+{
+ System.out.println( "Non-included file from child2 should not be present, but was found." );
+ return false;
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=689271&r1=689270&r2=689271&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Tue Aug 26 15:33:51 2008
@@ -192,16 +192,18 @@
impliedDependencySet.setExcludes( binaries.getExcludes() );
impliedDependencySet.setIncludes( binaries.getIncludes() );
impliedDependencySet.setUnpack( binaries.isUnpack() );
+ // unpackOptions is handled in the first stage of dependency-set handling, below.
depSets = Collections.singletonList( impliedDependencySet );
}
if ( depSets != null )
{
- // NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
for ( Iterator it = depSets.iterator(); it.hasNext(); )
{
DependencySet ds = (DependencySet) it.next();
+
+ // NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
ds.setUseProjectArtifact( false );
}
@@ -269,6 +271,10 @@
task.setDirectoryMode( binaries.getDirectoryMode() );
task.setFileMode( binaries.getFileMode() );
task.setUnpack( binaries.isUnpack() );
+ if ( binaries.isUnpack() ) {
+ task.setIncludes( binaries.getUnpackOptions().getIncludes() );
+ task.setExcludes( binaries.getUnpackOptions().getExcludes() );
+ }
task.execute( archiver, configSource );
}