svn commit: r1705824 - /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java

[khmarbaise]

Author: khmarbaise
Date: Tue Sep 29 09:45:25 2015
New Revision: 1705824

URL: http://svn.apache.org/viewvc?rev=1705824&view=rev
Log:
Make code more Java5.

Modified:
    
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java

Modified: 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java?rev=1705824&r1=1705823&r2=1705824&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
 Tue Sep 29 09:45:25 2015
@@ -168,7 +168,7 @@ public abstract class AbstractSourceJarM
      * Contains the full list of projects in the reactor.
      */
     @Parameter( defaultValue = "${reactorProjects}", readonly = true )
-    protected List reactorProjects;
+    protected List<MavenProject> reactorProjects;
 
     /**
      * Whether creating the archive should be forced. If set to true, the jar 
will always be created. If set to false,
@@ -358,11 +358,11 @@ public abstract class AbstractSourceJarM
                 continue;
             }
 
-            List resourceIncludes = resource.getIncludes();
+            List<String> resourceIncludes = resource.getIncludes();
 
             String[] combinedIncludes = getCombinedIncludes( resourceIncludes 
);
 
-            List resourceExcludes = resource.getExcludes();
+            List<String> resourceExcludes = resource.getExcludes();
 
             String[] combinedExcludes = getCombinedExcludes( resourceExcludes 
);
 
@@ -411,6 +411,7 @@ public abstract class AbstractSourceJarM
     {
         try
         {
+//            archiver.addFileSet( fileSet );
             archiver.addDirectory( sourceDirectory, includes, excludes );
         }
         catch ( ArchiverException e )
@@ -460,7 +461,7 @@ public abstract class AbstractSourceJarM
      * @param additionalIncludes The includes specified in the pom resources 
section
      * @return The combined array of includes.
      */
-    private String[] getCombinedIncludes( List additionalIncludes )
+    private String[] getCombinedIncludes( List<String> additionalIncludes )
     {
         List<String> combinedIncludes = new ArrayList<String>();
 
@@ -491,7 +492,7 @@ public abstract class AbstractSourceJarM
      * @return The combined list of excludes.
      */
 
-    private String[] getCombinedExcludes( List additionalExcludes )
+    private String[] getCombinedExcludes( List<String> additionalExcludes )
     {
         List<String> combinedExcludes = new ArrayList<String>();