Author: brianf
Date: Mon Apr 2 19:16:48 2007
New Revision: 524999
URL: http://svn.apache.org/viewvc?view=rev&rev=524999
Log:
updated site...fixed test error
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/site/apt/rules/index.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/site.xml
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.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=524999&r1=524998&r2=524999
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Mon Apr 2
19:16:48 2007
@@ -1,33 +1,43 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin-it1</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin-it1</artifactId>
<version>1</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <configuration>
- <rules>
- <requireJavaVersion>
-
<version>[1.3,1.6]</version>
- </requireJavaVersion>
- <requireMavenVersion>
-
<version>2.0.6</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>your.group</groupId>
+
<artifactId>custom-rule</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <configuration>
+ <rules>
+
<requireJavaVersion>
+
<version>[1.3,1.6]</version>
+
</requireJavaVersion>
+
<requireMavenVersion>
+
<version>2.0.6</version>
+
</requireMavenVersion>
+ <myCustomRule
implementation="org.apache.maven.shared.rule.myCustomRule">
+
<shouldIfail>false</shouldIfail>
+ </myCustomRule>
+ </rules>
+ </configuration>
+ <goals>
+
<goal>enforce-once</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=524999&r1=524998&r2=524999
==============================================================================
---
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
Mon Apr 2 19:16:48 2007
@@ -254,4 +254,52 @@
{
this.failFast = theFailFast;
}
+
+ /**
+ * @return the project
+ */
+ public MavenProject getProject()
+ {
+ return this.project;
+ }
+
+ /**
+ * @param theProject the project to set
+ */
+ public void setProject( MavenProject theProject )
+ {
+ this.project = theProject;
+ }
+
+ /**
+ * @return the session
+ */
+ public MavenSession getSession()
+ {
+ return this.session;
+ }
+
+ /**
+ * @param theSession the session to set
+ */
+ public void setSession( MavenSession theSession )
+ {
+ this.session = theSession;
+ }
+
+ /**
+ * @return the translator
+ */
+ public PathTranslator getTranslator()
+ {
+ return this.translator;
+ }
+
+ /**
+ * @param theTranslator the translator to set
+ */
+ public void setTranslator( PathTranslator theTranslator )
+ {
+ this.translator = theTranslator;
+ }
}
Modified: maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/index.apt?view=diff&rev=524999&r1=524998&r2=524999
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/index.apt
(original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/index.apt Mon
Apr 2 19:16:48 2007
@@ -31,4 +31,6 @@
* {{{requireJavaVersion.html}requireJavaVersion}} - enforces the JDK
version.
- * {{{requireJavaVersion.html}requireOS}} - enforces the OS / CPU
Archictecture.
\ No newline at end of file
+ * {{{requireJavaVersion.html}requireOS}} - enforces the OS / CPU
Archictecture.
+
+ You may also create and inject your own custom rules by following the
{{{http://maven.apache.org/shared/maven-enforcer-rule-api/writing-a-custom-rule.html}maven-enforcer-rule-api}}
instructions.
\ No newline at end of file
Modified: maven/plugins/trunk/maven-enforcer-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/site/site.xml?view=diff&rev=524999&r1=524998&r2=524999
==============================================================================
--- maven/plugins/trunk/maven-enforcer-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/site/site.xml Mon Apr 2
19:16:48 2007
@@ -34,6 +34,9 @@
<item name="RequireOS" href="rules/requireOS.html"/>
<item name="Version Range Specification"
href="rules/versionRanges.html"/>
</menu>
+ <menu name="Custom Rules">
+ <item name="Writing a custom rule"
href="http://maven.apache.org/shared/maven-enforcer-rule-api/writing-a-custom-rule.html"/>
+ </menu>
<menu name="Resources">
<item name="Maven 2.0.x Version Range Syntax"
href="http://docs.codehaus.org/display/MAVEN/Dependency+Mediation+and+Conflict+Resolution#DependencyMediationandConflictResolution-DependencyVersionRanges";
/>
</menu>
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java?view=diff&rev=524999&r1=524998&r2=524999
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
Mon Apr 2 19:16:48 2007
@@ -20,6 +20,7 @@
*/
import java.util.Date;
+import java.util.Properties;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.logging.SystemStreamLog;
@@ -34,7 +35,7 @@
{
public static MavenSession getMavenSession()
{
- return new MavenSession( new MockPlexusContainer(), null, null, null,
null, null, null, null, new Date() );
+ return new MavenSession( new MockPlexusContainer(), null, null, null,
null, null, null, new Properties(), new Date() );
}
public static EnforcerRuleHelper getHelper()
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java?view=diff&rev=524999&r1=524998&r2=524999
==============================================================================
---
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
Mon Apr 2 19:16:48 2007
@@ -38,6 +38,8 @@
{
EnforceMojo mojo = new EnforceMojo();
mojo.setFail( false );
+ mojo.setSession( EnforcerTestUtils.getMavenSession() );
+ mojo.setProject( new MockProject() );
try
{
