maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r960848 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/bugs/massembly-462/ it/projects/bugs/massembly-462/src/ it/projects/bugs/massembly-462/src/main/ it/projects/bugs/massembly-462/src/main/assembly-resources/ it/project...
Date Tue, 06 Jul 2010 09:13:44 GMT
Author: bentmann
Date: Tue Jul  6 09:13:44 2010
New Revision: 960848

URL: http://svn.apache.org/viewvc?rev=960848&view=rev
Log:
[MASSEMBLY-462] Assembly contains temporary files ending in *.formatted
Submitted by: Christian Schulte & Georges-Etienne Legendre

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml 
 (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
  (with props)
Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
Tue Jul  6 09:13:44 2010
@@ -0,0 +1,2 @@
+clean
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml Tue
Jul  6 09:13:44 2010
@@ -0,0 +1,26 @@
+<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>massembly-462</artifactId>
+  <packaging>jar</packaging>
+  <version>1</version>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/src.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
Tue Jul  6 09:13:44 2010
@@ -0,0 +1 @@
+${project.version}

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
Tue Jul  6 09:13:44 2010
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>src</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/assembly-resources</directory>
+      <filtered>true</filtered>
+      <lineEnding>unix</lineEnding>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
Tue Jul  6 09:13:44 2010
@@ -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/bugs/massembly-462/src/main/java/test/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh?rev=960848&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
Tue Jul  6 09:13:44 2010
@@ -0,0 +1,10 @@
+import java.io.*;
+
+boolean result = true;
+
+String assemblyDir = "target/massembly-462-1-src/";
+
+result = result && new File( basedir, assemblyDir + "test.txt" ).exists();
+result = result && new File( basedir, assemblyDir ).list().length == 1;
+
+return result;

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=960848&r1=960847&r2=960848&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
Tue Jul  6 09:13:44 2010
@@ -159,6 +159,7 @@ public class AddFileSetsTask
             
             List excludes = fileSet.getExcludes();
             excludes.add( "**/*.filtered" );
+            excludes.add( "**/*.formatted" );
             task.setExcludes( excludes );
             
             task.setIncludes( fileSet.getIncludes() );



Mime
View raw message