svn commit: r1364537 - in /axis/axis2/java/core/branches/1_6: ./ modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/ modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/

[sagara]

Author: sagara
Date: Mon Jul 23 07:58:46 2012
New Revision: 1364537

URL: http://svn.apache.org/viewvc?rev=1364537&view=rev
Log:
 Merged r1364536  to 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
    
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk:r1360573,1362377,1364536

Modified: 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1364537&r1=1364536&r2=1364537&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 Mon Jul 23 07:58:46 2012
@@ -177,7 +177,7 @@ public abstract class AbstractAarMojo
                     // TODO: utilise appropriate methods from project builder
                     ScopeArtifactFilter filter = new ScopeArtifactFilter(
                             Artifact.SCOPE_RUNTIME);
-                    if (!artifact.isOptional() && filter.include(artifact)) {
+                    if (filter.include(artifact)) {
                         String type = artifact.getType();
                         if ("jar".equals(type)) {
                             copyFileIfModified(artifact.getFile(), new File(

Modified: 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1364537&r1=1364536&r2=1364537&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 Mon Jul 23 07:58:46 2012
@@ -156,7 +156,7 @@ public abstract class AbstractMarMojo
     
                        // TODO: utilise appropriate methods from project 
builder
                        ScopeArtifactFilter filter = new ScopeArtifactFilter( 
Artifact.SCOPE_RUNTIME );
-                       if ( !artifact.isOptional() && filter.include( artifact 
) )
+                       if (filter.include( artifact ) )
                        {
                                String type = artifact.getType();
                                if ( "jar".equals( type ) )