Author: jdcasey
Date: Tue Sep 21 20:36:43 2010
New Revision: 999614
URL: http://svn.apache.org/viewvc?rev=999614&view=rev
Log:
[MASSEMBLY-432] IT verifying this is fixed. Dependency-management now correctly
applied when creating an assembly with binaries included.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml?rev=999614&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
Tue Sep 21 20:36:43 2010
@@ -0,0 +1,46 @@
+<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>test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <test.version>2.2.1</test.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${test.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml?rev=999614&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
Tue Sep 21 20:36:43 2010
@@ -0,0 +1,19 @@
+<assembly>
+ <!-- TODO: Change ${pom.*} references to ${project.*} once
maven-assembly-plugin 2.2-beta-3 is available -->
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <id>bundle</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>org.apache.maven:maven-plugin-api</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml?rev=999614&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml
Tue Sep 21 20:36:43 2010
@@ -0,0 +1,35 @@
+<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>test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <properties>
+ <test.version>2.0.6</test.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh?rev=999614&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
Tue Sep 21 20:36:43 2010
@@ -0,0 +1,18 @@
+import java.io.*;
+
+File f = new File( basedir,
"child/target/child-1.0-bundle/maven-plugin-api-2.2.1.jar" );
+File f2 = new File( basedir,
"child/target/child-1.0-bundle/maven-plugin-api-2.0.6.jar" );
+
+if ( !f.exists() || !f.isFile() )
+{
+ System.out.println( f + " does not exist or is not a file." );
+ return false;
+}
+
+if ( f2.exists() )
+{
+ System.out.println( f2 + " should NOT have been included." );
+ return false;
+}
+
+return true;
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
