svn commit: r1639406 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/phase/ main/java/org/apache/maven/plugin/assembly/io/ main/java/org/apache/

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 17:27:58 2014
New Revision: 1639406

URL: http://svn.apache.org/r1639406
Log:
todo cleanup

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
 Thu Nov 13 17:27:58 2014
@@ -19,8 +19,6 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
 Thu Nov 13 17:27:58 2014
@@ -19,25 +19,7 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.maven.execution.MavenSession;
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
 import 
org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
@@ -61,6 +43,7 @@ import org.apache.maven.shared.io.locati
 import org.apache.maven.shared.io.location.Location;
 import org.apache.maven.shared.io.location.Locator;
 import org.apache.maven.shared.io.location.LocatorStrategy;
+import org.apache.maven.shared.utils.ReaderFactory;
 import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
 import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
 import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
@@ -71,6 +54,18 @@ import org.codehaus.plexus.util.Director
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @version $Id$
  */
@@ -133,46 +128,21 @@ public class DefaultAssemblyReader
 
 if ( ( descriptorSourceDirectory != null ) && 
descriptorSourceDirectory.isDirectory() )
 {
-locator.setStrategies( Collections.singletonList( 

svn commit: r1639393 - /maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 17:00:28 2014
New Revision: 1639393

URL: http://svn.apache.org/r1639393
Log:
Added note about setting this in the goal

Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml?rev=1639393&r1=1639392&r2=1639393&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml Thu Nov 13 
17:00:28 2014
@@ -210,7 +210,7 @@ under the License.
 
   GNU tar has restrictions on max value of UID/GUID in tar files.
   Consider using the more well defined POSIX tar format, which should 
support
-  larger values. Use tarLongFileMode=posix.
+  larger values. Use tarLongFileMode=posix in the assembly:single goal.
 
   
 

svn commit: r1639390 - /maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 16:57:44 2014
New Revision: 1639390

URL: http://svn.apache.org/r1639390
Log:
Removed typo

Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=1639390&r1=1639389&r2=1639390&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo 
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Thu 
Nov 13 16:57:44 2014
@@ -1,7 +1,6 @@
 
 
 

svn commit: r1639381 - in /maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter: AbstractStrictPatternArtifactFilter.java PatternIncludesArtifactFilte

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 16:29:51 2014
New Revision: 1639381

URL: http://svn.apache.org/r1639381
Log:
Language level fixes

Modified:

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java

Modified: 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java?rev=1639381&r1=1639380&r2=1639381&view=diff
==
--- 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
 (original)
+++ 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
 Thu Nov 13 16:29:51 2014
@@ -154,7 +154,7 @@ public abstract class AbstractStrictPatt
 {
 String contains = pattern.substring( 1, pattern.length() - 1 );
 
-matches = ( token.indexOf( contains ) != -1 );
+matches = ( token.contains( contains ) );
 }
 // support leading wildcard
 else if ( pattern.startsWith( "*" ) )

Modified: 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java?rev=1639381&r1=1639380&r2=1639381&view=diff
==
--- 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
 (original)
+++ 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
 Thu Nov 13 16:29:51 2014
@@ -110,7 +110,7 @@ public class PatternIncludesArtifactFilt
 }
 else
 {
-return Boolean.valueOf( match( artifact, negativePatterns ) );
+return match( artifact, negativePatterns );
 }
 }
 
@@ -122,7 +122,7 @@ public class PatternIncludesArtifactFilt
 }
 else
 {
-return Boolean.valueOf( match( artifact, positivePatterns ) );
+return match( artifact, positivePatterns );
 }
 }
 
@@ -199,7 +199,7 @@ public class PatternIncludesArtifactFilt
 return true;
 }
 
