Author: khmarbaise
Date: Mon Sep 29 18:26:58 2014
New Revision: 1628247
URL: http://svn.apache.org/r1628247
Log:
- Improved code to be more Java 5
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.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/WarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.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=1628247&r1=1628246&r2=1628247&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
Mon Sep 29 18:26:58 2014
@@ -447,6 +447,7 @@ public abstract class AbstractWarMojo
* @throws MojoFailureException if an unexpected error occurred while
packaging the webapp
* @throws IOException if an error occurred while copying the
files
*/
+ @SuppressWarnings( "unchecked" )
public void buildWebapp( MavenProject project, File webappDirectory )
throws MojoExecutionException, MojoFailureException, IOException
{
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java?rev=1628247&r1=1628246&r2=1628247&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
Mon Sep 29 18:26:58 2014
@@ -132,7 +132,7 @@ public class WarDependenciesAnalysisTest
mojo.setWebXml( new File( xmlSource, "web.xml" ) );
mojo.execute();
- final List assertedFiles = new ArrayList();
+ final List<File> assertedFiles = new ArrayList<File>();
assertedFiles.addAll( assertDefaultContent( webAppDirectory ) );
assertedFiles.addAll( assertWebXml( webAppDirectory ) );
assertedFiles.addAll( assertCustomContent( webAppDirectory,
firstCustomContent, "library not found" ) );
@@ -146,7 +146,7 @@ public class WarDependenciesAnalysisTest
mojo.execute();
- final List assertedFiles2 = new ArrayList();
+ final List<File> assertedFiles2 = new ArrayList<File>();
assertedFiles2.addAll( assertDefaultContent( webAppDirectory ) );
assertedFiles2.addAll( assertWebXml( webAppDirectory ) );
if ( secondCustomContent != null )
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=1628247&r1=1628246&r2=1628247&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Mon Sep 29 18:26:58 2014
@@ -290,7 +290,7 @@ public class WarExplodedMojoTest
// configure mojo
project.addArtifact( warArtifact );
- this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource,
webAppDirectory, project );
+ this.configureMojo( mojo, new LinkedList<String>(), classesDir,
webAppSource, webAppDirectory, project );
setVariableValueToObject( mojo, "workDirectory", workDirectory );
mojo.execute();
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java?rev=1628247&r1=1628246&r2=1628247&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
Mon Sep 29 18:26:58 2014
@@ -72,9 +72,9 @@ public class MavenProjectArtifactsStub
}
- public List getRuntimeClasspathElements()
+ public List<String> getRuntimeClasspathElements()
{
- List artifacts = new ArrayList();
+ List<String> artifacts = new ArrayList<String>();
artifacts.add(
"src/test/resources/unit/manifest/manifest-with-classpath/sample-artifacts/maven-artifact1-1.0-SNAPSHOT.jar"
);
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java?rev=1628247&r1=1628246&r2=1628247&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java
Mon Sep 29 18:26:58 2014
@@ -33,6 +33,11 @@ import org.apache.maven.model.Profile;
public class ModelStub
extends Model
{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7802402157311376304L;
+
public ModelStub()
{
