You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/07/09 01:18:09 UTC

svn commit: r554471 - in /maven/plugins/trunk/maven-enforcer-plugin/src: it/pom.xml main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java

Author: brianf
Date: Sun Jul  8 16:18:09 2007
New Revision: 554471

URL: http://svn.apache.org/viewvc?view=rev&rev=554471
Log:
MENFORCER-8: additional fixes for new rules (needs dependencyResolution)

Modified:
    maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml
    maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
    maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java

Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml?view=diff&rev=554471&r1=554470&r2=554471
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Sun Jul  8 16:18:09 2007
@@ -4,6 +4,14 @@
 	<artifactId>maven-enforcer-plugin-it1</artifactId>
 	<version>1</version>
 	<packaging>pom</packaging>
+		  <dependencies>
+	    <dependency>
+		  <groupId>org.apache.maven.shared</groupId>
+		  <artifactId>maven-invoker</artifactId>
+		  <version>2.0.7-SNAPSHOT</version>
+		</dependency>
+	  </dependencies> 
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -34,9 +42,15 @@
 								<requireOS>
 									<family>!tandem</family>
 								</requireOS>
-								<evaluateBeanshell>
+								<!--<evaluateBeanshell>
 									<condition>rti.getApplicationVersion().getMajorVersion() == 2;</condition>
-								</evaluateBeanshell>
+								</evaluateBeanshell>-->
+								<noSnapshots/>
+								<bannedDependencies>
+								<excludes>
+								<exclude>org.apache.maven</exclude>
+								</excludes>
+								</bannedDependencies>
 							</rules>
 						</configuration>
 						<goals>

Modified: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java?view=diff&rev=554471&r1=554470&r2=554471
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java Sun Jul  8 16:18:09 2007
@@ -38,6 +38,7 @@
  * @goal enforce
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @phase validate
+ * @requiresDependencyResolution test
  * @version $Id$
  */
 public class EnforceMojo

Modified: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java?view=diff&rev=554471&r1=554470&r2=554471
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceOnceMojo.java Sun Jul  8 16:18:09 2007
@@ -27,6 +27,7 @@
  * @goal enforce-once
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @phase validate
+ * @requiresDependencyResolution test
  * @aggregator
  * @version $Id$
  */