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 2006/10/11 06:13:34 UTC
svn commit: r462689 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml
src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
src/main/resources/assemblies/jar-with-dependencies.xml
Author: jdcasey
Date: Tue Oct 10 21:13:33 2006
New Revision: 462689
URL: http://svn.apache.org/viewvc?view=rev&rev=462689
Log:
Fixing jar-with-dependencies descriptor-ref to include the current project's classes.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=462689&r1=462688&r2=462689
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Oct 10 21:13:33 2006
@@ -104,6 +104,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<id>create-component-descriptor</id>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh?view=diff&rev=462689&r1=462688&r2=462689
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh Tue Oct 10 21:13:33 2006
@@ -29,6 +29,12 @@
System.err.println( "child1 class is missing." );
result = false;
}
+
+ if ( jf.getEntry( "test/App.class" ) == null )
+ {
+ System.err.println( "child2 class is missing." );
+ result = false;
+ }
System.out.println( "Looking for absence of 'junit/' jar entry." );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml?view=diff&rev=462689&r1=462688&r2=462689
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml Tue Oct 10 21:13:33 2006
@@ -31,4 +31,10 @@
<scope>runtime</scope>
</dependencySet>
</dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>