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 2007/08/16 18:27:24 UTC
svn commit: r566764 - in /maven/plugins/trunk/maven-assembly-plugin/src:
it/mojo-configuration/no-appendAssemblyId-no-classifier/
it/mojo-configuration/no-appendAssemblyId-no-classifier/src/
it/mojo-configuration/no-appendAssemblyId-no-classifier/src/m...
Author: jdcasey
Date: Thu Aug 16 09:27:22 2007
New Revision: 566764
URL: http://svn.apache.org/viewvc?view=rev&rev=566764
Log:
[MASSEMBLY-156] Changing behavior such that if appendAssemblyId==false and classifier==null, the assembly file will be set as the main project artifact's file...with warnings, of course!
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt?view=auto&rev=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt Thu Aug 16 09:27:22 2007
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml?view=auto&rev=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml Thu Aug 16 09:27:22 2007
@@ -0,0 +1,45 @@
+<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>test</groupId>
+ <artifactId>no-appendAssemblyId-no-classifier</artifactId>
+ <packaging>jar</packaging>
+ <version>1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java?view=auto&rev=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java Thu Aug 16 09:27:22 2007
@@ -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/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java?view=auto&rev=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java Thu Aug 16 09:27:22 2007
@@ -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/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh?view=auto&rev=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh Thu Aug 16 09:27:22 2007
@@ -0,0 +1,14 @@
+import java.io.*;
+import java.util.jar.*;
+import java.util.*;
+import java.net.*;
+
+File file = new File( basedir, "target/no-appendAssemblyId-no-classifier-1.jar" );
+
+System.out.println( "file: " + file + " exists? " + file.exists() );
+
+JarFile jarFile = new JarFile( file );
+
+JarEntry entry = jarFile.getEntry( "org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.class" );
+
+return entry != null;
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?view=diff&rev=566764&r1=566763&r2=566764
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Thu Aug 16 09:27:22 2007
@@ -291,8 +291,19 @@
}
else
{
- projectHelper.attachArtifact( project, format, null, destFile );
+ StringBuffer message = new StringBuffer();
+
+ message.append( "Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing." );
+ message.append( "\nInstead of attaching the assembly file: " ).append( destFile ).append( ", it will become the file for main project artifact." );
+ message.append( "\nNOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic!" );
+
+ getLog().warn( message );
+ project.getArtifact().setFile( destFile );
}
+ }
+ else
+ {
+ getLog().warn( "Assembly file: " + destFile + " is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment." );
}
}
}