Author: khmarbaise Date: Wed Nov 5 08:27:25 2014 New Revision: 1636820 URL: http://svn.apache.org/r1636820 Log: [MWAR-336] Upgrade to maven-plugins version 25 to 26 - Fixed several checkstyle reported issues
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Nov 5 08:27:25 2014 @@ -25,7 +25,7 @@ under the License. <parent> <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> - <version>25</version> + <version>26</version> <relativePath>../maven-plugins/pom.xml</relativePath> </parent> Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Wed Nov 5 08:27:25 2014 @@ -435,19 +435,23 @@ public abstract class AbstractWarMojo WebappStructure cache; if ( useCache && cacheFile.exists() ) { + // CHECKSTYLE_OFF: LineLength cache = new WebappStructure( mavenProject.getDependencies(), webappStructureSerialier.fromXml( cacheFile ) ); + // CHECKSTYLE_ON: LineLength } else { cache = new WebappStructure( mavenProject.getDependencies(), null ); } + // CHECKSTYLE_OFF: LineLength final long startTime = System.currentTimeMillis(); getLog().info( "Assembling webapp [" + mavenProject.getArtifactId() + "] in [" + webapplicationDirectory + "]" ); final OverlayManager overlayManager = new OverlayManager( overlays, mavenProject, dependentWarIncludes, dependentWarExcludes, currentProjectOverlay ); final List<WarPackagingTask> packagingTasks = getPackagingTasks( overlayManager ); + // CHECKSTYLE_ON: LineLength List<FileUtils.FilterWrapper> defaultFilterWrappers; try { @@ -582,7 +586,7 @@ public abstract class AbstractWarMojo this.artifactFactory = artifactFactory; this.filteringDeploymentDescriptors = filteringDeploymentDescriptors; this.nonFilteredFileExtensions = - nonFilteredFileExtensions == null ? Collections.<String> emptyList() : nonFilteredFileExtensions; + nonFilteredFileExtensions == null ? Collections.<String>emptyList() : nonFilteredFileExtensions; this.resourceEncoding = resourceEncoding; // This is kinda stupid but if we loop over the current overlays and we request the path structure // it will register it. This will avoid wrong warning messages in a later phase Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java Wed Nov 5 08:27:25 2014 @@ -30,6 +30,7 @@ import org.apache.maven.plugins.annotati * * @version $Id$ */ +// CHECKSTYLE_OFF: LineLength @Mojo( name = "exploded", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true, requiresDependencyResolution = ResolutionScope.RUNTIME ) public class WarExplodedMojo extends AbstractWarMojo @@ -42,4 +43,5 @@ public class WarExplodedMojo buildExplodedWebapp( getWebappDirectory() ); } -} \ No newline at end of file +} +// CHECKSTYLE_ON: LineLength Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java Wed Nov 5 08:27:25 2014 @@ -43,7 +43,9 @@ import java.io.PrintWriter; * @author Mike Perham * @version $Id$ */ +// CHECKSTYLE_OFF: LineLength @Mojo( name = "manifest", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, threadSafe = true, requiresDependencyResolution = ResolutionScope.RUNTIME ) +// CHECKSTYLE_ON: LineLength public class WarManifestMojo extends AbstractWarMojo { Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java Wed Nov 5 08:27:25 2014 @@ -218,8 +218,10 @@ public class WarMojo archiver.setOutputFile( warFile ); + // CHECKSTYLE_OFF: LineLength getLog().debug( "Excluding " + Arrays.asList( getPackagingExcludes() ) + " from the generated webapp archive." ); getLog().debug( "Including " + Arrays.asList( getPackagingIncludes() ) + " in the generated webapp archive." ); + // CHECKSTYLE_ON: LineLength warArchiver.addDirectory( getWebappDirectory(), getPackagingIncludes(), getPackagingExcludes() ); Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java Wed Nov 5 08:27:25 2014 @@ -209,7 +209,9 @@ public class OverlayManager } } } + // CHECKSTYLE_OFF: LineLength throw new InvalidOverlayConfigurationException( "overlay [" + overlay + "] is not a dependency of the project." ); + // CHECKSTYLE_ON: LineLength } Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Wed Nov 5 08:27:25 2014 @@ -131,8 +131,10 @@ public abstract class AbstractWarPackagi * @param targetFilename the relative path according to the root of the webapp * @throws IOException if an error occurred while copying */ + // CHECKSTYLE_OFF: LineLength protected void copyFile( String sourceId, final WarPackagingContext context, final File file, String targetFilename ) throws IOException + // CHECKSTYLE_ON: LineLength { final File targetFile = new File( context.getWebappDirectory(), targetFilename ); @@ -186,12 +188,14 @@ public abstract class AbstractWarPackagi String unknownOwnerId ) throws IOException { + // CHECKSTYLE_OFF: LineLength context.getLog().warn( "File [" + targetFilename + "] belonged to overlay [" + unknownOwnerId + "] which does not exist anymore in the current project. It is recommended to invoke " + "clean if the dependencies of the project changed." ); + // CHECKSTYLE_ON: LineLength copyFile( context, file, targetFile, targetFilename, false ); } @@ -247,8 +251,10 @@ public abstract class AbstractWarPackagi { throw new MojoExecutionException( e.getMessage(), e ); } + // CHECKSTYLE_OFF: LineLength // Add the file to the protected list context.getLog().debug( " + " + targetFilename + " has been copied (filtered encoding='" + encoding + "')." ); + // CHECKSTYLE_ON: LineLength return true; } else @@ -393,7 +399,9 @@ public abstract class AbstractWarPackagi * @param excludes the excludes * @return the files to copy */ + // CHECKSTYLE_OFF: LineLength protected PathSet getFilesToIncludes( File baseDir, String[] includes, String[] excludes, boolean includeDirectories ) + // CHECKSTYLE_ON: LineLength { final DirectoryScanner scanner = new DirectoryScanner(); scanner.setBasedir( baseDir ); Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java Wed Nov 5 08:27:25 2014 @@ -181,9 +181,11 @@ public class DependenciesAnalysisPackagi public void updatedScope( Dependency dependency, String previousScope ) { + // CHECKSTYLE_OFF: LineLength if ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() ) || Artifact.SCOPE_TEST.equals( dependency.getScope() ) && ( !Artifact.SCOPE_PROVIDED.equals( previousScope ) && !Artifact.SCOPE_TEST.equals( previousScope ) ) ) + // CHECKSTYLE_ON: LineLength { // It's now provided or test so it should be removed handleDependencyScope( context, dependency, "Scope of dependency [" + dependency + "] has changed (" Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Wed Nov 5 08:27:25 2014 @@ -148,6 +148,7 @@ public class WarProjectPackagingTask protected void handeWebAppSourceDirectory( WarPackagingContext context ) throws MojoExecutionException { + // CHECKSTYLE_OFF: LineLength if ( !context.getWebappSourceDirectory().exists() ) { context.getLog().debug( "webapp sources directory does not exist - skipping." ); @@ -169,6 +170,7 @@ public class WarProjectPackagingTask + context.getWebappDirectory().getAbsolutePath() + "]", e ); } } + // CHECKSTYLE_ON: LineLength } /** @@ -331,6 +333,7 @@ public class WarProjectPackagingTask */ private String[] getFilesToCopy( Resource resource ) { + // CHECKSTYLE_OFF: LineLength DirectoryScanner scanner = new DirectoryScanner(); scanner.setBasedir( resource.getDirectory() ); if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty() ) @@ -351,5 +354,6 @@ public class WarProjectPackagingTask scanner.scan(); return scanner.getIncludedFiles(); + // CHECKSTYLE_ON: LineLength } } Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java Wed Nov 5 08:27:25 2014 @@ -429,6 +429,7 @@ public class WebappStructure */ private Dependency findDependency( Dependency dependency, List<Dependency> dependencies ) { + // CHECKSTYLE_OFF: LineLength for ( Dependency dep : dependencies ) { if ( dependency.getGroupId().equals( dep.getGroupId() ) @@ -442,6 +443,7 @@ public class WebappStructure } } return null; + // CHECKSTYLE_ON: LineLength } private Dependency matchDependency( List<Dependency> dependencies, Dependency dependency ) Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java?rev=1636820&r1=1636819&r2=1636820&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java Wed Nov 5 08:27:25 2014 @@ -40,16 +40,16 @@ import java.io.Writer; public class WebappStructureSerializer { - private static final XStream xstream; + private static final XStream XSTREAM; static { - xstream = new XStream( new DomDriver() ); + XSTREAM = new XStream( new DomDriver() ); // Register aliases - xstream.alias( "webapp-structure", WebappStructure.class ); - xstream.alias( "path-set", PathSet.class ); - xstream.alias( "dependency", Dependency.class ); + XSTREAM.alias( "webapp-structure", WebappStructure.class ); + XSTREAM.alias( "path-set", PathSet.class ); + XSTREAM.alias( "dependency", Dependency.class ); } @@ -75,7 +75,7 @@ public class WebappStructureSerializer try { reader = ReaderFactory.newXmlReader( file ); - return (WebappStructure) xstream.fromXML( reader ); + return (WebappStructure) XSTREAM.fromXML( reader ); } finally { @@ -93,6 +93,7 @@ public class WebappStructureSerializer public void toXml( WebappStructure webappStructure, File targetFile ) throws IOException { + // CHECKSTYLE_OFF: LineLength Writer writer = null; try { @@ -106,11 +107,12 @@ public class WebappStructureSerializer throw new IOException( "Could not create file [" + targetFile.getAbsolutePath() + "]" ); } writer = WriterFactory.newXmlWriter( targetFile ); - xstream.toXML( webappStructure, writer ); + XSTREAM.toXML( webappStructure, writer ); } finally { IOUtil.close( writer ); } + // CHECKSTYLE_ON: LineLength } }