svn commit: r1717056 - in /maven/plugins/trunk/maven-source-plugin/src: main/java/org/apache/maven/plugins/source/ test/java/org/apache/maven/plugins/source/

[kh...@apache.org]

Author: khmarbaise
Date: Sun Nov 29 12:31:48 2015
New Revision: 1717056

URL: http://svn.apache.org/viewvc?rev=1717056&view=rev
Log:
Made attribute private. Access only via getter/setter.

Modified:
    maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
    maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
    maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.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=1717056&r1=1717055&r2=1717056&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 Sun Nov 29 12:31:48 2015
@@ -86,7 +86,7 @@ public abstract class AbstractSourceJarM
      * The Maven Project Object
      */
     @Parameter( defaultValue = "${project}", readonly = true, required = true )
-    protected MavenProject project;
+    private MavenProject project;
 
     /**
      * The Jar archiver.
@@ -453,7 +453,7 @@ public abstract class AbstractSourceJarM
      * @param archiver {@link Archiver}
      * @param sourceDirectory {@link File}
      * @param prefix The prefix.
-     * @param pIncludes the includes. 
+     * @param pIncludes the includes.
      * @param pExcludes the excludes.
      * @throws MojoExecutionException in case of an error.
      */
@@ -565,4 +565,20 @@ public abstract class AbstractSourceJarM
 
         return combinedExcludes.toArray( new String[combinedExcludes.size()] );
     }
+
+    /**
+     * @return The current project.
+     */
+    protected MavenProject getProject()
+    {
+        return project;
+    }
+
+    /**
+     * @param project {@link MavenProject}
+     */
+    protected void setProject( MavenProject project )
+    {
+        this.project = project;
+    }
 }

Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java?rev=1717056&r1=1717055&r2=1717056&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java Sun Nov 29 12:31:48 2015
@@ -41,7 +41,7 @@ public class AggregatorSourceJarMojo
     public void execute()
         throws MojoExecutionException
     {
-        if ( "pom".equals( project.getPackaging() ) )
+        if ( "pom".equals( getProject().getPackaging() ) )
         {
             packageSources( reactorProjects );
         }

Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java?rev=1717056&r1=1717055&r2=1717056&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java Sun Nov 29 12:31:48 2015
@@ -56,7 +56,7 @@ public abstract class AbstractSourcePlug
         AbstractSourceJarMojo mojo = (AbstractSourceJarMojo) lookupMojo( getGoal(), testPom );
 
         //Without the following line the tests will fail, cause the project.getFile() will result with null.
-        mojo.project.setFile( testPom );
+        mojo.getProject().setFile( testPom );
 
         setVariableValueToObject( mojo, "classifier", classifier );