Author: olamy
Date: Wed Jun 13 20:13:49 2012
New Revision: 1349997
URL: http://svn.apache.org/viewvc?rev=1349997&view=rev
Log:
[MTOMCAT-160] "Skipping non-war project" should not happen if using
<addContextWarDependencies>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1349997&r1=1349996&r2=1349997&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Wed Jun 13 20:13:49 2012
@@ -378,7 +378,7 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( skip )
+ if ( skip && !addContextWarDependencies )
{
getLog().info( "skip execution" );
return;
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1349997&r1=1349996&r2=1349997&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Wed Jun 13 20:13:49 2012
@@ -412,7 +412,7 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( skip )
+ if ( skip && !addContextWarDependencies )
{
getLog().info( "skip execution" );
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
