You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/05/12 15:03:44 UTC

svn commit: r1481546 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency: ./ fromConfiguration/ fromDependencies/

Author: hboutemy
Date: Sun May 12 13:03:44 2013
New Revision: 1481546

URL: http://svn.apache.org/r1481546
Log:
[MDEP-413] hide useJvmChmod and ingorePermissions from goals not using it: resolver goals, copy*, build-classpath

Modified:
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1481546&r1=1481545&r2=1481546&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Sun May 12 13:03:44 2013
@@ -123,7 +123,7 @@ public abstract class AbstractDependency
     /**
      * Contains the full list of projects in the reactor.
      */
-    @Parameter( defaultValue = "${reactorProjects}" )
+    @Parameter( defaultValue = "${reactorProjects}", readonly = true )
     protected List<MavenProject> reactorProjects;
 
     /**
@@ -282,7 +282,7 @@ public abstract class AbstractDependency
 
             unArchiver.setUseJvmChmod( useJvmChmod );
 
-            unArchiver.setIgnorePermissions( this.ignorePermissions );
+            unArchiver.setIgnorePermissions( ignorePermissions );
 
             unArchiver.setSourceFile( file );
 

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java?rev=1481546&r1=1481545&r2=1481546&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java Sun May 12 13:03:44 2013
@@ -92,6 +92,18 @@ public abstract class AbstractResolveMoj
     @Parameter( property = "excludeReactor", defaultValue = "true" )
     protected boolean excludeReactor;
 
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.useJvmChmod", defaultValue = "true", readonly = true )
+    protected boolean useJvmChmod = true;
+
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.ignorePermissions", defaultValue = "false", readonly = true )
+    protected boolean ignorePermissions;
+
     protected FilterArtifacts getPluginArtifactsFilter()
     {
         if ( excludeReactor )

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java?rev=1481546&r1=1481545&r2=1481546&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java Sun May 12 13:03:44 2013
@@ -169,6 +169,18 @@ public class BuildClasspathMojo
     @Component
     private MavenProjectHelper projectHelper;
 
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.useJvmChmod", defaultValue = "true", readonly = true )
+    protected boolean useJvmChmod = true;
+
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.ignorePermissions", defaultValue = "false", readonly = true )
+    protected boolean ignorePermissions;
+
     boolean isFileSepSet = true;
 
     boolean isPathSepSet = true;

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?rev=1481546&r1=1481545&r2=1481546&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java Sun May 12 13:03:44 2013
@@ -77,6 +77,18 @@ public class CopyMojo
     private String artifact;
 
     /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.useJvmChmod", defaultValue = "true", readonly = true )
+    protected boolean useJvmChmod = true;
+
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.ignorePermissions", defaultValue = "false", readonly = true )
+    protected boolean ignorePermissions;
+
+    /**
      * Main entry into mojo. This method gets the ArtifactItems and iterates through each one passing it to
      * copyArtifact.
      *

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java?rev=1481546&r1=1481545&r2=1481546&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java Sun May 12 13:03:44 2013
@@ -97,6 +97,18 @@ public class CopyDependenciesMojo
     protected boolean addParentPoms;
 
     /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.useJvmChmod", defaultValue = "true", readonly = true )
+    protected boolean useJvmChmod = true;
+
+    /**
+     * hide property defined in parent class, since it is specific to unpack but doesn't have any meaning in copy
+     */
+    @Parameter( property = "dependency.ignorePermissions", defaultValue = "false", readonly = true )
+    protected boolean ignorePermissions;
+
+    /**
      * Main entry into mojo. Gets the list of dependencies and iterates through
      * calling copyArtifact.
      *