You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/17 11:03:14 UTC
svn commit: r1632519 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main:
java/org/apache/maven/plugin/assembly/archive/
java/org/apache/maven/plugin/assembly/filter/ resources/META-INF/plexus/
Author: krosenvold
Date: Fri Oct 17 09:03:14 2014
New Revision: 1632519
URL: http://svn.apache.org/r1632519
Log:
Changed scopes to fix threading issues
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/filter/ComponentsXmlArchiverFileFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.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/resources/META-INF/plexus/components.xml
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=1632519&r1=1632518&r2=1632519&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 Fri Oct 17 09:03:14 2014
@@ -87,7 +87,7 @@ import org.codehaus.plexus.util.xml.pull
*
* @version $Id$
*/
-@Component( role = AssemblyArchiver.class )
+@Component( role = AssemblyArchiver.class, instantiationStrategy = "per-lookup")
public class DefaultAssemblyArchiver
extends AbstractLogEnabled
implements AssemblyArchiver, Contextualizable
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=1632519&r1=1632518&r2=1632519&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 Fri Oct 17 09:03:14 2014
@@ -37,6 +37,7 @@ import org.codehaus.plexus.archiver.Arch
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.ResourceIterator;
import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -50,6 +51,7 @@ import org.codehaus.plexus.util.xml.pull
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
+@Component( role = ContainerDescriptorHandler.class, hint = "plexus", instantiationStrategy = "per-lookup" )
public class ComponentsXmlArchiverFileFilter
implements ContainerDescriptorHandler
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java?rev=1632519&r1=1632518&r2=1632519&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java Fri Oct 17 09:03:14 2014
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-services" )
+@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-services", instantiationStrategy = "per-lookup" )
public class MetaInfServicesHandler
extends AbstractLineAggregatingHandler
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java?rev=1632519&r1=1632518&r2=1632519&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java Fri Oct 17 09:03:14 2014
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-spring" )
+@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-spring", instantiationStrategy = "per-lookup")
public class MetaInfSpringHandler
extends AbstractLineAggregatingHandler
{
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=1632519&r1=1632518&r2=1632519&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 Fri Oct 17 09:03:14 2014
@@ -35,6 +35,7 @@ import org.apache.maven.plugin.assembly.
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -44,6 +45,8 @@ import org.codehaus.plexus.util.IOUtil;
/**
* @version $Id$
*/
+@Component( role = ContainerDescriptorHandler.class, hint = "file-aggregator", instantiationStrategy = "per-lookup" )
+
public class SimpleAggregatingDescriptorHandler
implements ContainerDescriptorHandler, LogEnabled
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1632519&r1=1632518&r2=1632519&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml Fri Oct 17 09:03:14 2014
@@ -33,19 +33,5 @@
<implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
-
- <component>
- <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
- <role-hint>plexus</role-hint>
- <implementation>org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
-
- <component>
- <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
- <role-hint>file-aggregator</role-hint>
- <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
</components>
</component-set>