Author: brianf
Date: Sun Mar 18 16:53:37 2007
New Revision: 519743
URL: http://svn.apache.org/viewvc?view=rev&rev=519743
Log:
site
Added:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/LICENSE
maven/sandbox/trunk/plugins/maven-enforcer-plugin/NOTICE
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/pom.xml
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/OsMojo.java
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockRuntimeInformation.java
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
Added: maven/sandbox/trunk/plugins/maven-enforcer-plugin/LICENSE
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/LICENSE?view=auto&rev=519743
==============================================================================
--- maven/sandbox/trunk/plugins/maven-enforcer-plugin/LICENSE (added)
+++ maven/sandbox/trunk/plugins/maven-enforcer-plugin/LICENSE Sun Mar 18
16:53:37 2007
@@ -0,0 +1,378 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
\ No newline at end of file
Added: maven/sandbox/trunk/plugins/maven-enforcer-plugin/NOTICE
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/NOTICE?view=auto&rev=519743
==============================================================================
--- maven/sandbox/trunk/plugins/maven-enforcer-plugin/NOTICE (added)
+++ maven/sandbox/trunk/plugins/maven-enforcer-plugin/NOTICE Sun Mar 18
16:53:37 2007
@@ -0,0 +1,9 @@
+Maven Dependency Plugin
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software utilize the Plexus Container, API, and
+ Components. Copyright the Codehaus. The original software is
+ available from http://plexus.codehaus.org/
\ No newline at end of file
Modified: maven/sandbox/trunk/plugins/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/pom.xml?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
--- maven/sandbox/trunk/plugins/maven-enforcer-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-enforcer-plugin/pom.xml Sun Mar 18
16:53:37 2007
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>7</version>
+ <version>8</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
---
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
(original)
+++
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java
Sun Mar 18 16:53:37 2007
@@ -1,8 +1,23 @@
-/**
- *
- */
package org.apache.maven.plugin.enforcer;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
import java.util.Iterator;
import org.apache.maven.artifact.versioning.ArtifactVersion;
@@ -11,12 +26,11 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.StringUtils;
/**
- * @author brianf
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*
*/
public abstract class AbstractVersionEnforcer
@@ -44,8 +58,8 @@
VersionRange vr;
Log log = this.getLog();
String msg = "Detected " + variableName + " Version: " +
actualVersion;
-
- //stort circuit check if the strings are exactly equal
+
+ // stort circuit check if the strings are exactly equal
if ( actualVersion.toString().equals( requiredVersionRange ) )
{
log.info( msg + " is allowed in the range " +
requiredVersionRange + "." );
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
---
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java
Sun Mar 18 16:53:37 2007
@@ -28,11 +28,10 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.util.StringUtils;
/**
- * Goal which fails the build if the specified version isn't allowed.
+ * This goal checks for required versions of Maven and/or the JDK
*
* @goal enforce
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
@@ -42,7 +41,7 @@
extends AbstractVersionEnforcer
{
/**
- * Used to look up Artifacts in the remote repository.
+ * Runtime information containing Maven Version.
*
* @parameter
expression="${component.org.apache.maven.execution.RuntimeInformation}"
* @required
@@ -70,13 +69,13 @@
/**
* Specify the required Version of JDK. Some examples are
* <ul>
- * <li><code>2.0.4</code> Version 2.0.4</li>
- * <li><code>[2.0,2.1)</code> Versions 2.0 (included) to 2.1 (not
+ * <li><code>1.4.2</code> Version 1.4.2</li>
+ * <li><code>[1.4,1.5)</code> Versions 1.4 (included) to 1.5 (not
* included)</li>
- * <li><code>[2.0,2.1]</code> Versions 2.0 to 2.1 (both included)</li>
- * <li><code>[2.0.5,)</code> Versions 2.0.5 and higher</li>
- * <li><code>(,2.0.5],[2.1.1,)</code> Versions up to 2.0.5 (included) and
- * 2.1.1 or higher</li>
+ * <li><code>[1.4,1.5]</code> Versions 1.4 to 1.5 (both included)</li>
+ * <li><code>[1.4.2,)</code> Versions 1.4.2 and higher</li>
+ * <li><code>(,1.4.2],[1.5.0,)</code> Versions up to 1.4.2 (included) and
+ * 1.5.0 or higher</li>
* </ul>
*
* @parameter expression="${enforcer.jdk.version}" default-value=""
@@ -92,7 +91,6 @@
super();
}
-
public void execute()
throws MojoExecutionException
{
@@ -111,10 +109,10 @@
fixJDKVersion( SystemUtils.JAVA_VERSION_TRIMMED ) );
enforceVersion( "JDK", this.jdkVersion, detectedJdkVersion );
}
-
- if (!foundVersionToCheck)
+
+ if ( !foundVersionToCheck )
{
- throw new MojoExecutionException("There is no version range
specified to be checked.");
+ throw new MojoExecutionException( "There is no version range
specified to be checked." );
}
}
@@ -141,7 +139,6 @@
return StringUtils.stripEnd( version, "." );
}
-
/**
* @return the jdkVersion
*/
@@ -150,16 +147,15 @@
return this.jdkVersion;
}
-
/**
- * @param theJdkVersion the jdkVersion to set
+ * @param theJdkVersion
+ * the jdkVersion to set
*/
public void setJdkVersion( String theJdkVersion )
{
this.jdkVersion = theJdkVersion;
}
-
/**
* @return the mavenVersion
*/
@@ -168,16 +164,15 @@
return this.mavenVersion;
}
-
/**
- * @param theMavenVersion the mavenVersion to set
+ * @param theMavenVersion
+ * the mavenVersion to set
*/
public void setMavenVersion( String theMavenVersion )
{
this.mavenVersion = theMavenVersion;
}
-
/**
* @return the rti
*/
@@ -186,13 +181,13 @@
return this.rti;
}
-
/**
- * @param theRti the rti to set
+ * @param theRti
+ * the rti to set
*/
public void setRti( RuntimeInformation theRti )
{
this.rti = theRti;
}
-
+
}
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/OsMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/OsMojo.java?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
---
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/OsMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/OsMojo.java
Sun Mar 18 16:53:37 2007
@@ -19,24 +19,32 @@
* under the License.
*/
+import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
/**
* Goal which fails the build if the os isn't the correct version
- *
+ *
* @goal os
- * @author brian fox
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
* @phase process-sources
*/
public class OsMojo
extends AbstractMojo
{
-
+ /**
+ * Runtime information containing Maven Version.
+ *
+ * @parameter
expression="${component.org.apache.maven.execution.RuntimeInformation}"
+ * @required
+ * @readonly
+ */
+ protected RuntimeInformation rti;
public void execute()
throws MojoExecutionException
{
-
+
}
}
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockRuntimeInformation.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockRuntimeInformation.java?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
---
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockRuntimeInformation.java
(original)
+++
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockRuntimeInformation.java
Sun Mar 18 16:53:37 2007
@@ -1,15 +1,33 @@
-/**
- *
- */
package org.apache.maven.plugin.enforcer;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.RuntimeInformation;
/**
- * @author brianf
- *
+ * Just a mock object hard coded to return version 2.0.5
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ *
*/
public class MockRuntimeInformation
implements RuntimeInformation
@@ -17,7 +35,7 @@
public ArtifactVersion getApplicationVersion()
{
- return new DefaultArtifactVersion("2.0.5");
+ return new DefaultArtifactVersion( "2.0.5" );
}
}
Modified:
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java?view=diff&rev=519743&r1=519742&r2=519743
==============================================================================
---
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEnforceMojo.java
Sun Mar 18 16:53:37 2007
@@ -1,8 +1,26 @@
-/**
- *
- */
package org.apache.maven.plugin.enforcer;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -11,10 +29,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import junit.framework.TestCase;
-
/**
- * @author brianf
+ * Exhaustively check the enforcer mojo.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*
*/
public class TestEnforceMojo
@@ -137,46 +154,46 @@
}
}
}
-
+
public void testEnforceMojo()
{
EnforceMojo mojo = new EnforceMojo();
mojo.setFail( true );
mojo.setRti( new MockRuntimeInformation() );
-
+
try
{
mojo.execute();
- fail("Expected to receive exception because no required version
ranges are set.");
+ fail( "Expected to receive exception because no required version
ranges are set." );
}
catch ( MojoExecutionException e )
{
mojo.getLog().info( "Caught Expected Exception: " +
e.getLocalizedMessage() );
}
-
+
try
{
mojo.setMavenVersion( "2.0.6" );
mojo.execute();
- fail("Expected to receive exception because 2.0.5 does not contain
2.0.6");
+ fail( "Expected to receive exception because 2.0.5 does not
contain 2.0.6" );
}
catch ( MojoExecutionException e )
{
mojo.getLog().info( "Caught Expected Exception: " +
e.getLocalizedMessage() );
}
-
+
try
{
mojo.setMavenVersion( null );
- mojo.setJdkVersion( "("+EnforceMojo.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED) +",]");
+ mojo.setJdkVersion( "(" + EnforceMojo.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED ) + ",]" );
mojo.execute();
- fail("Expected to receive exception because I have set the
lowerbounds noninclusive.");
+ fail( "Expected to receive exception because I have set the
lowerbounds noninclusive." );
}
catch ( MojoExecutionException e )
{
mojo.getLog().info( "Caught Expected Exception: " +
e.getLocalizedMessage() );
}
-
+
try
{
mojo.setMavenVersion( null );
@@ -185,20 +202,20 @@
}
catch ( MojoExecutionException e )
{
- fail("Did not expect an exception.
Received:"+e.getLocalizedMessage());
+ fail( "Did not expect an exception. Received:" +
e.getLocalizedMessage() );
}
-
+
try
{
mojo.setFail( false );
mojo.setMavenVersion( null );
- mojo.setJdkVersion( "("+EnforceMojo.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED) +",]");
+ mojo.setJdkVersion( "(" + EnforceMojo.fixJDKVersion(
SystemUtils.JAVA_VERSION_TRIMMED ) + ",]" );
mojo.execute();
}
catch ( MojoExecutionException e )
{
- fail("Did not expect an exception.
Received:"+e.getLocalizedMessage());
+ fail( "Did not expect an exception. Received:" +
e.getLocalizedMessage() );
}
-
+
}
}
