svn commit: r1628729 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: krosenvold Date: Wed Oct 1 15:13:08 2014 New Revision: 1628729 URL: http://svn.apache.org/r1628729 Log: Updated plexus achiver to 2.6.2 Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1628729r1=1628728r2=1628729view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Wed Oct 1 15:13:08 2014 @@ -223,7 +223,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn propchange: r1628564 - svn:log
Author: khmarbaise Revision: 1628564 Modified property: svn:log Modified: svn:log at Wed Oct 1 19:12:34 2014 -- --- svn:log (original) +++ svn:log Wed Oct 1 19:12:34 2014 @@ -1,2 +1,2 @@ [MSOURCES-74] - - Upgrade plexus-archiver from 2.6.1 to 2.6.1 + - Upgrade plexus-archiver from 2.6.1 to 2.6.2
svn commit: r1628828 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm
Author: khmarbaise Date: Wed Oct 1 20:10:43 2014 New Revision: 1628828 URL: http://svn.apache.org/r1628828 Log: [MWAR-312] - Updated documentation about skinny-wars. Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm?rev=1628828r1=1628827r2=1628828view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm Wed Oct 1 20:10:43 2014 @@ -2,8 +2,9 @@ Creating Skinny WARs -- Mike Perham + Karl-Heinz Marbaise -- - 2008-08-03 + 2014-10-01 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -34,69 +35,11 @@ Creating Skinny WARs the J2EE specification allows WARs to reference external JARs packaged within the EAR via the Class-Path setting in their MANIFEST.MF. - The Maven WAR and EAR Plugins do not directly support this mode of operation but - we can fake it through some POM and configuration magic. First you need to tell - Maven to exclude the dependent JARs and add references to them in the MANIFEST.MF - instead. This goes into your WAR project's pom.xml: + The Maven EAR Plugin has direct support for creating skinny wars which simply + means to {{{http://maven.apache.org/plugins/maven-ear-plugin/examples/skinny-wars.html}configure the maven-ear-plugin}} + accordingly. -+-+ -project - ... - build -plugins - plugin -artifactIdmaven-war-plugin/artifactId -version${project.version}/version -configuration - !-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -- - packagingExcludesWEB-INF/lib/*.jar/packagingExcludes - archive -manifest - addClasspathtrue/addClasspath - classpathPrefixlib//classpathPrefix -/manifest - /archive -/configuration - /plugin -/plugins - /build - ... -/project -+-+ - - Here's another variant of the above example, but this time we use - \packagingIncludes\ to select a few JARs to be included in the WAR. - This is useful when there is a need to package a small, but non-empty, subset - of JARs into the WAR. When making an EAR of skinny WARs, one wants to package - all of the JARs into the EAR. Sometimes a list of JARs must be packaged into - the WAR though in order for it to work properly, like with tag libraries. - -+-+ -project - ... - build -plugins - plugin -artifactIdmaven-war-plugin/artifactId -version${project.version}/version -configuration - !-- Use this to include a selection of jars that will be included in the WAR -- - packagingIncludesWEB-INF/lib/my-tag-library.jar,**/*.xml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,**/*.jsp/packagingIncludes - archive -manifest - addClasspathtrue/addClasspath - classpathPrefixlib//classpathPrefix -/manifest - /archive -/configuration - /plugin -/plugins - /build - ... -/project -+-+ - - Next we need to change the EAR project's pom.xml to package those dependent JARs in the EAR. + You need to change the EAR project's pom.xml to package those dependent JARs in the EAR. Notice that we package everything into a lib/ directory within the EAR. This is just my own personal preference to distinguish between J2EE modules (which will be packaged in the root of the EAR) and Java libraries (which are packaged in lib/). @@ -107,9 +50,10 @@ Creating Skinny WARs plugins plugin artifactIdmaven-ear-plugin/artifactId -version2.3.2/version +version2.9.1/version configuration defaultLibBundleDirlib//defaultLibBundleDir + skinnyWarstrue/skinnyWars /configuration /plugin /plugins @@ -161,4 +105,4 @@ Creating Skinny WARs * Alternatives Our users have submitted alternatives to the above recipe on - {{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the Wiki}}. \ No newline at end of file + {{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the Wiki}}.
svn commit: r1628835 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Oct 1 21:07:11 2014 New Revision: 1628835 URL: http://svn.apache.org/r1628835 Log: [MWAR-322] - Removed plexus-container-dependency:1.0-alpha-9-stable-1 dependency. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1628835r1=1628834r2=1628835view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Oct 1 21:07:11 2014 @@ -148,13 +148,6 @@ under the License. version1.19/version /dependency -!-- FIXME: This can be removed with upgrade to Maven 2.2.1 minimum version -- -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency - !-- 1.4.2 to avoid http://jira.codehaus.org/browse/XSTR-709 -- dependency groupIdcom.thoughtworks.xstream/groupId
svn commit: r1628837 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Oct 1 21:12:38 2014 New Revision: 1628837 URL: http://svn.apache.org/r1628837 Log: [MWAR-323] - Upgraded xtream from 1.4.2 to 1.4.4 to remove note about XSTR-709 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1628837r1=1628836r2=1628837view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Oct 1 21:12:38 2014 @@ -148,11 +148,10 @@ under the License. version1.19/version /dependency -!-- 1.4.2 to avoid http://jira.codehaus.org/browse/XSTR-709 -- dependency groupIdcom.thoughtworks.xstream/groupId artifactIdxstream/artifactId - version1.4.2/version + version1.4.4/version /dependency dependency
svn commit: r1628839 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging: AbstractWarPackagingTask.java DependenciesAnalysisPackagingTask.java
Author: khmarbaise Date: Wed Oct 1 21:28:57 2014 New Revision: 1628839 URL: http://svn.apache.org/r1628839 Log: - Removed unused imports - Refactored code to remove CPD warning in DependenciesAnalysisPackagingTask Modified: 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 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=1628839r1=1628838r2=1628839view=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 Oct 1 21:28:57 2014 @@ -21,7 +21,6 @@ package org.apache.maven.plugin.war.pack import java.io.File; import java.io.IOException; -import java.util.List; import org.apache.commons.io.input.XmlStreamReader; import org.apache.maven.artifact.Artifact; 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=1628839r1=1628838r2=1628839view=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 Oct 1 21:28:57 2014 @@ -55,21 +55,8 @@ public class DependenciesAnalysisPackagi { context.getLog().debug( notBundledMessage ); } -else if ( war.equals( dependency.getType() ) || zip.equals( dependency.getType() ) ) -{ -context.getLog().warn( warOrZipMessage ); -} -else if ( tld.equals( dependency.getType() ) || aar.equals( dependency.getType() ) -|| mar.equals( dependency.getType() ) || xar.equals( dependency.getType() ) -|| jar.equals( dependency.getType() ) || ejb.equals( dependency.getType() ) -|| ejb-client.equals( dependency.getType() ) || test-jar.equals( dependency.getType() ) -|| par.equals( dependency.getType() ) ) -{ -context.getLog().info( standardMessage ); -if ( removeFile ) -{ -removeDependency( context, dependency ); -} +else { +handleDependencyScope( context, dependency, warOrZipMessage, standardMessage, removeFile ); } }
svn commit: r1628849 [3/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java Wed Oct 1 22:03:26 2014 @@ -43,8 +43,8 @@ public class WarMojoTest { WarMojo mojo; -private static File pomFile = -new File( getBasedir(), target/test-classes/unit/warmojotest/plugin-config-primary-artifact.xml ); +private static File pomFile = new File( getBasedir(), + target/test-classes/unit/warmojotest/plugin-config-primary-artifact.xml ); protected File getTestDirectory() { @@ -75,7 +75,7 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); @@ -85,12 +85,12 @@ public class WarMojoTest mojo.execute(); -//validate jar file +// validate jar file File expectedJarFile = new File( outputDir, simple.war ); -assertJarContent( expectedJarFile, new String[]{META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, +assertJarContent( expectedJarFile, new String[] { META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, org/web/app/last-exile.jsp, META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml, - META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties}, - new String[]{null, mojo.getWebXml().toString(), null, null, null, null} ); + META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties }, new String[] { null, +mojo.getWebXml().toString(), null, null, null, null } ); } public void testSimpleWarPackagingExcludeWithIncludesRegEx() @@ -104,25 +104,23 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); setVariableValueToObject( mojo, outputDirectory, outputDir ); setVariableValueToObject( mojo, warName, warName ); mojo.setWebXml( new File( xmlSource, web.xml ) ); -setVariableValueToObject( mojo,packagingIncludes,%regex[(.(?!exile))+] ); - - +setVariableValueToObject( mojo, packagingIncludes, %regex[(.(?!exile))+] ); + mojo.execute(); -//validate jar file +// validate jar file File expectedJarFile = new File( outputDir, simple.war ); -assertJarContent( expectedJarFile, new String[]{META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, +assertJarContent( expectedJarFile, new String[] { META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml, - META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties}, - new String[]{null, mojo.getWebXml().toString(), null, null, null, }, - new String[]{org/web/app/last-exile.jsp} ); + META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties }, new String[] { null, +mojo.getWebXml().toString(), null, null, null, }, new String[] { org/web/app/last-exile.jsp } ); } public void testClassifier() @@ -137,7 +135,7 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); @@ -149,12 +147,12 @@
svn commit: r1628849 [2/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java Wed Oct 1 22:03:26 2014 @@ -30,7 +30,6 @@ import java.io.IOException; * Saves the webapp structure cache. * * @author Stephane Nicoll - * * @version $Id$ */ public class SaveWebappStructurePostPackagingTask @@ -41,7 +40,6 @@ public class SaveWebappStructurePostPack private final WebappStructureSerializer serialier; - public SaveWebappStructurePostPackagingTask( File targetFile ) { this.targetFile = targetFile; Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java Wed Oct 1 22:03:26 2014 @@ -49,8 +49,7 @@ public interface WarPackagingContext MavenProject getProject(); /** - * Returns the webapp directory. Packaging tasks should use this - * directory to generate the webapp. + * Returns the webapp directory. Packaging tasks should use this directory to generate the webapp. * * @return the webapp directory */ @@ -92,8 +91,7 @@ public interface WarPackagingContext File getClassesDirectory(); /** - * Specify whether the classes resources should be archived in - * the ttWEB-INF/lib/tt of the generated web app. + * Specify whether the classes resources should be archived in the ttWEB-INF/lib/tt of the generated web app. * * @return true if the classes should be archived, false otherwise */ @@ -128,16 +126,14 @@ public interface WarPackagingContext MavenArchiveConfiguration getArchive(); /** - * Returns the Jar archiver needed for archiving classes directory into - * jar file under WEB-INF/lib. + * Returns the Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib. * * @return the jar archiver to user */ JarArchiver getJarArchiver(); /** - * Returns the output file name mapping to use, if any. Returns ttnull/tt - * if no file name mapping is set. + * Returns the output file name mapping to use, if any. Returns ttnull/tt if no file name mapping is set. * * @return the output file name mapping or ttnull/tt */ @@ -158,15 +154,14 @@ public interface WarPackagingContext WebappStructure getWebappStructure(); /** - * Returns the list of registered overlays for this session. This list might - * differ from the one returned by the cache; in this case, it means that the - * project's configuration has changed. The plugin will handle those cases nicely - * but it would be better in general to invoke the clean goal. + * Returns the list of registered overlays for this session. This list might differ from the one returned by the + * cache; in this case, it means that the project's configuration has changed. The plugin will handle those cases + * nicely but it would be better in general to invoke the clean goal. * * @return the list of registered overlays, including the current project */ ListString getOwnerIds(); - + /** * Returns the {@link MavenFileFilter} instance to use. * @@ -174,25 +169,24 @@ public interface WarPackagingContext * @since 2.1-alpha-2 */ MavenFileFilter getMavenFileFilter(); - + /** * @return {@link List} of {@link FilterWrapper} * @since 2.1-alpha-2 */ ListFilterWrapper getFilterWrappers(); - + /** - * Specify if the given ttfileName/tt belongs to the list of extensions - * that must not be filtered + * Specify if the given ttfileName/tt belongs to the list of extensions that must not be filtered * * @param fileName the name of file * @return tttrue/tt if it should not be filtered, ttfalse/tt otherwise *
svn commit: r1628849 [1/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Author: khmarbaise Date: Wed Oct 1 22:03:26 2014 New Revision: 1628849 URL: http://svn.apache.org/r1628849 Log: [MWAR-325] - Cleaned up several Checkstyle (errors, warnings) - CPD issues. Modified: 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/Overlay.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/WarInPlaceMojo.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/DefaultOverlay.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.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/ArtifactsPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.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/OverlayPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.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/ClassesPackager.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.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 maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java 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=1628849r1=1628848r2=1628849view=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 Oct 1 22:03:26 2014 @@ -84,9 +84,9 @@ public abstract class AbstractWarMojo private File classesDirectory; /** - * Whether a JAR file will be created for the classes in the webapp. Using this optional configuration - * parameter