-if ( regionMatch && value.indexOf( pattern ) > -1 )
+if ( regionMatch && value.contains( pattern ) )
 {
 patternsTriggered.add( pattern );
 return true;
@@ -231,7 +231,7 @@ public class PatternIncludesArtifactFilt
 {
 final String contains = pattern.substring( 1, pattern.length() - 1 
);
 
-matches = ( token.indexOf( contains ) != -1 );
+matches = ( token.contains( contains ) );
 }
 // support leading wildcard
 else if ( pattern.startsWith( "*" ) )
@@ -307,7 +307,7 @@ public class PatternIncludesArtifactFilt
 
 if ( !missed.isEmpty() && logger.isWarnEnabled() )
 {
-final StringBuffer buffer = new StringBuffer();
+final StringBuilder buffer = new StringBuilder();
 
 buffer.append( "The following patterns were never triggered in 
this " );
 buffer.append( getFilterDescription() );
@@ -333,7 +333,7 @@ public class PatternIncludesArtifactFilt
 
 protected String getPatternsAsString()
 {
-final StringBuffer buffer = new StringBuffer();
+final StringBuilder buffer = new StringBuilder();
 for ( String pattern : positivePatterns )
 {
 buffer.append( "\no \'" ).append( pattern ).append( "\'" );
@@ -351,8 +351,8 @@ public class PatternIncludesArtifactFilt
 {
 if ( !filteredArtifactIds.isEmpty() && logger.isDebugEnabled() )
 {
-final StringBuffer buffer =
-new StringBuffer( "The following artifacts were removed by 
this " + getFilterDescription() + ": " );
+final StringBuilder buffer =
+ne

svn commit: r1639378 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317: ./ child1/ child1/src/ child1/src/main/ child1/src/main/java/ child1/src/main/java/com/

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 16:23:11 2014
New Revision: 1639378

URL: http://svn.apache.org/r1639378
Log:
[MASEMBLY-317] Test project added

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/app/App2.java

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/assembly.xml?rev=1639378&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/assembly.xml
 Thu Nov 13 16:23:11 2014
@@ -0,0 +1,43 @@
+
+
+
+  bin
+  
+dir
+  
+  
+
+  
+server/default
+
+false
+
+  
+
+true
+
+  *:junit
+
+  
+
+  
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/pom.xml?rev=1639378&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/pom.xml
 Thu Nov 13 16:23:11 2014
@@ -0,0 +1,33 @@
+
+
+
+  4.0.0
+  com.mycompany.app
+  my-app-module1
+  my-app-module1
+  1.0-SNAPSHOT
+  
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java?rev=1639378&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java
 Thu Nov 13 16:23:11 2014
@@ -0,0 +1,32 @@
+package com.mycompany.app;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional

svn commit: r1639379 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/mdo: component.mdo descriptor.mdo

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 16:23:29 2014
New Revision: 1639379

URL: http://svn.apache.org/r1639379
Log:
[MASSEMBLY-702] Added docs on default file/dir modes

Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=1639379&r1=1639378&r2=1639379&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo 
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Thu 
Nov 13 16:23:29 2014
@@ -220,7 +220,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
 Write = 2, and Execute = 1.  For example, the value 0644
-translates to User read-write, Group and Other read-only.
+translates to User read-write, Group and Other read-only.  The 
default value is 0644.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -239,7 +239,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of
 Read = 4, Write = 2, and Execute = 1.  For example, the value
-0755 translates to User read-write, Group and Other read-only.
+0755 translates to User read-write, Group and Other read-only. The 
default value is 0755.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -336,7 +336,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
 Write = 2, and Execute = 1.  For example, the value 0644
-translates to User read-write, Group and Other read-only.
+translates to User read-write, Group and Other read-only. The 
default value is 0644.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -440,7 +440,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
 Write = 2, and Execute = 1.  For example, the value 0644
-translates to User read-write, Group and Other read-only.
+translates to User read-write, Group and Other read-only. The 
default value is 0644.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -459,7 +459,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of
 Read = 4, Write = 2, and Execute = 1.  For example, the value
-0755 translates to User read-write, Group and Other read-only.
+0755 translates to User read-write, Group and Other read-only. The 
default value is 0755.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -749,7 +749,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
 Write = 2, and Execute = 1.  For example, the value 0644
-translates to User read-write, Group and Other read-only.
+translates to User read-write, Group and Other read-only. The 
default value is 0644.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -768,7 +768,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of
 Read = 4, Write = 2, and Execute = 1.  For example, the value
-0755 translates to User read-write, Group and Other read-only.
+0755 translates to User read-write, Group and Other read-only. The 
default value is 0755.
 http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on 
unix-style permissions)
 ]]>
   
@@ -898,7 +898,7 @@
 THIS IS AN OCTAL VALUE.
 Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
 Write = 2, and Execute = 1.  For example, the value 0644
-translates to User read-write, Group and Other read-only.
+translates to User read-write, Group and Other read-only. The 
default value is 0644.
 http://w

svn commit: r1639360 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/it/projects/bugs/massembly-731/not-verify.bsh

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 15:14:14 2014
New Revision: 1639360

URL: http://svn.apache.org/r1639360
Log:
[MASSEMBLY-731] Updated test projects, impeeded by MINVOKER-178

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1639360&r1=1639359&r2=1639360&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Nov 13 15:14:14 2014
@@ -468,6 +468,13 @@ under the License.
 
   
 
+
+  
+org.apache.commons
+commons-compress
+1.9
+  
+
   
 
   

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh?rev=1639360&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh
 Thu Nov 13 15:14:14 2014
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+import java.net.*;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+
+
+
+boolean result = true;
+
+try
+{
+File zipFile = new File( basedir, 
"target/project2-0.0.1-SNAPSHOT-deployable.zip" );
+
+if ( !zipFile.exists() || zipFile.isDirectory() )
+{
+System.err.println( "zip-file is missing or a directory." );
+result = false;
+}
+
+ZipFile zf = new ZipFile( zipFile );
+
+ZipArchiveEntry ze = zf.getEntry( 
"project2-0.0.1-SNAPSHOT/symlinks/src/symDir/" );
+if ( ze == null )
+{
+System.err.println( "symDir is missing." );
+result = false;
+}
+
+if (!ze.isUnixSymlink()) {
+System.err.println( "symDir is not a symnlink." );
+result = false;
+}
+}
+catch( IOException e )
+{
+e.printStackTrace();
+result = false;
+}
+
+return result;

svn commit: r1639364 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324: ./ assembly.xml pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 15:16:04 2014
New Revision: 1639364

URL: http://svn.apache.org/r1639364
Log:
[MASSEMBLY-324] Added test project to ivestigate

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/pom.xml

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/assembly.xml?rev=1639364&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/assembly.xml
 Thu Nov 13 15:16:04 2014
@@ -0,0 +1,34 @@
+
+
+   bin
+   
+   zip
+   
+   spring-${project.version}
+   true
+   
+   
+   WEB-INF/lib
+   false
+   runtime
+   
+   
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/pom.xml?rev=1639364&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-324/pom.xml
 Thu Nov 13 15:16:04 2014
@@ -0,0 +1,70 @@
+
+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/xsd/maven-4.0.0.xsd";>
+
+   4.0.0
+   mygroup
+   project2
+   0.0.1-SNAPSHOT
+jar
+
+   
+   
+   
+   maven-assembly-plugin
+   ${testVersion}
+   
+   
+   
assembly.xml
+   
+   
+   
+   
+   make-assembly
+   package
+   
+   single
+   
+   
+   
+   
+   
+   
+   
+   
+   org.apache.maven.shared
+   maven-shared-io
+   1.1
+   
+   
+   org.apache.maven
+   maven-artifact
+   2.0.2
+   provided
+   
+   
+
+

svn commit: r1639362 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/bugs/massembly-732/verify.bsh main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 15:15:27 2014
New Revision: 1639362

URL: http://svn.apache.org/r1639362
Log:
[MASSEMBLY-732] Fixed missing interpolation bit on assembly basedir

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/verify.bsh
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/verify.bsh?rev=1639362&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/verify.bsh
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/verify.bsh
 Thu Nov 13 15:15:27 2014
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+import java.net.*;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+
+
+
+boolean result = true;
+
+try
+{
+File zipFile = new File( basedir, "target/project2-0.0.1-SNAPSHOT-bin.zip" 
);
+
+if ( !zipFile.exists() || zipFile.isDirectory() )
+{
+System.err.println( "zip-file is missing or a directory." );
+result = false;
+}
+
+ZipFile zf = new ZipFile( zipFile );
+
+ZipArchiveEntry ze = zf.getEntry( 
"spring-0.0.1-SNAPSHOT/lib/project2-0.0.1-SNAPSHOT.jar" );
+if ( ze == null )
+{
+System.err.println( "filename is incorrect" );
+result = false;
+}
+zf.close();
+}
+catch( IOException e )
+{
+e.printStackTrace();
+result = false;
+}
+
+return result;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1639362&r1=1639361&r2=1639362&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
 Thu Nov 13 15:15:27 2014
@@ -19,6 +19,8 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
@@ -29,6 +31,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.model.FileItem;
 import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
 import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
+import org.apache.maven.shared.utils.StringUtils;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.ArchiverAttributeUtils;
@@ -93,8 +96,16 @@ public class FileItemAssemblyPhase
 destName = sourceName;
 }
 
+final String outputDirectory1;
+if (!StringUtils.isEmpty( assembly.getBaseDirectory()))
+{
+outputDirectory1  =  assembly.getBaseDirectory() +  
File.separator + fileItem.getOutputDirectory();
+} else {
+outputDirectory1 = fileItem.getOutputDirectory();
+}
+
 final String outputDirectory =
-AssemblyFormatUtils.getOutputDirectory( 
fileItem.getOutputDirectory(), configSource.getFinalName(), configSource,
+AssemblyFormatUtils.getO

svn commit: r1639248 - in /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive: phase/ task/ task/testutils/

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 05:28:17 2014
New Revision: 1639248

URL: http://svn.apache.org/r1639248
Log:
EasyMock, testing things you don't want to test for nearly 10 years

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
 Thu Nov 13 05:28:17 2014
@@ -286,6 +286,8 @@ public class ModuleSetAssemblyPhaseTest
 macTask.expectGetReactorProjects( projects );
 macTask.expectGetFinalName( "final-name" );
 macTask.expectGetDestFile( new File( "junk" ) );
+macTask.expectGetMode( 0777, 0777 );
+
 
 final int mode = TypeConversionUtils.modeToInt( "777", new 
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
 
@@ -374,6 +376,7 @@ public class ModuleSetAssemblyPhaseTest
 
 macTask.expectGetFinalName( "final-name" );
 macTask.expectGetDestFile( new File( "junk" ) );
+macTask.expectGetMode( 0222, 0222 );
 macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new 
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
 
@@ -459,6 +462,7 @@ public class ModuleSetAssemblyPhaseTest
 macTask.expectGetDestFile( new File( "junk" ) );
 macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new 
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+macTask.expectGetMode( 0222, 0222 );
 
 final ModuleBinaries binaries = new ModuleBinaries();
 
@@ -529,6 +533,8 @@ public class ModuleSetAssemblyPhaseTest
 
 macTask.expectGetFinalName( "final-name" );
 macTask.expectGetDestFile( new File( "junk" ) );
+macTask.expectGetMode( 0222, 0222 );
+
 
 macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777", new 
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=1639248&r1=1639247&r2=1639248&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
 Thu Nov 13 05:28:17 2014
@@ -74,6 +74,7 @@ public class AddArtifactTaskTest
 ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", 
"artifact", "version", "jar", false );
 File artifactFile = artifactMock.setNewFile();
 
+mac.expectGetMode( 0222, 0222 );
 mac.expectGetDestFile( new File( "junk" ) );
 mac.expectAddFile( artifactFile, outputLocation );
 mac.expectInterpolators();
@@ -100,6 +101,8 @@ public class AddArtifactTaskTest
 File file = mock.setNewFile();
 mock.setExtension( ext );
 
+mac.expectGetMode( 0222, 0222 );
+
 mac.expectGetDestFile( new File( "junk" ) );
 mac.expectAddFile( file, outputDir + art

svn commit: r1639247 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Nov 13 05:07:17 2014
New Revision: 1639247

URL: http://svn.apache.org/r1639247
Log:
p-io 2.3.5 and archvier 2.8.3

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1639247&r1=1639246&r2=1639247&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Nov 13 05:07:17 2014
@@ -125,7 +125,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  2.8.3-SNAPSHOT
+  2.8.3
   
 
   org.codehaus.plexus
@@ -156,7 +156,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-io
-  2.3.4
+  2.3.5
 
 
   org.apache.maven

svn commit: r1639035 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732: ./ assembly.xml pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Nov 12 20:29:29 2014
New Revision: 1639035

URL: http://svn.apache.org/r1639035
Log:
[MASSEMBLY-732] Added test project

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/pom.xml

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/assembly.xml?rev=1639035&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/assembly.xml
 Wed Nov 12 20:29:29 2014
@@ -0,0 +1,33 @@
+
+
+   bin
+   
+   zip
+   
+   spring-${project.version}
+   true
+   
+   
+   
${project.build.directory}/${project.artifactId}-${project.version}.jar
+   /lib
+   ${project.build.finalName}.jar
+   
+   
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/pom.xml?rev=1639035&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-732/pom.xml
 Wed Nov 12 20:29:29 2014
@@ -0,0 +1,52 @@
+
+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/xsd/maven-4.0.0.xsd";>
+
+   4.0.0
+   mygroup
+   project2
+   0.0.1-SNAPSHOT
+jar
+
+   
+   
+   
+   maven-assembly-plugin
+   ${testVersion}
+   
+   
+   
assembly.xml
+   
+   
+   
+   
+   make-assembly
+   package
+   
+   single
+   
+   
+   
+   
+   
+   
+   
+

svn commit: r1639029 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731: ./ symlinks/ symlinks/dirOnTheOutside/ symlinks/src/ symlinks/src/aRegularDir/ symlinks/src/tar

[krosenvold]

Author: krosenvold
Date: Wed Nov 12 20:21:48 2014
New Revision: 1639029

URL: http://svn.apache.org/r1639029
Log:
[MASSEMBLY-731] Added test project

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/FileInDirOnTheOutside.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/onTheOutside.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/regen.sh
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/aRegularFile.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileR.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileW.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileX.txt
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symDir
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToDirOnTheOutside
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToFileOnTheOutside
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symR
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symW
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symX
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/targetFile.txt

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/assembly.xml?rev=1639029&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/assembly.xml
 Wed Nov 12 20:21:48 2014
@@ -0,0 +1,36 @@
+
+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";>
+
+   deployable
+
+   
+   zip
+   
+
+   
+   
+   symlinks/src/**
+700
+ 600
+   
+   
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/pom.xml?rev=1639029&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/pom.xml
 Wed Nov 12 20:21:48 2014
@@ -0,0 +1,51 @@
+
+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/xsd/maven-4.0.0.xsd";>
+
+   4.0.0
+   mygroup
+   project2
+   0.0.1-SNAPSHOT
+
+   
+   
+   
+   maven-assembly-plugin
+   ${testVersion}
+   
+   
+   
assembly.xml
+   
+   
+   
+ 

svn commit: r1639022 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/bugs/massembly-580/ src/it/projects/bugs/massembly-580/src/ src/it/projects/bugs/massembly-580/src/main/ src/it

[krosenvold]

Author: krosenvold
Date: Wed Nov 12 20:03:48 2014
New Revision: 1639022

URL: http://svn.apache.org/r1639022
Log:
[MASSEMBLY-580] Fix

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1639022&r1=1639021&r2=1639022&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Nov 12 20:03:48 2014
@@ -125,7 +125,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  2.8.2
+  2.8.3-SNAPSHOT
   
 
   org.codehaus.plexus

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/pom.xml?rev=1639022&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/pom.xml
 Wed Nov 12 20:03:48 2014
@@ -0,0 +1,49 @@
+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/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+com.sulake.maven
+directory-mode-ignored
+10-SNAPSHOT
+pom
+
+
+UTF-8
+
+
+
+
+
+commons-fileupload
+commons-fileupload
+1.2.2
+
+
+
+
+
+
+
+maven-assembly-plugin
+${testVersion}
+
+project-deploy
+false
+
+src/main/assembly/release.xml
+
+
+
+
+make-assembly 
+package 
+
+single
+
+
+
+
+
+
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml?rev=1639022&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
 Wed Nov 12 20:03:48 2014
@@ -0,0 +1,20 @@
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
 http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+release
+
+zip
+
+false
+
+
+
${artifact.artifactId}.${artifact.extension}
+webapps
+true
+false
+runtime
+0644
+0750
+
+
+

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=1639022&r1=1639021&r2=1639022&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/

svn commit: r1638706 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Nov 12 06:40:54 2014
New Revision: 1638706

URL: http://svn.apache.org/r1638706
Log:
2.2.1 compatibility

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml?rev=1638706&r1=1638705&r2=1638706&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 Wed Nov 12 06:40:54 2014
@@ -24,10 +24,6 @@ under the License.
issue-mvn-assembly-plugin-730
0.0.1-SNAPSHOT
 
-   
-   3.0
-   
-


UTF-8

@@ -64,6 +60,11 @@ under the License.

 

+   org.apache.maven.plugins
+   maven-compiler-plugin
+   2.5.1
+   
+   
org.apache.maven.plugins
maven-surefire-plugin
2.18

svn commit: r1638205 - in /maven/plugins/trunk/maven-assembly-plugin/src/site: apt/advanced-descriptor-topics.apt.vm fml/faq.fml

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:21:53 2014
New Revision: 1638205

URL: http://svn.apache.org/r1638205
Log:
Added faq entry. Removed groupings

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1638205&r1=1638204&r2=1638205&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 Tue Nov 11 16:21:53 2014
@@ -46,7 +46,7 @@ Advanced Assembly-Descriptor Topics
   Elements of the same type will be processed in the order they appear in the
   descriptors. If you need to "overwrite" a file included by a previous set,
   the only way to do this is to exclude that file from the earlier set.
-  
+
   Note that this behaviour was slightly different in earlier versions of the
   assembly plugin.
 

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml?rev=1638205&r1=1638204&r2=1638205&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml Tue Nov 11 
16:21:53 2014
@@ -63,8 +63,6 @@ under the License.
 
   
 
-  
-  
 
   
 In previous versions (before 2.2 final), I followed the example in the 
documentation for sharing assembly 
descriptors, 
@@ -81,8 +79,6 @@ under the License.
 
   
 
-  
-  
 
   What goal should I use to create an assembly as part of my 
normal build process?
   
@@ -157,8 +153,6 @@ under the License.
 
   
 
-  
-  
 
   
 I have a dependencySet that includes some artifacts with classifiers, 
and others without classifiers.
@@ -208,5 +202,18 @@ under the License.
 
   
 
+
+  
+Tar complains about groupid value being too big
+  
+  
+
+  GNU tar has restrictions on max value of UID/GUID in tar files.
+  Consider using the more well defined POSIX tar format, which should 
support
+  larger values. Use tarLongFileMode=posix.
+
+  
+
+
   
 

svn commit: r1638201 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:11:40 2014
New Revision: 1638201

URL: http://svn.apache.org/r1638201
Log:
[MASSEMBLY-609] Proper docs on how to interpolate artifacts

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1638201&r1=1638200&r2=1638201&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
 Tue Nov 11 16:11:40 2014
@@ -77,7 +77,7 @@ Including Module Binaries
 org.test:child1
   
   
-modules/${artifactId}
+modules/${project.artifactId}
 false
   
 

svn commit: r1638200 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:07:55 2014
New Revision: 1638200

URL: http://svn.apache.org/r1638200
Log:
[MASSEMBLY-655] Further improved docs

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1638200&r1=1638199&r2=1638200&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 Tue Nov 11 16:07:55 2014
@@ -34,21 +34,19 @@ Advanced Assembly-Descriptor Topics
 
 * Archive file resolution
 
+  If two or more elements (e.g., file, fileSet) select different sources for
+  the same file for archiving, only one of the source files will be archived.
+
   As per version 2.5.2 of the assembly plugin, the first phase to
   add the file to the archive "wins". The filtering is done solely based
   on name inside the archive, so the same source file can be added under
   different output names. The order of the phases is as follows:
   1) FileItem 2) FileSets 3) ModuleSet 4) DepenedencySet and 5) Repository 
elements.
 
-  Within elements of the same type, there is no guarantee of which will
-  win for the same output name. If two filesets choose the same output file
-  with different content, the result is arbitrary. Use exclusions to avoid 
this.
-
-  If two or more elements (e.g., file, fileSet) select different sources for
-  the same file for archiving, only one of the source files will be archived.
-  The assembly plugin decides which source will be archived according to the
-  following behavior (as per 2.5.2).
-
+  Elements of the same type will be processed in the order they appear in the
+  descriptors. If you need to "overwrite" a file included by a previous set,
+  the only way to do this is to exclude that file from the earlier set.
+  
   Note that this behaviour was slightly different in earlier versions of the
   assembly plugin.
 

svn commit: r1638198 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check: ./ emptyfile.txt invoker.properties pom.xml src.xml verify.groovy

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:03:55 2014
New Revision: 1638198

URL: http://svn.apache.org/r1638198
Log:
Added precedence check for file items

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt?rev=1638198&view=auto
==
(empty)

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties?rev=1638198&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
 Tue Nov 11 16:03:55 2014
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean 
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml?rev=1638198&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
 Tue Nov 11 16:03:55 2014
@@ -0,0 +1,47 @@
+
+
+
+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";>
+  4.0.0
+  
+org.apache.maven.plugin.assembly.test
+it-project-parent
+1
+  
+  
+  test
+  excluding-svn-dirs
+  jar
+  1.0-SNAPSHOT
+
+  
+
+  
+maven-assembly-plugin
+
+  
+src.xml
+  
+
+  
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml?rev=1638198&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
 Tue Nov 11 16:03:55 2014
@@ -0,0 +1,39 @@
+
+
+
+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";>
+  src
+  
+dir
+  
+  false
+  
+
+  emptyfile.txt
+  fud.txt
+
+
+  src.xml
+  fud.txt
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-as

svn commit: r1638197 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583: ./ child1/ child1/src/ child1/src/main/ child1/src/main/resources/ child1/src/main/resources/bi

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:02:49 2014
New Revision: 1638197

URL: http://svn.apache.org/r1638197
Log:
[MASSEMBLY-583] Added testcase (fixed MASSEMBLY-726, r1637662)

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/empty.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child2/src/main/assembly/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/verify.bsh

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/pom.xml?rev=1638197&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/pom.xml
 Tue Nov 11 16:02:49 2014
@@ -0,0 +1,28 @@
+
+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/xsd/maven-4.0.0.xsd";>
+
+   4.0.0
+   mygroup
+   project1
+   0.0.1-SNAPSHOT
+   
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh?rev=1638197&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh
 Tue Nov 11 16:02:49 2014
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh?rev=1638197&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly

svn commit: r1638196 - /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 16:00:30 2014
New Revision: 1638196

URL: http://svn.apache.org/r1638196
Log:
Added license

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java?rev=1638196&r1=1638195&r2=1638196&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
 Tue Nov 11 16:00:30 2014
@@ -1,5 +1,23 @@
 package org.apache.maven.plugin.assembly.archive.phase;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
 import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;

svn commit: r1638029 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml

[krosenvold]

Author: krosenvold
Date: Tue Nov 11 05:47:07 2014
New Revision: 1638029

URL: http://svn.apache.org/r1638029
Log:
I love the time I'm wasting on jdk1.5

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml?rev=1638029&r1=1638028&r2=1638029&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 Tue Nov 11 05:47:07 2014
@@ -37,17 +37,6 @@ under the License.
 


-   org.apache.maven.plugins
-   maven-compiler-plugin
-   3.1
-   
-   
-   1.6
-   1.6
-   
-   
-
-   
maven-jar-plugin
2.5

@@ -121,7 +110,7 @@ under the License.

commons-io
commons-io
-   2.4
+   2.2
test

 

svn commit: r1637974 - /maven/shared/trunk/maven-repository-builder/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 20:19:41 2014
New Revision: 1637974

URL: http://svn.apache.org/r1637974
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637974&r1=1637973&r2=1637974&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 20:19:41 2014
@@ -28,14 +28,14 @@ under the License.
   
 
   maven-repository-builder
-  1.0
+  1.1-SNAPSHOT
 
   Apache Maven Repository Builder
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
-
http://svn.apache.org/viewvc/maven/shared/tags/maven-repository-builder-1.0
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
+
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder
   
   
 jira

svn commit: r1637972 - /maven/shared/trunk/maven-repository-builder/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 20:19:23 2014
New Revision: 1637972

URL: http://svn.apache.org/r1637972
Log:
[maven-release-plugin] prepare release maven-repository-builder-1.0

Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637972&r1=1637971&r2=1637972&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 20:19:23 2014
@@ -28,14 +28,14 @@ under the License.
   
 
   maven-repository-builder
-  1.1-SNAPSHOT
+  1.0
 
   Apache Maven Repository Builder
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
-
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
+
http://svn.apache.org/viewvc/maven/shared/tags/maven-repository-builder-1.0
   
   
 jira

svn commit: r1637973 - /maven/shared/tags/maven-repository-builder-1.0/

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 20:19:37 2014
New Revision: 1637973

URL: http://svn.apache.org/r1637973
Log:
[maven-release-plugin] copy for tag maven-repository-builder-1.0

Added:
maven/shared/tags/maven-repository-builder-1.0/
  - copied from r1637972, maven/shared/trunk/maven-repository-builder/

svn commit: r1637971 - /maven/shared/tags/maven-repository-builder-1.0/

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 20:18:28 2014
New Revision: 1637971

URL: http://svn.apache.org/r1637971
Log:
Once more


Removed:
maven/shared/tags/maven-repository-builder-1.0/

svn commit: r1637970 - /maven/shared/trunk/maven-repository-builder/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 20:17:31 2014
New Revision: 1637970

URL: http://svn.apache.org/r1637970
Log:
Updated deps

Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637970&r1=1637969&r2=1637970&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 20:17:31 2014
@@ -67,14 +67,18 @@ under the License.
 
   org.apache.maven.shared
   maven-common-artifact-filters
-  1.0-alpha-1
+  1.4
 
 
   org.apache.maven.shared
   maven-shared-utils
   0.3
 
-
+
+  commons-codec
+  commons-codec
+  1.6
+
 
   junit
   junit
@@ -84,7 +88,7 @@ under the License.
 
   org.apache.maven.shared
   maven-test-tools
-  1.0-alpha-1
+  1.0-alpha-2
   test
 
 
@@ -94,11 +98,6 @@ under the License.
   test
 
 
-  commons-codec
-  commons-codec
-  1.6
-
-
   org.apache.maven.wagon
   wagon-http-lightweight
   1.0-beta-2

svn commit: r1637966 - /maven/shared/tags/maven-repository-builder-1.0/

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 19:58:06 2014
New Revision: 1637966

URL: http://svn.apache.org/r1637966
Log:
[maven-release-plugin] copy for tag maven-repository-builder-1.0

Added:
maven/shared/tags/maven-repository-builder-1.0/
  - copied from r1637965, maven/shared/trunk/maven-repository-builder/

svn commit: r1637965 - /maven/shared/trunk/maven-repository-builder/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 19:57:52 2014
New Revision: 1637965

URL: http://svn.apache.org/r1637965
Log:
[maven-release-plugin] prepare release maven-repository-builder-1.0

Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637965&r1=1637964&r2=1637965&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 19:57:52 2014
@@ -17,7 +17,7 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-
+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/xsd/maven-4.0.0.xsd";>
   4.0.0
 
   
@@ -28,14 +28,14 @@ under the License.
   
 
   maven-repository-builder
-  1.0-alpha-3-SNAPSHOT
+  1.0
 
   Apache Maven Repository Builder
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
-
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
+
http://svn.apache.org/viewvc/maven/shared/tags/maven-repository-builder-1.0
   
   
 jira

svn commit: r1637967 - /maven/shared/trunk/maven-repository-builder/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 19:58:09 2014
New Revision: 1637967

URL: http://svn.apache.org/r1637967
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637967&r1=1637966&r2=1637967&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 19:58:09 2014
@@ -28,14 +28,14 @@ under the License.
   
 
   maven-repository-builder
-  1.0
+  1.1-SNAPSHOT
 
   Apache Maven Repository Builder
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-repository-builder-1.0
-
http://svn.apache.org/viewvc/maven/shared/tags/maven-repository-builder-1.0
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-repository-builder
+
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder
   
   
 jira

svn commit: r1637963 - /maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 19:45:25 2014
New Revision: 1637963

URL: http://svn.apache.org/r1637963
Log:
Checkstyla

Modified:

maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

Modified: 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1637963&r1=1637962&r2=1637963&view=diff
==
--- 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 (original)
+++ 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 Mon Nov 10 19:45:25 2014
@@ -82,7 +82,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
-import static org.apache.commons.codec.digest.DigestUtils.*;
+import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
+import static org.apache.commons.codec.digest.DigestUtils.shaHex;
 
 /**
  * @author Jason van Zyl

svn commit: r1637962 - in /maven/shared/trunk/maven-repository-builder: pom.xml src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java src/main/java/org/apache/maven/shared/r

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 19:42:15 2014
New Revision: 1637962

URL: http://svn.apache.org/r1637962
Log:
[MSHARED-164] Replaced digestutils with commons-codec

Removed:

maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java
Modified:
maven/shared/trunk/maven-repository-builder/pom.xml

maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1637962&r1=1637961&r2=1637962&view=diff
==
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Mon Nov 10 19:42:15 2014
@@ -94,6 +94,11 @@ under the License.
   test
 
 
+  commons-codec
+  commons-codec
+  1.6
+
+
   org.apache.maven.wagon
   wagon-http-lightweight
   1.0-beta-2

Modified: 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1637962&r1=1637961&r2=1637962&view=diff
==
--- 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 (original)
+++ 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 Mon Nov 10 19:42:15 2014
@@ -52,7 +52,6 @@ import org.apache.maven.shared.artifact.
 import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
 import org.apache.maven.shared.repository.model.GroupVersionAlignment;
 import org.apache.maven.shared.repository.model.RepositoryInfo;
-import org.apache.maven.shared.repository.utils.DigestUtils;
 import org.apache.maven.shared.utils.io.FileUtils;
 import org.apache.maven.shared.utils.io.IOUtil;
 import org.codehaus.plexus.PlexusConstants;
@@ -66,11 +65,11 @@ import org.codehaus.plexus.logging.conso
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Field;
-import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -83,6 +82,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
+import static org.apache.commons.codec.digest.DigestUtils.*;
+
 /**
  * @author Jason van Zyl
  * @plexus.component 
role="org.apache.maven.shared.repository.RepositoryAssembler" 
role-hint="default"
@@ -531,20 +532,17 @@ public class DefaultRepositoryAssembler
 private void writeChecksums( File file )
 throws IOException, RepositoryAssemblyException
 {
-try
-{
-String md5 = DigestUtils.createChecksum( file, "MD5" );
-String sha1 = DigestUtils.createChecksum( file, "SHA-1" );
-
-FileUtils.fileWrite( new File( file.getParentFile(), 
file.getName() + ".md5" ).getAbsolutePath(),
- md5.toLowerCase() );
-FileUtils.fileWrite( new File( file.getParentFile(), 
file.getName() + ".sha1" ).getAbsolutePath(),
- sha1.toLowerCase() );
-}
-catch ( NoSuchAlgorithmException e )
-{
-throw new RepositoryAssemblyException( "Unable to get write 
checksums: " + e.getMessage(), e );
-}
+FileInputStream data = new FileInputStream( file );
+String md5 = md5Hex( data ).toUpperCase();
+data.close();
+FileInputStream data1 = new FileInputStream( file );
+String sha1 = shaHex( data1 ).toUpperCase();
+data1.close();
+
+FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + 
".md5" ).getAbsolutePath(),
+ md5.toLowerCase() );
+FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + 
".sha1" ).getAbsolutePath(),
+ sha1.toLowerCase() );
 }
 
 protected Map createGroupVersionAlignments( List versionAlignments )

svn commit: r1637956 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/bugs/massembly-730/ src/it/projects/bugs/massembly-730/src/ src/it/projects/bugs/massembly-730/src/test/ src/it

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 18:40:34 2014
New Revision: 1637956

URL: http://svn.apache.org/r1637956
Log:
[MASSEMBLY-730]Fix and  Testcase

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/fr/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/assembly/JarWithDependenciesTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1637956&r1=1637955&r2=1637956&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Nov 10 18:40:34 2014
@@ -156,7 +156,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-io
-  2.3.3
+  2.3.4
 
 
   org.apache.maven

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml?rev=1637956&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-730/pom.xml
 Mon Nov 10 18:40:34 2014
@@ -0,0 +1,130 @@
+
+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/xsd/maven-4.0.0.xsd";>
+   4.0.0
+
+   fr.husta.test
+   issue-mvn-assembly-plugin-730
+   0.0.1-SNAPSHOT
+
+   
+   3.0
+   
+
+   
+   
UTF-8
+   
+
+   
+   ${project.artifactId}
+
+   
+   
+   org.apache.maven.plugins
+   maven-compiler-plugin
+   3.1
+   
+   
+   1.6
+   1.6
+   
+   
+
+   
+   maven-jar-plugin
+   2.5
+   
+
+   
+   maven-assembly-plugin
+   ${testVersion}
+   
+   
+   
+   
+   
+   test-pkg
+   package
+   
+   single
+   
+   
+   
+   
jar-with-dependencies
+   
+   
+   
+   
+   
+
+   
+   org.apache.maven.plugins
+   maven-surefire-plugin
+   2.18
+   
+   true
+   
+   
+   
+   
unit-tests-after-packaging
+   package
+   
+   

svn commit: r1637947 - in /maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository: DefaultRepositoryAssembler.java utils/DigestUtils.java

[krosenvold]

Author: krosenvold
Date: Mon Nov 10 17:52:44 2014
New Revision: 1637947

URL: http://svn.apache.org/r1637947
Log:
Changed log warn message that ws irritating to assembly users

Modified:

maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java

Modified: 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1637947&r1=1637946&r2=1637947&view=diff
==
--- 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 (original)
+++ 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 Mon Nov 10 17:52:44 2014
@@ -53,6 +53,8 @@ import org.apache.maven.shared.artifact.
 import org.apache.maven.shared.repository.model.GroupVersionAlignment;
 import org.apache.maven.shared.repository.model.RepositoryInfo;
 import org.apache.maven.shared.repository.utils.DigestUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -62,8 +64,6 @@ import org.codehaus.plexus.logging.Abstr
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -78,7 +78,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -95,7 +94,7 @@ public class DefaultRepositoryAssembler
 implements RepositoryAssembler, Contextualizable
 {
 private static final String[] PREFERRED_RESOLVER_HINTS = { 
"project-cache-aware", // Provided in Maven 2.1-SNAPSHOT
-  "default" };
+"default" };
 
 protected static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( 
"UTC" );
 
@@ -175,7 +174,7 @@ public class DefaultRepositoryAssembler
 if ( logger.isDebugEnabled() )
 {
 logger.debug( "dependency-artifact set for project: " + 
project.getId()
-+ " is null. Skipping repository processing." );
+  + " is null. Skipping repository 
processing." );
 }
 
 return;
@@ -193,8 +192,7 @@ public class DefaultRepositoryAssembler
 // FIXME I'm not getting runtime dependencies here
 result = artifactResolver.resolveTransitively( 
dependencyArtifacts, project.getArtifact(),

getManagedVersionMap( project ), localRepository,
-   
project.getRemoteArtifactRepositories(),
-   metadataSource );
+   
project.getRemoteArtifactRepositories(), metadataSource );
 }
 catch ( ArtifactResolutionException e )
 {
@@ -256,15 +254,15 @@ public class DefaultRepositoryAssembler
 
 if ( ( includes == null ) || includes.isEmpty() )
 {
-List patterns = new ArrayList();
+List patterns = new ArrayList();
 
 Set projectArtifacts = project.getDependencyArtifacts();
 
 if ( projectArtifacts != null )
 {
-for ( Iterator it = projectArtifacts.iterator(); it.hasNext(); 
)
+for ( Object projectArtifact : projectArtifacts )
 {
-Artifact artifact = (Artifact) it.next();
+Artifact artifact = (Artifact) projectArtifact;
 
 patterns.add( artifact.getDependencyConflictId() );
 }
@@ -312,9 +310,9 @@ public class DefaultRepositoryAssembler
 
 FileUtils.mkdir( repositoryDirectory.getAbsolutePath() );
 
-for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+for ( Object o : result.getArtifacts() )
 {
- 

svn commit: r1637700 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 17:33:20 2014
New Revision: 1637700

URL: http://svn.apache.org/r1637700
Log:
OMG java1.5 is getting so old

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1637700&r1=1637699&r2=1637700&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 Sun Nov  9 17:33:20 2014
@@ -82,7 +82,7 @@ public class ReaderFormatter
 }
 catch ( MavenFilteringException e )
 {
-throw new IOException( "Error filtering file '" + source + "': " + 
e.getMessage(), e );
+throw new IOException( "Error filtering file '" + source + "': " + 
e.getMessage() );
 }
 }
 

svn commit: r1637673 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 13:02:35 2014
New Revision: 1637673

URL: http://svn.apache.org/r1637673
Log:
Okay then, maybe that was a jdk 1.7 method

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java?rev=1637673&r1=1637672&r2=1637673&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
 Sun Nov  9 13:02:35 2014
@@ -29,6 +29,6 @@ public class AssemblyArchiverPhaseCompar
 if (!o1hasOrder && ! o2hasOrder) return 
o1.getClass().getName().compareTo( o2.getClass().getName() );
 if (!o1hasOrder) return -1;
 if (!o2hasOrder) return +1;
-return Integer.compare( ((PhaseOrder)o1).order(), 
((PhaseOrder)o2).order() );
+return new Integer(((PhaseOrder)o1).order()).compareTo( 
((PhaseOrder)o2).order() );
 }
 }

svn commit: r1637662 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/ main/java/org/apache/maven/plugin/assembly/archive/phase/ site/apt/ test/j

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 12:07:19 2014
New Revision: 1637662

URL: http://svn.apache.org/r1637662
Log:
Locked down phase ordering

Updated docs to reflect reality

Added:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1637662&r1=1637661&r2=1637662&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 Sun Nov  9 12:07:19 2014
@@ -24,6 +24,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
 import org.apache.maven.plugin.assembly.archive.archiver.AssemblyProxyArchiver;
 import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
+import 
org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhaseComparator;
 import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
 import org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter;
 import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
@@ -70,6 +71,7 @@ import java.io.StringReader;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -115,6 +117,12 @@ public class DefaultAssemblyArchiver
 this.assemblyPhases = assemblyPhases;
 }
 
+private List sortedPhases(){
+List sorted = new 
ArrayList( assemblyPhases );
+Collections.sort( sorted, new AssemblyArchiverPhaseComparator() );
+return sorted;
+}
+
 /** {@inheritDoc} */
 public File createArchive( final Assembly assembly, final String fullName, 
final String format,
final AssemblerConfigurationSource 
configSource, boolean recompressZippedFiles )
@@ -159,7 +167,7 @@ public class DefaultAssemblyArchiver
 
 archiver.setDestFile( destFile );
 
-for ( AssemblyArchiverPhase phase : assemblyPhases )
+for ( AssemblyArchiverPhase phase : sortedPhases() )
 {
 phase.execute( assembly, archiver, configSource );
 }

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java?rev=1637662&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
 Sun Nov  9 12:07:19 2014
@@ -0,0 +1,34 @@
+package org.apache.maven.plugin.assembly.archive.phase;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed wi

svn commit: r1637652 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/format/ main/java/org/apache/maven/plugin/assembly/utils/ test/java/org/apache/mave

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 11:18:17 2014
New Revision: 1637652

URL: http://svn.apache.org/r1637652
Log:
[MASSEMBLY-729] Lineendings also without filtering

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1637652&r1=1637651&r2=1637652&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 Sun Nov  9 11:18:17 2014
@@ -42,7 +42,7 @@ public class ReaderFormatter
 {
 private static Reader createReaderFilter( @Nonnull Reader source, String 
escapeString, List delimiters,
   AssemblerConfigurationSource 
configSource, boolean isPropertiesFile )
-throws AssemblyFormattingException
+throws IOException
 {
 try
 {
@@ -82,7 +82,7 @@ public class ReaderFormatter
 }
 catch ( MavenFilteringException e )
 {
-throw new AssemblyFormattingException( "Error filtering file '" + 
source + "': " + e.getMessage(), e );
+throw new IOException( "Error filtering file '" + source + "': " + 
e.getMessage(), e );
 }
 }
 
@@ -92,53 +92,36 @@ public class ReaderFormatter
final boolean isFiltered, 
String fileSetLineEnding )
 throws AssemblyFormattingException
 {
-final String lineEndingHint = fileSetLineEnding;
+final LineEndings lineEndingToUse = LineEndingsUtils.getLineEnding( 
fileSetLineEnding );
 
-String lineEnding = LineEndingsUtils.getLineEndingCharacters( 
lineEndingHint );
+final boolean transformLineEndings = !LineEndings.keep.equals( 
lineEndingToUse );
 
-if ( ( lineEnding != null ) || isFiltered )
+if ( transformLineEndings || isFiltered )
 {
 return new InputStreamTransformer()
 {
 public InputStream transform( PlexusIoResource 
plexusIoResource, InputStream inputStream )
 throws IOException
 {
+InputStream result = inputStream;
 if ( isFiltered )
 {
 final String encoding = configSource.getEncoding();
 
-Reader source = encoding != null
-? new InputStreamReader( inputStream, encoding )
+Reader source = encoding != null ? new 
InputStreamReader( inputStream, encoding )
 : new InputStreamReader( inputStream ); // wtf 
platform encoding ? TODO: Fix this
-try
-{
-boolean isPropertyFile = 
AssemblyFileUtils.isPropertyFile( plexusIoResource.getName() );
-Reader filtered =
-createReaderFilter( source, 
configSource.getEscapeString(), configSource.getDelimiters(),
-configSource, 
isPropertyFile );
-final ReaderInputStream readerInputStream = 
encoding != null
-? new ReaderInputStream( filtered, encoding )
-: new ReaderInputStream( filtered );
-
-LineEndings lineEnding = 
LineEndingsUtils.getLineEnding( lineEndingHint );
-if ( !LineEndings.keep.equals( lineEnding ) )
-{
-return LineEndingsUtils.lineEndingConverter( 
readerInputStream, lineEnding );
-
-}
-return readerInputStream;
-
-}
-catch ( AssemblyFormattingException e )
-{
-throw new IOException( e.getMessage() );
-}
-
+boolean isPropertyFile = 
AssemblyFileUtils.isPropertyFile( plexusIoResource.getName() );
+Reader filtered =
+createReaderFil

svn commit: r1637649 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 10:51:35 2014
New Revision: 1637649

URL: http://svn.apache.org/r1637649
Log:
Removed filtering from the ProxyArchiver. No tests broke and it only created 
troubles

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1637649&r1=1637648&r2=1637649&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Sun Nov  9 10:51:35 2014
@@ -43,10 +43,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Delegating archiver implementation that supports:
@@ -77,7 +75,6 @@ public class AssemblyProxyArchiver
 
 private boolean forced;
 
-private final Set seenPaths = new HashSet();
 
 private final String assemblyWorkPath;
 
@@ -149,13 +146,6 @@ public class AssemblyProxyArchiver
 public void addArchivedFileSet( final @Nonnull File archiveFile, final 
String prefix, final String[] includes,
 final String[] excludes )
 {
-final String archiveKey = getArchiveKey( archiveFile, prefix );
-if ( seenPaths.contains( archiveKey ) )
-{
-warn( "Archive: " + archiveFile + " has already been added. 
Skipping." );
-return;
-}
-
 inPublicApi.set( Boolean.TRUE );
 try
 {
@@ -176,7 +166,6 @@ public class AssemblyProxyArchiver
 else
 {
 delegate.addArchivedFileSet( fs );
-seenPaths.add( archiveKey );
 }
 }
 finally
@@ -185,11 +174,6 @@ public class AssemblyProxyArchiver
 }
 }
 
-private String getArchiveKey( final File archiveFile, final String prefix )
-{
-return archiveFile.getAbsolutePath() + ":" + prefix;
-}
-
 private void debug( final String message )
 {
 if ( ( logger != null ) && logger.isDebugEnabled() )
@@ -198,27 +182,12 @@ public class AssemblyProxyArchiver
 }
 }
 
-private void warn( final String message )
-{
-if ( ( logger != null ) && logger.isWarnEnabled() )
-{
-logger.warn( message );
-}
-}
-
 /**
  * {@inheritDoc}
  */
 public void addArchivedFileSet( final @Nonnull File archiveFile, final 
String prefix )
 throws ArchiverException
 {
-final String archiveKey = getArchiveKey( archiveFile, prefix );
-if ( seenPaths.contains( archiveKey ) )
-{
-warn( "Archive: " + archiveFile + " has already been added. 
Skipping." );
-return;
-}
-
 inPublicApi.set( Boolean.TRUE );
 try
 {
@@ -237,7 +206,6 @@ public class AssemblyProxyArchiver
 else
 {
 delegate.addArchivedFileSet( fs );
-seenPaths.add( archiveKey );
 }
 }
 finally
@@ -252,13 +220,6 @@ public class AssemblyProxyArchiver
 public void addArchivedFileSet( final File archiveFile, final String[] 
includes, final String[] excludes )
 throws ArchiverException
 {
-final String archiveKey = getArchiveKey( archiveFile, "" );
-if ( seenPaths.contains( archiveKey ) )
-{
-warn( "Archive: " + archiveFile + " has already been added. 
Skipping." );
-return;
-}
-
 inPublicApi.set( Boolean.TRUE );
 try
 {
@@ -279,7 +240,6 @@ public class AssemblyProxyArchiver
 else
 {
 delegate.addArchivedFileSet( fs );
-seenPaths.add( archiveKey );
 }
 }
 finally
@@ -294,13 +254,6 @@ public class AssemblyProxyArchiver
 public void addArchivedFileSet( final @Nonnull File archiveFile )
 throws ArchiverException
 {
-final String archiveKey = getArchiveKey( archiveFile, "" );
-if ( seenPaths.contains( archiveKey ) )
-{
-warn( "Archive: " + archiveFile + " has already been added. 
Skipping." );
-ret

svn commit: r1637647 [2/2] - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/ src/main/java/org/apache/maven/plugin/assembly/

[krosenvold]

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1637647&r1=1637646&r2=1637647&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
 Sun Nov  9 10:37:22 2014
@@ -26,6 +26,7 @@ import junit.framework.TestCase;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
 import 
org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
 import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
 import org.apache.maven.plugin.assembly.model.Assembly;
@@ -107,6 +108,8 @@ public class FileSetAssemblyPhaseTest
 
 macTask.expectAdditionOfSingleFileSet( project, "final-name", false, 
modes, 1, true );
 
+DefaultAssemblyArchiverTest.setupInterpolators(  macTask.configSource  
);
+
 mm.replayAll();
 
 createPhase( macLogger ).execute( assembly, macTask.archiver, 
macTask.configSource );

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1637647&r1=1637646&r2=1637647&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
 Sun Nov  9 10:37:22 2014
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
 import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
 import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
 import 
org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
 import 
org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
@@ -151,6 +152,8 @@ public class ModuleSetAssemblyPhaseTest
 
 artifactProject.setArtifact( artifactMock.getArtifact() );
 
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+
 mm.replayAll();
 
 final FileSet result =
@@ -192,6 +195,7 @@ public class ModuleSetAssemblyPhaseTest
 final ArtifactMock artifactMock = new ArtifactMock( mm, "group", 
"artifact", "version", "jar", false );
 
 artifactProject.setArtifact( artifactMock.getArtifact() );
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
 
 mm.replayAll();
 
@@ -233,6 +237,7 @@ public class ModuleSetAssemblyPhaseTest
 final ArtifactMock artifactMock = new ArtifactMock( mm, "group", 
"artifact", "version", "jar", false );
 
 project.setArtifact( artifactMock.getArtifact() );
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
 
 mm.replayAll();
 
@@ -306,6 +311,8 @@ public class ModuleSetAssemblyPhaseTest
 final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
 
 macTask.expectResolveDependencySets();
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+
 mm.replayAll();
 
 final ModuleSetAssemblyPhase phase = createPhase( logger, 
macTask.dependencyResolver, null);
@@ -385,6 +392,7 @@ public class ModuleSetAssemblyPhaseTest
 final Set projects = singleton( project );
 
 macTask.expectResolveDependencySets();
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
 
 mm.replayAll();
 
@@ -466,6 +474,7 @@ public class ModuleSetAssemblyPhaseTest
 final Set projects = singleton( project );
 
 macTask.expectResolveDependencySets();
+DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
 
 mm.replayAll();
 
@@ -529,6 +538,7 @@ public class ModuleSetAssemblyPhaseTest
 binaries.setOutputFileNameMapping( "artifact" );
   

svn commit: r1637647 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/ src/main/java/org/apache/maven/plugin/assembly/

[krosenvold]

Author: krosenvold
Date: Sun Nov  9 10:37:22 2014
New Revision: 1637647

URL: http://svn.apache.org/r1637647
Log:
Ported to fixed interpolator

Added:

maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java
  - copied, changed from r1637570, 
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1637647&r1=1637646&r2=1637647&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun Nov  9 10:37:22 2014
@@ -120,7 +120,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.22
 
 
   org.codehaus.plexus

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/jav

svn commit: r7071 - in /release/maven/plugins: maven-assembly-plugin-2.5-source-release.zip maven-assembly-plugin-2.5-source-release.zip.asc maven-assembly-plugin-2.5-source-release.zip.md5

[krosenvold]

Author: krosenvold
Date: Fri Nov  7 20:21:49 2014
New Revision: 7071

Log:
Removed 2.5

Removed:
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5

svn commit: r7070 - in /release/maven/plugins: maven-assembly-plugin-2.5.1-source-release.zip maven-assembly-plugin-2.5.1-source-release.zip.asc maven-assembly-plugin-2.5.1-source-release.zip.md5

[krosenvold]

Author: krosenvold
Date: Fri Nov  7 20:21:22 2014
New Revision: 7070

Log:
Added 2.5.1

Added:
release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip   
(with props)
release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5

Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc
==
--- release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.asc 
Fri Nov  7 20:21:22 2014
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iF4EABEIAAYFAlRY6lkACgkQRmyu1uB0fVBS+gEAwd8/cuoFrpa6xBeIPOx80+AX
+IvnfCw9d9EmwZjkGYjUBAMrUFUYiY8iXq8j66dhwmQIpzGMnJAiP3KaiV45JP5ia
+=oXLM
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5
==
--- release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5.1-source-release.zip.md5 
Fri Nov  7 20:21:22 2014
@@ -0,0 +1 @@
+90caba903bd37cb87e9d69312a8340c3
\ No newline at end of file

svn commit: r1636538 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 10:52:26 2014
New Revision: 1636538

URL: http://svn.apache.org/r1636538
Log:
[maven-release-plugin] prepare release maven-assembly-plugin-2.5.1

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1636538&r1=1636537&r2=1636538&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov  4 10:52:26 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.5.2-SNAPSHOT
+  2.5.1
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1
   
   
 jira

svn commit: r1636539 - /maven/plugins/tags/maven-assembly-plugin-2.5.1/

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 10:52:38 2014
New Revision: 1636539

URL: http://svn.apache.org/r1636539
Log:
[maven-release-plugin]  copy for tag maven-assembly-plugin-2.5.1

Added:
maven/plugins/tags/maven-assembly-plugin-2.5.1/   (props changed)
  - copied from r1636538, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
--- svn:ignore (added)
+++ svn:ignore Tue Nov  4 10:52:38 2014
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov  4 10:52:38 2014
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691

svn commit: r1636540 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 10:52:42 2014
New Revision: 1636540

URL: http://svn.apache.org/r1636540
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1636540&r1=1636539&r2=1636540&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov  4 10:52:42 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.5.1
+  2.6-SNAPSHOT
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
   
   
 jira

svn commit: r1636536 - /maven/plugins/tags/maven-assembly-plugin-2.5.1/

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 10:46:13 2014
New Revision: 1636536

URL: http://svn.apache.org/r1636536
Log:
Removed bad tag

Removed:
maven/plugins/tags/maven-assembly-plugin-2.5.1/

svn commit: r1636535 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/dependency-sets/massembly-395/ src/it/projects/dependency-sets/massembly-395/child1/ src/it/projects/dependency

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 10:43:54 2014
New Revision: 1636535

URL: http://svn.apache.org/r1636535
Log:
[MASSEMBLY-727] Implied dependencysets have incorrect outputfilemapping

Updated IT for massambly-395 which originally demonstrated this problem

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/App.java
  - copied, changed from r1636510, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/App2.java
  - copied, changed from r1636510, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/App.java

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/mycompany/app/App2.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1636535&r1=1636534&r2=1636535&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov  4 10:43:54 2014
@@ -456,6 +456,7 @@ under the License.
 
dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml
 
dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml
 
+**/my-app*/pom.xml
 **/child*/pom.xml
 **/module*/pom.xml
 **/descriptor/pom.xml

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembl

svn commit: r1636510 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/dependency-sets/massembly-395/ it/projects/dependency-sets/massembly-395/my-app-module1/ it/projects/dependency-se

[krosenvold]

Author: krosenvold
Date: Tue Nov  4 06:19:05 2014
New Revision: 1636510

URL: http://svn.apache.org/r1636510
Log:
[MASSEMBLY-395] Fixed primary problem of scope upgrades not being detected

Testcase submitted by Jaan Vajakas, modified slightly by me

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/App.java

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/mycompany/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/mycompany/app/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/mycompany/app/App2.java

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfoTest.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml?rev=1636510&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml
 Tue Nov  4 06:19:05 2014
@@ -0,0 +1,19 @@
+
+  4.0.0
+  com.mycompany.app
+  my-app-module1
+  my-app-module1
+  1.0-SNAPSHOT
+  
+ 
+  my-app-module2
+  com.mycompany.app
+  1.0-SNAPSHOT
+
+
+  junit
+  junit
+  3.8.1
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/App.java?rev=1636510&view=auto
==
--- 
maven/plugi

svn commit: r1636427 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/multimodule/massembly-619/ it/projects/multimodule/massembly-619/child-client/ it/projects/multimodule/massembly-6

[krosenvold]

Author: krosenvold
Date: Mon Nov  3 20:01:39 2014
New Revision: 1636427

URL: http://svn.apache.org/r1636427
Log:
[MASSEMBLY-619] Bleed happens on dependencySets in modules too

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/src/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/src/assembly/client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/verify.bsh
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/src/assemble/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/assembly.xml?rev=1636427&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/assembly.xml
 Mon Nov  3 20:01:39 2014
@@ -0,0 +1,46 @@
+
+
+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";>
+
+  deploy-zip
+  
+zip
+  
+
+  
+
+  dir1
+  
+commons-configuration:commons-configuration
+  
+
+
+  dir2
+  false
+  
+commons-configuration:commons-configuration
+  
+
+  
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/pom.xml?rev=1636427&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/child-client/pom.xml
 Mon Nov  3 20:01:39 2014
@@ -0,0 +1,49 @@
+
+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/xsd/maven-4.0.0.xsd";>
+  4.0.0
+  
+maven-assembly-test
+maven-assembly-test
+0.0.1-SNAPSHOT
+  
+  maven-assembly-test
+  modul-client
+  0.0.1-SNAPSHOT
+  
+
+  commons-configuration
+  commons-configuration
+  1.10
+
+
+  org.apache.maven
+  maven-archiver
+  2.6
+
+
+  org.apache.maven
+  maven-monitor
+  2.2.0
+  jar
+  compile
+
+  
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/pom.xml?rev=1636427&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
 Mon Nov  3 20:01:39 2014
@@ -0,0 +1,95 @@
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/

svn commit: r1636414 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/dependency-sets/massembly-619/ main/java/org/apache/maven/plugin/assembly/archive/phase/ main/java/org/apache/mave

[krosenvold]

Author: krosenvold
Date: Mon Nov  3 18:28:08 2014
New Revision: 1636414

URL: http://svn.apache.org/r1636414
Log:
[MASSEMBLY-619] Fixed bleed between resolution phases for multiple dependency 
sets

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/assembly.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/verify.bsh
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/assembly.xml?rev=1636414&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/assembly.xml
 Mon Nov  3 18:28:08 2014
@@ -0,0 +1,46 @@
+
+
+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";>
+
+   deploy-zip
+   
+   zip
+   
+
+   
+   
+   dir1
+   
+   
commons-configuration:commons-configuration
+   
+   
+   
+   dir2
+   
false
+   
+   
commons-configuration:commons-configuration
+   
+   
+   
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/invoker.properties?rev=1636414&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/invoker.properties
 Mon Nov  3 18:28:08 2014
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=install

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-619/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dep

svn commit: r1636389 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474: ./ child-client/ child-server/ descriptor/ descriptor/src/ descriptor/src/assembly/ dist

[krosenvold]

Author: krosenvold
Date: Mon Nov  3 16:50:31 2014
New Revision: 1636389

URL: http://svn.apache.org/r1636389
Log:
Renamed subprojects to fit exclusion pattern

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-client/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-client/pom.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-server/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-server/pom.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-server/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/client.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-client.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-server.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-server.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/distribution.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/distribution.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/server.xml
  - copied, changed from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/server.xml
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-server.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/distribution.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/server.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-server/pom.xml
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/pom.xml

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-client/pom.xml
 (from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/pom.xml)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-client/pom.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-client/pom.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/pom.xml&r1=1636370&r2=1636389&rev=1636389&view=diff
==
(empty)

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/child-server/pom.xml
 (from r1636370, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massem

svn commit: r1636370 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects: bugs/massembly-559/ bugs/massembly-559/src/ bugs/massembly-559/src/assembly/ multimodule/massembly-474/ multimodul

[krosenvold]

Author: krosenvold
Date: Mon Nov  3 15:10:31 2014
New Revision: 1636370

URL: http://svn.apache.org/r1636370
Log:
Added some testcases

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/assembly/test.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-client.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/component-server.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/distribution.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/distribution/src/assembly/server.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-client/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-server/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/modul-server/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-474/pom.xml

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/pom.xml?rev=1636370&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/pom.xml
 Mon Nov  3 15:10:31 2014
@@ -0,0 +1,60 @@
+
+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/xsd/maven-4.0.0.xsd";>
+   4.0.0
+   test
+   test-assembly-transitive-bug
+   0.0.1-SNAPSHOT
+   pom
+   
+   
+   
+   junit
+   junit-dep
+   4.8.2
+   
+   
+
+   
+   
+   
+   org.apache.maven.plugins
+   maven-assembly-plugin
+   ${testVersion}
+   
+   
+   create-assembly
+   package
+   
+   single
+   
+   
+   
+   
src/assembly/test.xml
+   
+   
false
+   
+   
+   
+   
+   
+   
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/assembly/test.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/assembly/test.xml?rev=1636370&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-559/src/assembly/test.xml
 (added)
+++ 
maven/plugins/trunk/m

svn commit: r1636369 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java

[krosenvold]

Author: krosenvold
Date: Mon Nov  3 15:08:09 2014
New Revision: 1636369

URL: http://svn.apache.org/r1636369
Log:
Added some jsr305

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=1636369&r1=1636368&r2=1636369&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
 Mon Nov  3 15:08:09 2014
@@ -33,6 +33,8 @@ import org.codehaus.plexus.interpolation
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -299,10 +301,10 @@ public final class AssemblyFormatUtils
  * environment variables.
  * 
  */
-public static String evaluateFileNameMapping( final String expression, 
final Artifact artifact,
-  final MavenProject 
mainProject, final MavenProject moduleProject,
-  final Artifact 
moduleArtifact, final MavenProject artifactProject,
-  final 
AssemblerConfigurationSource configSource )
+public static String evaluateFileNameMapping( final String expression, 
@Nonnull final Artifact artifact,
+  @Nullable final MavenProject 
mainProject, @Nullable final MavenProject moduleProject,
+  @Nullable final Artifact 
moduleArtifact, @Nullable final MavenProject artifactProject,
+  @Nullable final 
AssemblerConfigurationSource configSource )
 throws AssemblyFormattingException
 {
 String value = expression;
@@ -461,7 +463,7 @@ public final class AssemblyFormatUtils
 return value;
 }
 
-public static String fixRelativeRefs( String src )
+public static @Nonnull String fixRelativeRefs( @Nonnull String src )
 {
 String value = src;
 

svn commit: r1636169 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/phase/ main/java/org/apache/maven/plugin/assembly/functions/ main/java/org/

[krosenvold]

Author: krosenvold
Date: Sun Nov  2 19:19:02 2014
New Revision: 1636169

URL: http://svn.apache.org/r1636169
Log:
Extracted some helper functions

Added:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
  - copied, changed from r1636165, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
  - copied, changed from r1636165, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java

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=1636169&r1=1636168&r2=1636169&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
 Sun Nov  2 19:19:02 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +32,6 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
 import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
@@ -43,6 +41,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
 import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
 import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
+import org.apache.maven.plugin.assembly.functions.MavenProjects;
 import org.apache.maven.plugin.assembly.model.Assemblies;
 import org.apache.maven.plugin.assembly.model.Assembly;
 import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -50,7 +49,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.model.ModuleBinaries;
 import org.apache.maven.plugin.assembly.model.ModuleSet;
 import org.apache.maven.plugin.assembly.model.ModuleSources;
-import org.apache.maven.plugin.assembly.resolved.functions.ModuleSetConsumer;
+import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
 import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
 import org.apache.maven.plugin.assembly.utils.FilterUtils;
 import org.apache.maven.plugin.assembly.utils.ProjectUtils;
@@ -64,6 +63,9 @@ import org.codehaus.plexus.component.ann
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
+import static org.apache.maven.plugin.assembly.functions.MavenProjects.log;
+import static org.apache.maven.plugin.assembly.functions.MavenProjects.addTo;
+
 /**
  * Handles the <moduleSets/> top-level section of the assembly 
descriptor.
  * 
@@ -114,17 +116,18 @@ public class ModuleSetAssemblyPhase
  */
 public void execute( final Assembly assembly, final Archiver archiver,
  final AssemblerConfigurationSource configSource )
-throws ArchiveCreationException, AssemblyFormattingException, 
InvalidAssemblerConf

svn commit: r1636157 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/dependency-sets/unpack-deps-correct-dir/ it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/ it

[krosenvold]

Author: krosenvold
Date: Sun Nov  2 17:48:16 2014
New Revision: 1636157

URL: http://svn.apache.org/r1636157
Log:
Removed the 'Resolved*' classes I introduced a few commits ago.

Improved understanding made me realize this is not the way to go

Added:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
  - copied, changed from r1636098, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
  - copied, changed from r1636098, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedModuleSet.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml?rev=1636157&r1=1636156&r2=1636157&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
 Sun Nov  2 17:48:16 2014
@@ -1,3 +1,21 @@
+
 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/xsd/maven-4.0.0.xsd";>
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
URL: 
http

svn commit: r1635545 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Oct 30 16:55:14 2014
New Revision: 1635545

URL: http://svn.apache.org/r1635545
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1635545&r1=1635544&r2=1635545&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Oct 30 16:55:14 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.5.1
+  2.5.2-SNAPSHOT
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
   
   
 jira

svn commit: r1635544 - /maven/plugins/tags/maven-assembly-plugin-2.5.1/

[krosenvold]

Author: krosenvold
Date: Thu Oct 30 16:55:10 2014
New Revision: 1635544

URL: http://svn.apache.org/r1635544
Log:
[maven-release-plugin]  copy for tag maven-assembly-plugin-2.5.1

Added:
maven/plugins/tags/maven-assembly-plugin-2.5.1/   (props changed)
  - copied from r1635543, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct 30 16:55:10 2014
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 30 16:55:10 2014
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691

svn commit: r1635543 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Oct 30 16:54:54 2014
New Revision: 1635543

URL: http://svn.apache.org/r1635543
Log:
[maven-release-plugin] prepare release maven-assembly-plugin-2.5.1

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1635543&r1=1635542&r2=1635543&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Oct 30 16:54:54 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.6-SNAPSHOT
+  2.5.1
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1
   
   
 jira

svn commit: r1635529 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/ main/java/org/apache/maven/plugin/assembly/archive/archiver/ main/java/org/apache/

[krosenvold]

Author: krosenvold
Date: Thu Oct 30 16:04:30 2014
New Revision: 1635529

URL: http://svn.apache.org/r1635529
Log:
Switched entirely to reader based filtering

Added:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=1635529&r1=1635528&r2=1635529&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
 Thu Oct 30 16:04:30 2014
@@ -23,7 +23,6 @@ import org.apache.maven.archiver.MavenAr
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.apache.maven.shared.filtering.MavenReaderFilter;
 
 import java.io.File;
@@ -176,11 +175,6 @@ public interface AssemblerConfigurationS
 String getArchiverConfig();
 
 /**
- * @return The maven file filter.
- */
-MavenFileFilter getMavenFileFilter();
-
-/**
  * Maven shared filtering utility.
  * @ return the maven reader filter
  */

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1635529&r1=1635528&r2=1635529&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Thu Oct 30 16:04:30 2014
@@ -999,14 +999,19 @@ public class AssemblyProxyArchiver
 public void addResource( final PlexusIoResource resource, final String 
destFileName, final int permissions )
 throws ArchiverException
 {
-inPublicApi.set( Boolean.TRUE );
-try
+File file = new File(resource.getName()); // zOMG.
+if ( acceptFile( file ) )
 {
-delegate.addResource( resource, destFileName, permissions );
-}
-finally
-{
-inPublicApi.set( null );
+
+inPublicApi.set( Boolean.TRUE );
+try
+{
+delegate.addResource( resource, destFileName, permissions );
+}
+finally
+{
+inPublicApi.set( null );
+}
 }
 }
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: 
http://svn

svn commit: r1635277 - /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 19:40:34 2014
New Revision: 1635277

URL: http://svn.apache.org/r1635277
Log:
Spell deprecated correctly

Modified:

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java?rev=1635277&r1=1635276&r2=1635277&view=diff
==
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
 Wed Oct 29 19:40:34 2014
@@ -56,7 +56,7 @@ public class MavenReaderFilterRequest
  * @param encoding Encoding
  * @param mavenSession The Maven Session.
  * @param additionalProperties supplemental properties.
- * @deprectated use version without encoding
+ * @deprecated use version without encoding
  */
 public MavenReaderFilterRequest(
  Reader from,

svn commit: r1635275 - in /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering: AbstractMavenFilteringRequest.java MavenFileFilterRequest.java MavenReaderFilterRequest.j

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 19:38:15 2014
New Revision: 1635275

URL: http://svn.apache.org/r1635275
Log:
removed encoding from the reader filter constructor (added new, deprecated 
old). Parameter was unused

Modified:

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java?rev=1635275&r1=1635274&r2=1635275&view=diff
==
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
 Wed Oct 29 19:38:15 2014
@@ -39,8 +39,6 @@ public class AbstractMavenFilteringReque
 
 private boolean escapeWindowsPaths = true;
 
-private String encoding;
-
 private MavenSession mavenSession;
 
 /**
@@ -98,19 +96,13 @@ public class AbstractMavenFilteringReque
  * Create instance with given parameters
  * @param mavenProject The instance of MavenProject.
  * @param filters The list of filters.
- * @param encoding The encoding.
  * @param mavenSession The MavenSession.
  */
-protected AbstractMavenFilteringRequest(
- MavenProject mavenProject,
- List filters,
- String encoding,
- MavenSession mavenSession )
+protected AbstractMavenFilteringRequest( MavenProject mavenProject, 
List filters, MavenSession mavenSession )
 {
 initDefaults();
 this.mavenProject = mavenProject;
 this.filters = filters;
-this.encoding = encoding;
 this.mavenSession = mavenSession;
 }
 
@@ -212,23 +204,6 @@ public class AbstractMavenFilteringReque
 setEscapeWindowsPaths( escape );
 }
 
-/**
- * Return the encoding.
- * @return Current encoding.
- */
-public String getEncoding()
-{
-return encoding;
-}
-
-/**
- * Set the value for encoding.
- * @param encoding Give the new value for encoding.
- */
-public void setEncoding( String encoding )
-{
-this.encoding = encoding;
-}
 
 /**
  * @return Current value of mavenSession

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java?rev=1635275&r1=1635274&r2=1635275&view=diff
==
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
 Wed Oct 29 19:38:15 2014
@@ -40,6 +40,8 @@ public class MavenFileFilterRequest
 
 private boolean filtering;
 
+private String encoding;
+
 /**
  * The constructor.
  */
@@ -70,7 +72,8 @@ public class MavenFileFilterRequest
MavenSession mavenSession,
Properties additionalProperties )
 {
-super( mavenProject, filters, encoding, mavenSession );
+super( mavenProject, filters, mavenSession );
+this.encoding = encoding;
 this.from = from;
 this.to = to;
 this.filtering = filtering;
@@ -79,6 +82,25 @@ public class MavenFileFilterRequest
 }
 
 /**
+ * Return the encoding.
+ * @return Current encoding.
+ */
+public String getEncoding()
+{
+return encoding;
+}
+
+/**
+ * Set the value for encoding.
+ * @param encoding Give the new value for encoding.
+ */
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
+
+/**
  * @return to filter from.
  */
 public File getFrom()

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
URL: 
http://svn.apache

svn commit: r1635050 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722: ./ src/ src/main/ src/main/assemblies/ src/main/filtered-config/ sr

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 05:37:37 2014
New Revision: 1635050

URL: http://svn.apache.org/r1635050
Log:
[MASSEMBLY-722] Added test project, supplied by Tony Jewell. Applied with minor 
modifications

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties
   (with props)

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties?rev=1635050&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
 Wed Oct 29 05:37:37 2014
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=package

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml?rev=1635050&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
 Wed Oct 29 05:37:37 2014
@@ -0,0 +1,58 @@
+
+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/xsd/maven-4.0.0.xsd";>
+  4.0.0
+  
+org.apache.maven.plugin.assembly.test
+it-project-parent
+1
+  
+  com.cregganna.samples
+  maven-assembly-plugin-2.5-crash
+  0.0.1-SNAPSHOT
+  
+  
+  
+  
+  src/main/filters/test.properties
+  
+  
+  
+  
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  
+  
+  prod-assemble
+  package
+  single
+  
+  
+  
src/main/assemblies/prod-assemble.xml
+  
+  
+  
+

svn commit: r1635043 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir: ./ src/ src/main/ src/main/assembly/ src/main/filters/

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 05:07:50 2014
New Revision: 1635043

URL: http://svn.apache.org/r1635043
Log:
[MASSEMBLY-579] IT Added

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties?rev=1635043&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
 Wed Oct 29 05:07:50 2014
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean package

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml?rev=1635043&view=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
 Wed Oct 29 05:07:50 2014
@@ -0,0 +1,43 @@
+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/xsd/maven-4.0.0.xsd";>
+
+4.0.0
+com.github.runeflobakk
+assembly-plugin-bug-demo
+1.0-SNAPSHOT
+pom
+${project.artifactId}
+
+
+
+org.apache.maven.skins
+maven-default-skin
+1.0
+runtime
+
+
+
+
+
+
+maven-assembly-plugin
+
+
+bundle-unpacked-dependency
+package
+single
+
+
+
src/main/assembly/unpack-deps.xml
+
+
+src/main/filters/my.properties
+
+
+
+
+
+
+
+
+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml?rev=1635043&view=auto
=

svn commit: r1635042 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/dependency-sets/dependencySet-unpacked-filtered/ src/it/projects/dependency-sets/dependencySet-unpacked-filtere

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 05:06:08 2014
New Revision: 1635042

URL: http://svn.apache.org/r1635042
Log:
Reduced filtered/non-filtered to one code path

Added:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1635042&r1=1635041&r2=1635042&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 29 05:06:08 2014
@@ -126,6 +126,12 @@ under the License.
   org.codehaus.plexus
   plexus-archiver
   2.8.2
+  
+
+  org.codehaus.plexus
+  plexus-component-api
+
+  
 
 
   org.apache.maven.shared

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml?rev=1635042&r1=1635041&r2=1635042&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml
 Wed Oct 29 05:06:08 2014
@@ -32,7 +32,7 @@ under the License.
 test:child1
   
   
-  /
+  /zz
   ${artifact.artifactId}
   
   true

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh?rev=1635042&r1=1635041&r2=1635042&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
 Wed Oct 29 05:06:08 2014
@@ -21,7 +21,7 @@ import java.io.*;
 
 try
 {
-File f = new File( basedir, 
"child2/target/child2-1-bin/child1/assembly-resources/test.txt" );
+File f = new File( basedir, 
"child2/target/child2-1-bin/zz/assembly-resources/test.txt" );
 
 BufferedReader r = new BufferedReader( new FileReader( f ) );
 if ( r.readLine().equals( "Project Version: 1" ) )

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/Dependenc

svn commit: r1635041 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Oct 29 05:04:45 2014
New Revision: 1635041

URL: http://svn.apache.org/r1635041
Log:
Updated plexus-io and archiver to fix MASSEMBLY-722

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1635041&r1=1635040&r2=1635041&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 29 05:04:45 2014
@@ -125,13 +125,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  2.8.1
-  
-
-  org.codehaus.plexus
-  plexus-component-api
-
-  
+  2.8.2
 
 
   org.apache.maven.shared
@@ -156,13 +150,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-io
-  2.3.2
-  
-
-  org.codehaus.plexus
-  plexus-component-api
-
-  
+  2.3.3
 
 
   org.apache.maven

svn commit: r1634686 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/archiver/ main/java/org/apache/maven/plugin/assembly/archive/task/ main/jav

[krosenvold]

Author: krosenvold
Date: Mon Oct 27 21:03:49 2014
New Revision: 1634686

URL: http://svn.apache.org/r1634686
Log:
Refactored code slightly

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1634686&r1=1634685&r2=1634686&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Mon Oct 27 21:03:49 2014
@@ -801,7 +801,7 @@ public class AssemblyProxyArchiver
 public void addArchivedFileSet( final ArchivedFileSet fileSet )
 throws ArchiverException
 {
-final String archiveKey = getArchiveKey( fileSet.getArchive(), "" );
+final String archiveKey = getArchiveKey( fileSet.getArchive(), 
fileSet.getPrefix() );
 if ( seenPaths.contains( archiveKey ) )
 {
 warn( "Archive: " + fileSet.getArchive() + " has already been 
added. Skipping." );

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=1634686&r1=1634685&r2=1634686&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
 Mon Oct 27 21:03:49 2014
@@ -28,6 +28,9 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
+import org.codehaus.plexus.archiver.util.DefaultFileSet;
+import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -67,11 +70,18 @@ public class AddArtifactTask
 private String outputFileNameMapping;
 
 private final Logger logger;
+private final InputStreamTransformer transformer;
 
-public AddArtifactTask( final Artifact artifact, final Logger logger )
+public AddArtifactTask( final Artifact artifact, final Logger logger,  
InputStreamTransformer transformer )
 {
 this.artifact = artifact;
 this.logger = logger;
+this.transformer = transformer;
+}
+
+public AddArtifactTask( final Artifact artifact, final Logger logger )
+{
+this(artifact, logger, null);
 }
 
 public void execute( final Archiver archiver, final 
AssemblerConfigurationSource configSource )
@@ -79,28 +89,10 @@ public class AddArtifactTask
 {
 // MASSEMBLY-282: We should support adding a project's standard output 
file as part of an assembly that replaces
 // it.
-if ( ( ( artifact.getFile() != null ) && ( archiver.getDestFile() != 
null ) )
-&& artifact.getFile()
-   .equals( archiver.getDestFile() ) )
+if (artifactIsArchiverDestination(archiver))
 {
-final File tempRoot = configSource.getTemporaryRootDirectory();
-

svn commit: r1634469 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly: ./ archive/ archive/archiver/ archive/phase/ format/ utils/

[krosenvold]

Author: krosenvold
Date: Mon Oct 27 08:12:16 2014
New Revision: 1634469

URL: http://svn.apache.org/r1634469
Log:
Fixed some checkstyle stuff

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=1634469&r1=1634468&r2=1634469&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
 Mon Oct 27 08:12:16 2014
@@ -182,6 +182,7 @@ public interface AssemblerConfigurationS
 
 /**
  * Maven shared filtering utility.
+ * @ return the maven reader filter
  */
 MavenReaderFilter getMavenReaderFilter();
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java?rev=1634469&r1=1634468&r2=1634469&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
 Mon Oct 27 08:12:16 2014
@@ -42,7 +42,8 @@ public interface AssemblyArchiver
  * Lookup and configure the {@link 
org.codehaus.plexus.archiver.Archiver} to be used
  * Determine what, if any, dependency resolution will be required, and 
resolve any dependency-version conflicts
  * up front to produce a managed-version map for the whole assembly 
process.
- * Iterate through the available {@link 
org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase} 
instances, executing each to handle a different
+ * Iterate through the available {@link 
org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase}
+ * instances, executing each to handle a different
  * top-level section of the assembly descriptor, if that section is 
present.
  * 
  * @param assembly The {@link Assembly}
@@ -51,9 +52,9 @@ public interface AssemblyArchiver
  * @param configSource The {@link AssemblerConfigurationSource}
  * @param recompressZippedFiles recompress zipped files.
  * @return The resulting archive file.
- * @throws ArchiveCreationException
- * @throws AssemblyFormattingException
- * @throws InvalidAssemblerConfigurationException
+ * @throws ArchiveCreationException when creation fails
+ * @throws AssemblyFormattingException when formatting fails
+ * @throws InvalidAssemblerConfigurationException when the configurationis 
bad
  */
 File createArchive( Assembly assembly, String fullName, String format, 
AssemblerConfigurationSource configSource,
 boolean recompressZippedFiles )

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1634469&r1=1634468&r2=1634469&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Mon Oct 27 08:12:16 2014
@@ -928,7 +928,7 @@ public class AssemblyProxyArchiver
 private boolean acceptFile( fi

svn commit: r1634461 - /maven/site/trunk/content/apt/plugins/index.apt

[krosenvold]

Author: krosenvold
Date: Mon Oct 27 07:23:35 2014
New Revision: 1634461

URL: http://svn.apache.org/r1634461
Log:
Hnm

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1634461&r1=1634460&r2=1634461&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Oct 27 07:23:35 2014
@@ -135,7 +135,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/archetype/maven-archetype-plugin/} <<>>}} | B  | 
2.2  | 2011-11-19 | Generate a skeleton project structure from an 
archetype. | 
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}} 
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-assembly-plugin/} <<>>}} | B  | 
2.4.1| 2014-07-30 | Build an assembly (distribution) of sources and/or 
binaries. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
+| {{{/plugins/maven-assembly-plugin/} <<>>}} | B  | 
2.5   | 2014-10-26 | Build an assembly (distribution) of sources and/or 
binaries. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-dependency-plugin/} <<>>}} | B+R| 
2.9  | 2014-09-18 | Dependency manipulation (copy, unpack) and 
analysis. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MDEP}JIRA}}
 
*--++--++--+++

svn commit: r6850 - /release/maven/plugins/

[krosenvold]

Author: krosenvold
Date: Mon Oct 27 07:10:54 2014
New Revision: 6850

Log:
Updated dist area

Added:
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5
Removed:
release/maven/plugins/maven-assembly-plugin-2.4.1-source-release.zip
release/maven/plugins/maven-assembly-plugin-2.4.1-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.4.1-source-release.zip.md5

Added: release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip
==
Files release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip 
(added) and release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip 
Mon Oct 27 07:10:54 2014 differ

Added: release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc
==
--- release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.asc Mon 
Oct 27 07:10:54 2014
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iF4EABEIAAYFAlRJVtkACgkQRmyu1uB0fVDS6gD+JXNDpkqWzYpNLNt4uzRrYTco
+HYtL7XtDYabFRxbo5VUBAN94vtJkDOdkOFP6MGLkECPHLNAFviy8JalrC8X0+l32
+=96Lg
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5
==
--- release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5-source-release.zip.md5 Mon 
Oct 27 07:10:54 2014
@@ -0,0 +1 @@
+526faee4321d0558f86b87da680d8dd2
\ No newline at end of file

svn commit: r1634236 - /maven/shared/trunk/maven-archiver/pom.xml

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 16:45:07 2014
New Revision: 1634236

URL: http://svn.apache.org/r1634236
Log:
re-added plexus-utils to the pom with an even better comment

Modified:
maven/shared/trunk/maven-archiver/pom.xml

Modified: maven/shared/trunk/maven-archiver/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1634236&r1=1634235&r2=1634236&view=diff
==
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Sat Oct 25 16:45:07 2014
@@ -96,7 +96,12 @@
   plexus-archiver
   2.8.1
 
-
+
+
+  org.codehaus.plexus
+  plexus-utils
+  3.0.20
+
 
   org.codehaus.plexus
   plexus-interpolation

git commit: Updated to p-u 3.0.20

[krosenvold]

Repository: maven
Updated Branches:
  refs/heads/master 366f57c56 -> b183cc9f5


Updated to p-u 3.0.20


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b183cc9f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b183cc9f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b183cc9f

Branch: refs/heads/master
Commit: b183cc9f58b5b7743e062fa7db7297b442dfc70a
Parents: 366f57c
Author: Kristian Rosenvold 
Authored: Sat Oct 25 13:57:05 2014 +0200
Committer: Kristian Rosenvold 
Committed: Sat Oct 25 13:57:05 2014 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b183cc9f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 34e140b..d792b64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 3.8.2
 1.5.5
 1.21
-3.0.18
+3.0.20
 
 14.0.1
 3.2.3

svn commit: r1634216 - /maven/shared/trunk/maven-archiver/pom.xml

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 11:44:49 2014
New Revision: 1634216

URL: http://svn.apache.org/r1634216
Log:
p-a to 2.8.1, cleaned up pom

Modified:
maven/shared/trunk/maven-archiver/pom.xml

Modified: maven/shared/trunk/maven-archiver/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1634216&r1=1634215&r2=1634216&view=diff
==
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Sat Oct 25 11:44:49 2014
@@ -94,13 +94,7 @@
 
   org.codehaus.plexus
   plexus-archiver
-  2.7.1
-
-
-  
-  org.codehaus.plexus
-  plexus-utils
-  3.0.18
+  2.8.1
 
 
 

svn commit: r1634215 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/functional-tests/java/org/apache/maven/plugin/assembly/ src/test/java/org/apache/maven/plugin/assembly/archive/ src/test/ja

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 11:30:57 2014
New Revision: 1634215

URL: http://svn.apache.org/r1634215
Log:
p-a to 2.8.1, converted tests to use diags versions from p-a

Removed:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1634215&r1=1634214&r2=1634215&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Oct 25 11:30:57 2014
@@ -125,7 +125,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  2.8
+  2.8.1
   
 
   org.codehaus.plexus

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=1634215&r1=1634214&r2=1634215&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
 Sat Oct 25 11:30:57 2014
@@ -35,6 +35,7 @@ import org.apache.maven.plugin.testing.s
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.archiver.diags.NoOpArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
 import org.codehaus.plexus.util.DirectoryScanner;
@@ -184,7 +185,7 @@ public class BasicAbstractAssemblyMojoFe
 }
 
 public static final class FileLoggingArchiverStub
-implements Archiver
+extends NoOpArchiver
 {
 
 private Set files = new LinkedHashSet();
@@ -264,67 +265,6 @@ public class BasicAbstractAssemblyMojoFe
 throw new ArchiverException( "Error scanning for file names.", 
e );
 }
 }
-
-public void createArchive() throws ArchiverException, IOException
-{
-// TODO Auto-generated method stub
-
-}
-
-public int getDefaultDirectoryMode()
-{
-// TODO Auto-generated method stub
-return 0;
-}
-
-public int getDefaultFileMode()
-{
-// TODO Auto-generated method stub
-return 0;
-}
-
-public File getDestFile()
-{
-// TODO Auto-generated method stub
-return null;
-}
-
-public Map getFiles()
-{
-// TODO Auto-generated method stub
-return null;
-}
-
-public boolean getIncludeEmptyDirs()
-{
-// TODO Auto-generated method stub
-return false;
-}
-
-public void setDefaultDirectoryMode( int arg0 )
-{
-// TODO Auto-generated method stub
-
-}
-
-public void setDefaultFileMode( int arg0 )
-{
-// TODO Auto-generated method stub
-
-}
-
-public void setDestFile( File arg0 )
-{
-// TODO Auto-generated method stub
-
-}
-
-public void setIncludeEmptyDirs( boolean arg0 )
-{
-// TODO Auto-generated method stub
-
-}
-
 }
 
 public static final class TwoDependencyReactorProjectStub

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverT

svn commit: r1634198 - /maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 09:36:08 2014
New Revision: 1634198

URL: http://svn.apache.org/r1634198
Log:
Restored version in IT

Modified:
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml

Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml?rev=1634198&r1=1634197&r2=1634198&view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml Sat Oct 25 
09:36:08 2014
@@ -58,7 +58,7 @@
 
   org.codehaus.plexus
   plexus-component-api   
-  1.6
+  1.0-alpha-15   
  
 
   org.codehaus.plexus

svn commit: r1634194 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/filter/ main/java/org/apache/maven/plugin/assembly/format/ test/java/org/apache/mav

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 07:51:48 2014
New Revision: 1634194

URL: http://svn.apache.org/r1634194
Log:
Code style cleanup

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java?rev=1634194&r1=1634193&r2=1634194&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
 Sat Oct 25 07:51:48 2014
@@ -27,6 +27,7 @@ import org.codehaus.plexus.archiver.UnAr
 import org.codehaus.plexus.components.io.fileselectors.FileInfo;
 import org.codehaus.plexus.util.IOUtil;
 
+import javax.annotation.Nonnull;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -119,7 +120,7 @@ abstract class AbstractLineAggregatingHa
 return new ArrayList( catalog.keySet() );
 }
 
-public boolean isSelected( final FileInfo fileInfo )
+public boolean isSelected( final @Nonnull FileInfo fileInfo )
 throws IOException
 {
 if ( excludeOverride )

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java?rev=1634194&r1=1634193&r2=1634194&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
 Sat Oct 25 07:51:48 2014
@@ -45,6 +45,8 @@ import org.codehaus.plexus.util.xml.Xpp3
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Components XML file filter.
  * 
@@ -188,7 +190,7 @@ public class ComponentsXmlArchiverFileFi
 return null;
 }
 
-public boolean isSelected( final FileInfo fileInfo )
+public boolean isSelected( final @Nonnull FileInfo fileInfo )
 throws IOException
 {
 if ( fileInfo.isFile() )

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1634194&r1=1634193&r2=1634194&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 Sat Oct 25 07:51:48 2014
@@ -46,7 +46,6 @@ public class ReaderFormatter
 {
 try
 {
-// @todo this test can be improved
 boolean isPropertiesFile = AssemblyFileUtils.isPropertyFile( 
sourceName );
 
 MavenReaderFilterRequest filterRequest =

Modified:

svn commit: r1634185 - in /maven/shared/trunk/maven-filtering: ./ src/main/java/org/apache/maven/shared/filtering/ src/main/java/org/apache/maven/shared/filtering/streams/ src/test/java/org/apache/mav

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 07:09:38 2014
New Revision: 1634185

URL: http://svn.apache.org/r1634185
Log:
Added inputstreams that convert to windows or linux line feeds. Taken from 
maven-assembly-plugin

Added:

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java
  - copied, changed from r1633997, 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/LinuxLineFeedInputStream.java

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/WindowsLineFeedInputStream.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/streams/

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/streams/LinuxLineFeedInputStreamTest.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/streams/WindowsLineFeedInputStreamTest.java
Removed:

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
Modified:
maven/shared/trunk/maven-filtering/pom.xml

maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java

Modified: maven/shared/trunk/maven-filtering/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1634185&r1=1634184&r2=1634185&view=diff
==
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Sat Oct 25 07:09:38 2014
@@ -129,7 +129,6 @@
   test
   tests
 
-
 
   org.mockito
   mockito-core

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1634185&r1=1634184&r2=1634185&view=diff
==
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
 Sat Oct 25 07:09:38 2014
@@ -26,6 +26,7 @@ import java.io.Reader;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.apache.maven.shared.filtering.streams.BoundedReader;
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.Interpolator;
 import org.codehaus.plexus.interpolation.RecursionInterceptor;

Copied: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java
 (from r1633997, 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java)
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java?p2=maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java&p1=maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java&r1=1633997&r2=1634185&rev=1634185&view=diff
==
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java
 Sat Oct 25 07:09:38 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.filtering;
+package org.apache.maven.shared.filtering.streams;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.maven.shared.filterin
  * under the License.
  */
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.Reader;
 
@@ -83,7 +84,7 @@ public class BoundedReader
 }
 
 @Override
-public int read( char[] cbuf, int off, int len )
+public int read( @Nonnull char[] cbuf, int off, int len )
 throws IOException
 {
 int c;

Added: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/LinuxLineFeedInputStream.java
URL: 
http://svn.apache.org/v

svn commit: r1634183 - in /maven/plugins/trunk: maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java maven-jar-plugin/src/it/MJAR-82/pom.xml maven-resources-plugin/pom.xml m

[krosenvold]

Author: krosenvold
Date: Sat Oct 25 06:50:56 2014
New Revision: 1634183

URL: http://svn.apache.org/r1634183
Log:
Upgraded p-c md

Modified:

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java?rev=1634183&r1=1634182&r2=1634183&view=diff
==
--- 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
 Sat Oct 25 06:50:56 2014
@@ -51,7 +51,7 @@ public class HelpUtilTest
 
 MavenSession session =
 new MavenSession(
-  container,
+  getContainer(),
   describe.settings, // Settings settings,
   describe.localRepository, // ArtifactRepository 
localRepository,
   null, // EventDispatcher eventDispatcher,

Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml?rev=1634183&r1=1634182&r2=1634183&view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml Sat Oct 25 
06:50:56 2014
@@ -58,7 +58,7 @@
 
   org.codehaus.plexus
   plexus-component-api   
-  1.0-alpha-15   
+  1.6
  
 
   org.codehaus.plexus

Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1634183&r1=1634182&r2=1634183&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Oct 25 06:50:56 2014
@@ -216,6 +216,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1634183&r1=1634182&r2=1634183&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Oct 25 06:50:56 2014
@@ -490,6 +490,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

svn commit: r1633997 - in /maven/shared/trunk: maven-artifact-resolver/ maven-dependency-analyzer/ maven-dependency-tree/ maven-downloader/ maven-filtering/ maven-invoker/ maven-jarsigner/ maven-osgi/

[krosenvold]

Author: krosenvold
Date: Fri Oct 24 04:30:46 2014
New Revision: 1633997

URL: http://svn.apache.org/r1633997
Log:
[MSHARED-371] Increased chance of java8 compliance by updating to asm5.x based 
plexus-component-*

Modified:
maven/shared/trunk/maven-artifact-resolver/pom.xml
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/trunk/maven-dependency-tree/pom.xml
maven/shared/trunk/maven-downloader/pom.xml
maven/shared/trunk/maven-filtering/pom.xml
maven/shared/trunk/maven-invoker/pom.xml
maven/shared/trunk/maven-jarsigner/pom.xml
maven/shared/trunk/maven-osgi/pom.xml
maven/shared/trunk/maven-reporting-exec/pom.xml
maven/shared/trunk/maven-repository-builder/pom.xml
maven/shared/trunk/maven-runtime/pom.xml
maven/shared/trunk/maven-script-interpreter/pom.xml
maven/shared/trunk/maven-shared-incremental/pom.xml
maven/shared/trunk/maven-shared-jar/pom.xml

Modified: maven/shared/trunk/maven-artifact-resolver/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-artifact-resolver/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-resolver/pom.xml Fri Oct 24 04:30:46 2014
@@ -131,6 +131,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 create-component-descriptor

Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Oct 24 04:30:46 
2014
@@ -71,6 +71,7 @@
 
   org.codehaus.plexus
   plexus-component-annotations
+  1.6
 
 
   org.apache.maven
@@ -124,6 +125,7 @@
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

Modified: maven/shared/trunk/maven-dependency-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-dependency-tree/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/pom.xml Fri Oct 24 04:30:46 2014
@@ -75,6 +75,7 @@
 
   org.codehaus.plexus
   plexus-component-annotations
+  1.6
 
 
   org.sonatype.aether
@@ -119,6 +120,7 @@
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

Modified: maven/shared/trunk/maven-downloader/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-downloader/pom.xml (original)
+++ maven/shared/trunk/maven-downloader/pom.xml Fri Oct 24 04:30:46 2014
@@ -73,6 +73,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

Modified: maven/shared/trunk/maven-filtering/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Fri Oct 24 04:30:46 2014
@@ -150,6 +150,7 @@
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 

Modified: maven/shared/trunk/maven-invoker/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
==
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Fri Oct 24 04:30:46 2014
@@ -66,7 +66,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-component-annotations
-  1.5.5
+  1.6
 
 
   junit
@@ -97,6 +97,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.6
 
   
 create-component-descriptor

Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1633997&r1=1633996&r2=1633997&view=diff
===

svn commit: r1633995 - /maven/plugins/trunk/maven-clean-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Fri Oct 24 04:03:10 2014
New Revision: 1633995

URL: http://svn.apache.org/r1633995
Log:
Dont need snapshot version any more

Modified:
maven/plugins/trunk/maven-clean-plugin/pom.xml

Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1633995&r1=1633994&r2=1633995&view=diff
==
--- maven/plugins/trunk/maven-clean-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/pom.xml Fri Oct 24 04:03:10 2014
@@ -73,7 +73,7 @@ under the License.
 
   org.apache.maven.shared
   maven-shared-utils
-  0.7-SNAPSHOT
+  0.7
 
 
 

svn commit: r1633941 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/main/java/org/apache/maven/plugin/assembly/archive/ src/main/java/org/apache/maven/plugin/assembly/archive/archiver/ src/ma

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 20:09:22 2014
New Revision: 1633941

URL: http://svn.apache.org/r1633941
Log:
Fixed some checkstyle stuff, updated plugin related deps

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633941&r1=1633940&r2=1633941&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Oct 23 20:09:22 2014
@@ -249,7 +249,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
-1.5.6
+1.6
 
   
 descriptors
@@ -294,6 +294,7 @@ under the License.
   
 org.apache.maven.plugins
 maven-plugin-plugin
+3.3
 
   
 mojo-descriptor

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java?rev=1633941&r1=1633940&r2=1633941&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
 Thu Oct 23 20:09:22 2014
@@ -39,10 +39,10 @@ public interface AssemblyArchiver
  * Setup any directory structures for temporary files
  * Calculate the output directory/file for the assembly
  * Setup any handler components for special descriptor files we may 
encounter
- * Lookup and configure the {@link Archiver} to be used
+ * Lookup and configure the {@link 
org.codehaus.plexus.archiver.Archiver} to be used
  * Determine what, if any, dependency resolution will be required, and 
resolve any dependency-version conflicts
  * up front to produce a managed-version map for the whole assembly 
process.
- * Iterate through the available {@link AssemblyArchiverPhase} 
instances, executing each to handle a different
+ * Iterate through the available {@link 
org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase} 
instances, executing each to handle a different
  * top-level section of the assembly descriptor, if that section is 
present.
  * 
  * @param assembly The {@link Assembly}

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1633941&r1=1633940&r2=1633941&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Thu Oct 23 20:09:22 2014
@@ -928,7 +928,7 @@ public class AssemblyProxyArchiver
 private boolean acceptFile( final File inputFile )
 throws ArchiverException
 {
-if ( Boolean.TRUE != inPublicApi.get() )
+if ( !Boolean.TRUE.equals( inPublicApi.get()) )
 {
 if ( selectors != null )
 {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache

svn commit: r1633929 - /maven/plugins/tags/maven-assembly-plugin-2.5/

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 19:19:09 2014
New Revision: 1633929

URL: http://svn.apache.org/r1633929
Log:
[maven-release-plugin]  copy for tag maven-assembly-plugin-2.5

Added:
maven/plugins/tags/maven-assembly-plugin-2.5/   (props changed)
  - copied from r1633928, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct 23 19:19:09 2014
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 23 19:19:09 2014
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691

svn commit: r1633930 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 19:19:12 2014
New Revision: 1633930

URL: http://svn.apache.org/r1633930
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633930&r1=1633929&r2=1633930&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Oct 23 19:19:12 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.5
+  2.6-SNAPSHOT
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
   
   
 jira

svn commit: r1633928 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 19:18:41 2014
New Revision: 1633928

URL: http://svn.apache.org/r1633928
Log:
[maven-release-plugin] prepare release maven-assembly-plugin-2.5

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633928&r1=1633927&r2=1633928&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Oct 23 19:18:41 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.6-SNAPSHOT
+  2.5
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5
   
   
 jira

svn commit: r1633927 - /maven/plugins/tags/maven-assembly-plugin-2.5/

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 19:18:04 2014
New Revision: 1633927

URL: http://svn.apache.org/r1633927
Log:
Removed tag

Removed:
maven/plugins/tags/maven-assembly-plugin-2.5/

svn commit: r1633925 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/task/ main/java/org/apache/maven/plugin/assembly/format/ main/java/org/apac

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 19:08:20 2014
New Revision: 1633925

URL: http://svn.apache.org/r1633925
Log:
More cleanup

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
 Thu Oct 23 19:08:20 2014
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
 import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
 import org.codehaus.plexus.archiver.Archiver;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
 Thu Oct 23 19:08:20 2014
@@ -40,7 +40,7 @@ public class ReflectionProperties
 
 private final MavenProject project;
 
-boolean escapedBackslashesInFilePath;
+final boolean escapedBackslashesInFilePath;
 
 public ReflectionProperties( final MavenProject aProject, final boolean 
escapedBackslashesInFilePath )
 {

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
 Thu Oct 23 19:08:20 2014
@@ -33,7 +33,7 @@ class RelativeFileLocatorStrategy
 implements LocatorStrategy
 {
 
-private File basedir;
+private final File basedir;
 
 public RelativeFileLocatorStrategy( File basedir )
 {

Modified: 
maven

svn commit: r1633921 - in /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils: MockManager.java TestUtils.java

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 18:58:31 2014
New Revision: 1633921

URL: http://svn.apache.org/r1633921
Log:
Removed unused files

Removed:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java

svn commit: r1633920 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 18:57:43 2014
New Revision: 1633920

URL: http://svn.apache.org/r1633920
Log:
[MASSAMBLY-721] Fixed 2.2.1 failures

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=1633920&r1=1633919&r2=1633920&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
 Thu Oct 23 18:57:43 2014
@@ -58,7 +58,8 @@ public class SimpleAggregatingDescriptor
 
 private String outputPath;
 
-private static final String commentChars = "#";
+@SuppressWarnings( "FieldCanBeLocal" )
+private final String commentChars = "#";
 
 // calculated, temporary values.
 

svn commit: r1633918 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly: archive/ archive/phase/ archive/task/ archive/task/testutils/ artifact/ forma

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 18:52:26 2014
New Revision: 1633918

URL: http://svn.apache.org/r1633918
Log:
Removed a few hundred deprecations by switching to modern easymock methods

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
 Thu Oct 23 18:52:26 2014
@@ -30,7 +30,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
 import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
 import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.testutils.MockManager;
+import org.apache.maven.plugin.assembly.resolved.ResolvedAssembly;
 import org.apache.maven.plugin.assembly.testutils.TestFileManager;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.DefaultPlexusContainer;
@@ -40,7 +40,6 @@ import org.codehaus.plexus.archiver.Arch
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.archiver.FinalizerEnabled;
 import org.codehaus.plexus.archiver.ResourceItera

svn commit: r1633918 [2/2] - in /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly: archive/ archive/phase/ archive/task/ archive/task/testutils/ artifact/ forma

[krosenvold]

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java?rev=1633918&r1=1633917&r2=1633918&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
 Thu Oct 23 18:52:26 2014
@@ -25,17 +25,16 @@ import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.plugin.assembly.testutils.MockManager;
-import org.easymock.MockControl;
+import org.easymock.classextension.EasyMockSupport;
+
+import static org.easymock.EasyMock.expect;
 
 public class ArtifactMock
 {
 
-private final MockControl artifactCtl;
 
 private final Artifact artifact;
 
-private final MockControl handlerCtl;
 
 private final ArtifactHandler handler;
 
@@ -61,61 +60,51 @@ public class ArtifactMock
 
 private final String classifier;
 
-public ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+public ArtifactMock( final EasyMockSupport mockManager, final String 
groupId, final String artifactId,
  final String version, final String type, final 
boolean isSnapshot )
 {
 this( mockManager, groupId, artifactId, version, type, null, 
isSnapshot, null, null );
 }
 
-public ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+public ArtifactMock( final EasyMockSupport mockManager, final String 
groupId, final String artifactId,
  final String version, final String type, final 
boolean isSnapshot, final String baseVersion )
 {
 this( mockManager, groupId, artifactId, version, type, null, 
isSnapshot, baseVersion, null );
 }
 
-public ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+public ArtifactMock( final EasyMockSupport mockManager, final String 
groupId, final String artifactId,
  final String version, final String type, final String 
classifier, final boolean isSnapshot )
 {
 this( mockManager, groupId, artifactId, version, type, classifier, 
isSnapshot, null, null );
 }
 
-public ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+public ArtifactMock( final EasyMockSupport mockManager, final String 
groupId, final String artifactId,
  final String version, final String type, final String 
classifier, final boolean isSnapshot,
  final String baseVersion )
 {
 this( mockManager, groupId, artifactId, version, type, classifier, 
isSnapshot, baseVersion, null );
 }
 
-private ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+private ArtifactMock( final EasyMockSupport mockManager, final String 
groupId, final String artifactId,
   final String version, final String type, final 
String classifier, final boolean isSnapshot,
   final String baseVersion, String scope )
 {
-artifactCtl = MockControl.createControl( Artifact.class );
-
-mockManager.add( artifactCtl );
 
-artifact = (Artifact) artifactCtl.getMock();
+artifact = mockManager.createMock( Artifact.class );
 
 if ( scope == null )
 {
 scope = Artifact.SCOPE_COMPILE;
 }
 
-artifact.getScope();
-artifactCtl.setReturnValue( scope, MockControl.ZERO_OR_MORE );
-
-handlerCtl = MockControl.createControl( ArtifactHandler.class );
-
-mockManager.add( handlerCtl );
+expect( artifact.getScope()).andReturn( scope ).anyTimes();
 
-handler = (ArtifactHandler) handlerCtl.getMock();
+handler = mockManager.createMock( ArtifactHandler.class );
 
-artifact.getArtifactHandler();
-artifactCtl.setReturnValue( handler, MockControl.ZERO_OR_MORE );
+expect(artifact.getArtifactHandler()).andReturn( handler ).anyTimes();
 
 this.classifier = classifier;
-artifact.getClassifier();
-artifactCtl.setReturnValue( classifier, MockControl.ZERO_OR_MORE );
+expect(artifact.getClassifier()).andReturn( classifier ).anyTimes();
 
 setSnapshot( isSnapshot );
 setGroupId( groupId );
@@ -142,9 +131,7 @@ public class ArtifactMock
 {
 if ( ( artifactId != null ) && ( this.artifactId == null 

svn commit: r1633832 [2/2] - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/ main/java/org/apache/maven/plugin/assembly/archive/archiver/ main/ja

[krosenvold]

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
 Thu Oct 23 15:03:47 2014
@@ -139,7 +139,7 @@ public class AddFileSetsTaskTest
 
 final int[] modes = { -1, -1, -1, -1 };
 
-macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes, 
1, true, false );
+macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, 
true, false );
 
 macTask.expectGetProject( null );
 
@@ -174,7 +174,7 @@ public class AddFileSetsTaskTest
 
 final int[] modes = { -1, -1, -1, -1 };
 
-macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes, 
1, true, false );
+macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, 
true, false );
 
 macTask.expectGetProject( null );
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
 Thu Oct 23 15:03:47 2014
@@ -86,9 +86,9 @@ public class ArtifactMock
 this( mockManager, groupId, artifactId, version, type, classifier, 
isSnapshot, baseVersion, null );
 }
 
-public ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
- final String version, final String type, final String 
classifier, final boolean isSnapshot,
- final String baseVersion, String scope )
+private ArtifactMock( final MockManager mockManager, final String groupId, 
final String artifactId,
+  final String version, final String type, final 
String classifier, final boolean isSnapshot,
+  final String baseVersion, String scope )
 {
 artifactCtl = MockControl.createControl( Artifact.class );
 
@@ -133,17 +133,12 @@ public class ArtifactMock
 setTypeAndExt( extension );
 }
 
-public MockControl getArtifactCtl()
-{
-return artifactCtl;
-}
-
 public Artifact getArtifact()
 {
 return artifact;
 }
 
-public void setArtifactId( final String artifactId )
+void setArtifactId( final String artifactId )
 {
 if ( ( artifactId != null ) && ( this.artifactId == null ) )
 {
@@ -176,7 +171,7 @@ public class ArtifactMock
 }
 }
 
-public void setGroupId( final String groupId )
+void setGroupId( final String groupId )
 {
 if ( ( groupId != null ) && ( this.groupId == null ) )
 {
@@ -187,7 +182,7 @@ public class ArtifactMock
 }
 }
 
-public void setVersion( final String version )
+void setVersion( final String version )
 {
 if ( ( version != null ) && ( this.version == null ) )
 {
@@ -215,7 +210,7 @@ public class ArtifactMock
 }
 }
 
-public void setId( final String id )
+void setId( final String id )
 {
 if ( ( id != null ) && ( this.id == null ) )
 {
@@ -226,7 +221,7 @@ public class ArtifactMock
 }
 }
 
-public void setDependencyConflictId( final String id )
+void setDependencyConflictId( final String id )
 {
 if ( ( id != null ) && ( dependencyConflictId == null ) )
 {
@@ -237,7 +232,7 @@ public class ArtifactMock
 }
 }
 
-public void setSnapshot( final boolean snapshot )
+void setSnapshot( final boolean snapshot )
 {
 if ( isSnapshot == null )
 {
@@ -265,7 +260,7 @@ public class ArtifactMock
 return file;
 }
 
-public void setType( final String type )
+void setType( final String type )
 {
 setTypeAndExt( type );
 }

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL: 
http

svn commit: r1633832 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/ main/java/org/apache/maven/plugin/assembly/archive/archiver/ main/ja

[krosenvold]

Author: krosenvold
Date: Thu Oct 23 15:03:47 2014
New Revision: 1633832

URL: http://svn.apache.org/r1633832
Log:
Fixed intellij code style warnings

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java

maven/plugins

svn commit: r1633720 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 21:08:06 2014
New Revision: 1633720

URL: http://svn.apache.org/r1633720
Log:
Updated plexus-component-metadata to 1.5.6

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633720&r1=1633719&r2=1633720&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 21:08:06 2014
@@ -249,6 +249,7 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
+1.5.6
 
   
 descriptors

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1633720&r1=1633719&r2=1633720&view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
 Wed Oct 22 21:08:06 2014
@@ -31,6 +31,8 @@ import org.codehaus.plexus.archiver.Arch
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
+import javax.annotation.Nonnull;
+
 /**
  * Handles the <fileSets/> top-level section of the assembly descriptor.
  * 
@@ -45,7 +47,7 @@ public class FileSetAssemblyPhase
 /**
  * {@inheritDoc}
  */
-public void execute( final ResolvedAssembly assembly, final Archiver 
archiver,
+public void execute( @Nonnull final ResolvedAssembly assembly, final 
Archiver archiver,
  final AssemblerConfigurationSource configSource )
 throws ArchiveCreationException, AssemblyFormattingException
 {

svn commit: r1633703 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 19:58:23 2014
New Revision: 1633703

URL: http://svn.apache.org/r1633703
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633703&r1=1633702&r2=1633703&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 19:58:23 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.5
+  2.6-SNAPSHOT
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
   
   
 jira

svn commit: r1633700 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 19:57:39 2014
New Revision: 1633700

URL: http://svn.apache.org/r1633700
Log:
[maven-release-plugin] prepare release maven-assembly-plugin-2.5

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633700&r1=1633699&r2=1633700&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 19:57:39 2014
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-assembly-plugin
-  2.6-SNAPSHOT
+  2.5
   maven-plugin
 
   Apache Maven Assembly Plugin
@@ -41,9 +41,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5
   
   
 jira

svn commit: r1633702 - /maven/plugins/tags/maven-assembly-plugin-2.5/

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 19:58:19 2014
New Revision: 1633702

URL: http://svn.apache.org/r1633702
Log:
[maven-release-plugin]  copy for tag maven-assembly-plugin-2.5

Added:
maven/plugins/tags/maven-assembly-plugin-2.5/   (props changed)
  - copied from r1633701, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 22 19:58:19 2014
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 22 19:58:19 2014
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691

svn commit: r1633701 - /maven/plugins/tags/maven-assembly-plugin-2.5/

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 19:58:06 2014
New Revision: 1633701

URL: http://svn.apache.org/r1633701
Log:
Deleted failed tag

Removed:
maven/plugins/tags/maven-assembly-plugin-2.5/

svn commit: r1633699 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 19:56:57 2014
New Revision: 1633699

URL: http://svn.apache.org/r1633699
Log:
p-io 2.3.2

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633699&r1=1633698&r2=1633699&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 19:56:57 2014
@@ -156,7 +156,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-io
-  2.3.1
+  2.3.2
   
 
   org.codehaus.plexus

svn commit: r1633654 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 17:14:18 2014
New Revision: 1633654

URL: http://svn.apache.org/r1633654
Log:
p-io 2.3.1

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633654&r1=1633653&r2=1633654&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 17:14:18 2014
@@ -156,7 +156,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-io
-  2.3
+  2.3.1
   
 
   org.codehaus.plexus

svn commit: r1633630 - /maven/plugins/tags/maven-assembly-plugin-2.5/

[krosenvold]

Author: krosenvold
Date: Wed Oct 22 14:20:11 2014
New Revision: 1633630

URL: http://svn.apache.org/r1633630
Log:
[maven-release-plugin]  copy for tag maven-assembly-plugin-2.5

Added:
maven/plugins/tags/maven-assembly-plugin-2.5/   (props changed)
  - copied from r1633629, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:ignore (added)
+++ svn:ignore Wed Oct 22 14:20:11 2014
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 22 14:20:11 2014
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691