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/23 22:09:22 UTC
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/main/java/org/apache/maven/plugin/assembly/archive/pha...
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.
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.5.6</version>
+ <version>1.6</version>
<executions>
<execution>
<id>descriptors</id>
@@ -294,6 +294,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>3.3</version>
<executions>
<execution>
<id>mojo-descriptor</id>
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
* <li>Setup any directory structures for temporary files</li>
* <li>Calculate the output directory/file for the assembly</li>
* <li>Setup any handler components for special descriptor files we may encounter</li>
- * <li>Lookup and configure the {@link Archiver} to be used</li>
+ * <li>Lookup and configure the {@link org.codehaus.plexus.archiver.Archiver} to be used</li>
* <li>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.</li>
- * <li>Iterate through the available {@link AssemblyArchiverPhase} instances, executing each to handle a different
+ * <li>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.</li>
* </ol>
* @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/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1633941&r1=1633940&r2=1633941&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 Thu Oct 23 20:09:22 2014
@@ -68,6 +68,7 @@ public class RepositoryAssemblyPhase
/**
* {@inheritDoc}
*/
+ @SuppressWarnings( "ResultOfMethodCallIgnored" )
public void execute( final ResolvedAssembly assembly, final Archiver archiver,
final AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
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=1633941&r1=1633940&r2=1633941&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 20:09:22 2014
@@ -29,7 +29,7 @@ import java.util.Properties;
* @author Andreas Hoheneder (ahoh_at_inode.at)
* @version $Id$
*
- * @depcrecated
+ * @deprecated
*/
@Deprecated
public class ReflectionProperties
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java?rev=1633941&r1=1633940&r2=1633941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java Thu Oct 23 20:09:22 2014
@@ -27,17 +27,9 @@ public class AssemblyInterpolationExcept
{
private static final long serialVersionUID = 1L;
- private String expression;
-
- private String originalMessage;
-
public AssemblyInterpolationException( final String message, final Throwable cause )
{
super( message, cause );
}
- public String getExpression()
- {
- return expression;
- }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java?rev=1633941&r1=1633940&r2=1633941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java Thu Oct 23 20:09:22 2014
@@ -70,6 +70,7 @@ public class UnpackMojo
*
* @throws MojoExecutionException
*/
+ @SuppressWarnings( "ResultOfMethodCallIgnored" )
public void execute()
throws MojoExecutionException, MojoFailureException
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=1633941&r1=1633940&r2=1633941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Thu Oct 23 20:09:22 2014
@@ -81,12 +81,12 @@ public final class AssemblyFileUtils
return path;
}
+ @SuppressWarnings( "ResultOfMethodCallIgnored" )
public static void verifyTempDirectoryAvailability( @Nonnull
final File tempDir )
{
if ( !tempDir.exists() )
{
- // noinspection ResultOfMethodCallIgnored
tempDir.mkdirs();
}
}