You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/11/17 23:23:50 UTC
svn commit: r1640245 - 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/phase/
src/main/java/org/apache/maven/plugin/assembly/archive/task/ ...
Author: hboutemy
Date: Mon Nov 17 22:23:49 2014
New Revision: 1640245
URL: http://svn.apache.org/r1640245
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
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/phase/AssemblyArchiverPhase.java
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/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/PhaseOrder.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/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/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/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.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
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/model/Assemblies.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/mojos/SingleAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.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/InterpolationConstants.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/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Nov 17 22:23:49 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>27</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -62,7 +62,7 @@ under the License.
<mavenFilteringVersion>1.3</mavenFilteringVersion>
<mavenVersion>2.2.1</mavenVersion>
<testOutputToFile>true</testOutputToFile>
- <mavenPluginVersion>3.2</mavenPluginVersion>
+ <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder</checkstyle.violation.ignore>
</properties>
<contributors>
@@ -114,7 +114,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -285,19 +284,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -311,14 +297,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${testOutputToFile}</redirectTestOutputToFile>
@@ -332,7 +310,7 @@ under the License.
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<!--
These files contain real repository artifacts.
-->
@@ -347,6 +325,7 @@ under the License.
<!-- The following is used to exclude files with the extension *.file -->
<exclude>src/it/**/*.file</exclude>
<exclude>src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/**</exclude>
+ <exclude>src/it/projects/bugs/massembly-731/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java Mon Nov 17 22:23:49 2014
@@ -136,9 +136,11 @@ public class ManifestCreationFinalizer
}
catch ( final ManifestException ignore )
{
+ // noop
}
catch ( final DependencyResolutionRequiredException ignore )
{
+ // noop
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java Mon Nov 17 22:23:49 2014
@@ -41,9 +41,10 @@ public interface AssemblyArchiverPhase
* Handle the associated section of the assembly descriptor.
*
* @param assembly The assembly descriptor to use
- * @param archiver The archiver used to create the assembly archive, to which files/directories/artifacts are added
- * @param configSource The configuration for this assembly build, normally derived from the plugin that launched the
- * assembly process.
+ * @param archiver The archiver used to create the assembly archive, to which files/directories/artifacts are
+ * added
+ * @param configSource The configuration for this assembly build, normally derived from the plugin that launched
+ * the assembly process.
* @throws ArchiveCreationException in case of an archive creation error.
* @throws AssemblyFormattingException in case of a assembly formatting exception.
* @throws InvalidAssemblerConfigurationException in case of an invalid assembler configuration.
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -1,4 +1,5 @@
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
@@ -20,6 +21,9 @@ package org.apache.maven.plugin.assembly
import java.util.Comparator;
+/**
+ *
+ */
public class AssemblyArchiverPhaseComparator
implements Comparator<AssemblyArchiverPhase>
{
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/DependencySetAssemblyPhase.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java Mon Nov 17 22:23:49 2014
@@ -106,6 +106,8 @@ public class DependencySetAssemblyPhase
public int order()
{
+ // CHECKSTYLE_OFF: MagicNumber
return 40;
+ // CHECKSTYLE_ON: MagicNumber
}
}
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -29,7 +29,6 @@ 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;
@@ -143,7 +142,7 @@ public class FileItemAssemblyPhase
{
return res.getName();
}
- }.asResource();
+ } .asResource();
}
int mode = TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() );
@@ -171,7 +170,9 @@ public class FileItemAssemblyPhase
throws IOException
{
this.resource = resource;
+ // CHECKSTYLE_OFF: MagicNumber
dfos = new DeferredFileOutputStream( 1000000, "m-assembly-archiver", null, null );
+ // CHECKSTYLE_ON: MagicNumber
InputStream inputStream = getInputStream();
IOUtils.copy( inputStream, dfos );
IOUtils.closeQuietly( inputStream );
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -64,6 +64,8 @@ public class FileSetAssemblyPhase
public int order()
{
+ // CHECKSTYLE_OFF: MagicNumber
return 20;
+ // CHECKSTYLE_ON: MagicNumber
}
}
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -580,6 +580,8 @@ public class ModuleSetAssemblyPhase
public int order()
{
+ // CHECKSTYLE_OFF: MagicNumber
return 30;
+ // CHECKSTYLE_ON: MagicNumber
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java Mon Nov 17 22:23:49 2014
@@ -25,5 +25,5 @@ package org.apache.maven.plugin.assembly
*/
public interface PhaseOrder
{
- public int order();
+ int order();
}
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/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java Mon Nov 17 22:23:49 2014
@@ -135,7 +135,9 @@ public class RepositoryAssemblyPhase
public int order()
{
+ // CHECKSTYLE_OFF: MagicNumber
return 50;
+ // CHECKSTYLE_ON: MagicNumber
}
}
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=1640245&r1=1640244&r2=1640245&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 Nov 17 22:23:49 2014
@@ -245,8 +245,8 @@ public class AddArtifactTask
final File tempRoot = configSource.getTemporaryRootDirectory();
final File tempArtifactFile = new File( tempRoot, artifact.getFile().getName() );
- logger.warn( "Artifact: " + artifact.getId()
- + " references the same file as the assembly destination file. Moving it to a temporary location for inclusion." );
+ logger.warn( "Artifact: " + artifact.getId() + " references the same file as the assembly destination file. "
+ + "Moving it to a temporary location for inclusion." );
try
{
FileUtils.copyFile( artifact.getFile(), tempArtifactFile );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Mon Nov 17 22:23:49 2014
@@ -197,10 +197,9 @@ public class AddDependencySetsTask
if ( ( dir == null || !dir.contains( "${" ) ) && ( mapping == null || !mapping.contains( "${" ) ) )
{
- logger.warn(
- "NOTE: Your assembly specifies a dependencySet that matches multiple artifacts, but specifies a concrete output format. "
- + "THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING OBSCURED!\n\nOutput directory: '" + dir
- + "'\nOutput filename mapping: '" + mapping + "'" );
+ logger.warn( "NOTE: Your assembly specifies a dependencySet that matches multiple artifacts, but "
+ + "specifies a concrete output format. THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING OBSCURED!\n\n"
+ + "Output directory: '" + dir + "'\nOutput filename mapping: '" + mapping + "'" );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Mon Nov 17 22:23:49 2014
@@ -123,8 +123,8 @@ public class DefaultDependencyResolver
}
else
{
- getLogger().debug(
- "Resolving project dependencies ONLY. Transitive dependencies WILL NOT be included in the results." );
+ getLogger().debug( "Resolving project dependencies ONLY. "
+ + "Transitive dependencies WILL NOT be included in the results." );
artifacts = resolveNonTransitively( assembly, artifacts, configSource, repos );
}
}
@@ -170,8 +170,8 @@ public class DefaultDependencyResolver
}
else
{
- getLogger().debug(
- "Resolving project dependencies ONLY. Transitive dependencies WILL NOT be included in the results." );
+ getLogger().debug( "Resolving project dependencies ONLY. "
+ + "Transitive dependencies WILL NOT be included in the results." );
artifacts = resolveNonTransitively( assembly, artifacts, configSource, repos );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java Mon Nov 17 22:23:49 2014
@@ -38,14 +38,14 @@ import java.util.Set;
public interface DependencyResolver
{
- public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
+ Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
+ final AssemblerConfigurationSource configSource,
+ List<DependencySet> dependencySets )
throws DependencyResolutionException;
- public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
+ Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly,
+ final AssemblerConfigurationSource configSource,
+ List<DependencySet> dependencySets )
throws DependencyResolutionException;
}
\ No newline at end of file
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -216,7 +216,9 @@ public class ComponentsXmlArchiverFileFi
stream = fileInfo.getContents();
// TODO use ReaderFactory.newXmlReader() when plexus-utils is upgraded to 1.4.5+
reader = new InputStreamReader( stream, "UTF-8" );
+ // CHECKSTYLE_OFF: MagicNumber
addComponentsXml( new BufferedReader( reader, 8192 ) );
+ // CHECKSTYLE_ON: MagicNumber
}
catch ( final XmlPullParserException e )
{
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -22,6 +22,9 @@ 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", 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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -22,6 +22,9 @@ 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", 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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -80,9 +80,9 @@ public class SimpleAggregatingDescriptor
if ( outputPath.endsWith( "/" ) )
{
- throw new ArchiverException(
- "Cannot write aggregated properties to a directory. You must specify a file name in the outputPath configuration for this handler. (handler: "
- + getClass().getName() );
+ throw new ArchiverException( "Cannot write aggregated properties to a directory. "
+ + "You must specify a file name in the outputPath configuration for this handler. (handler: "
+ + getClass().getName() );
}
if ( outputPath.startsWith( "/" ) )
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=1640245&r1=1640244&r2=1640245&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 Mon Nov 17 22:23:49 2014
@@ -38,6 +38,9 @@ import java.io.Reader;
import java.util.LinkedHashSet;
import java.util.List;
+/**
+ *
+ */
public class ReaderFormatter
{
private static Reader createReaderFilter( @Nonnull Reader source, String escapeString, List<String> delimiters,
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java Mon Nov 17 22:23:49 2014
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.assembly.functions;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +21,10 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.project.MavenProject;
+/**
+ *
+ */
public interface MavenProjectConsumer
{
- public void accept( MavenProject project );
+ void accept( MavenProject project );
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java Mon Nov 17 22:23:49 2014
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.assembly.functions;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,7 +28,9 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.Set;
-
+/**
+ *
+ */
public class MavenProjects
{
public static void without( Iterable<MavenProject> source, String packagingType, MavenProjectConsumer consumer )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java Mon Nov 17 22:23:49 2014
@@ -25,6 +25,9 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.ModuleSet;
+/**
+ *
+ */
public interface ModuleSetConsumer
{
void accept( ModuleSet resolvedModule )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java Mon Nov 17 22:23:49 2014
@@ -31,6 +31,9 @@ import org.codehaus.plexus.interpolation
import java.io.File;
+/**
+ *
+ */
public class AssemblyExpressionEvaluator
implements ExpressionEvaluator
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java Mon Nov 17 22:23:49 2014
@@ -25,6 +25,9 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
+/**
+ *
+ */
public class Assemblies
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Mon Nov 17 22:23:49 2014
@@ -506,12 +506,12 @@ public abstract class AbstractAssemblyMo
{
final StringBuilder message = new StringBuilder();
- message.append(
- "Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing." );
- message.append( "\nInstead of attaching the assembly file: " ).append(
- destFile ).append( ", it will become the file for main project artifact." );
- message.append(
- "\nNOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic!" );
+ message.append( "Configuration options: 'appendAssemblyId' is set to false, "
+ + "and 'classifier' is missing." );
+ message.append( "\nInstead of attaching the assembly file: " ).append( destFile );
+ message.append( ", it will become the file for main project artifact." );
+ message.append( "\nNOTE: If multiple descriptors or descriptor-formats are provided "
+ + "for this project, the value of this file will be non-deterministic!" );
getLog().warn( message );
warnedAboutMainProjectArtifact = true;
@@ -533,8 +533,8 @@ public abstract class AbstractAssemblyMo
}
else if ( attach )
{
- getLog().warn( "Assembly file: " + destFile
- + " is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment." );
+ getLog().warn( "Assembly file: " + destFile + " is not a regular file (it may be a directory). "
+ + "It cannot be attached to the project build for installation or deployment." );
}
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java Mon Nov 17 22:23:49 2014
@@ -33,7 +33,8 @@ import org.apache.maven.project.MavenPro
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
-@Mojo( name = "single", inheritByDefault = false, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true )
+@Mojo( name = "single", inheritByDefault = false, requiresDependencyResolution = ResolutionScope.COMPILE,
+ threadSafe = true )
public class SingleAssemblyMojo
extends AbstractAssemblyMojo
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java Mon Nov 17 22:23:49 2014
@@ -21,6 +21,9 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.plugin.assembly.model.Assembly;
+/**
+ *
+ */
public class AssemblyId
{
private final String id;
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=1640245&r1=1640244&r2=1640245&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 17 22:23:49 2014
@@ -121,11 +121,13 @@ public final class AssemblyFormatUtils
{
if ( moduleArtifact != null )
{
+ // CHECKSTYLE_OFF: LineLength
return FixedStringSearchInterpolator.create( new PrefixedObjectValueSource( "module.", moduleArtifact ),
new PrefixedObjectValueSource( "module.",
moduleArtifact.getArtifactHandler() ),
new PrefixedObjectValueSource( "module.handler.",
moduleArtifact.getArtifactHandler() ) );
+ // CHECKSTYLE_ON: LineLength
}
else
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java Mon Nov 17 22:23:49 2014
@@ -23,6 +23,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+/**
+ *
+ */
public final class InterpolationConstants
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java?rev=1640245&r1=1640244&r2=1640245&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java Mon Nov 17 22:23:49 2014
@@ -187,7 +187,8 @@ public final class LineEndingsUtils
/**
* Returns the appopriate line ending characters for the specified style
*
- * @param lineEnding The name of the line ending style, see org.apache.maven.plugin.assembly.utils.LineEndings#valueOf
+ * @param lineEnding The name of the line ending style,
+ * see org.apache.maven.plugin.assembly.utils.LineEndings#valueOf
* @return The proper line ending characters
* @throws AssemblyFormattingException
*/