Author: brianf
Date: Thu Nov 8 01:20:20 2007
New Revision: 593089
URL: http://svn.apache.org/viewvc?rev=593089&view=rev
Log:
aligned versions
Modified:
maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/enforcer-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=593089&r1=593088&r2=593089&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Nov 8 01:20:20 2007
@@ -28,7 +28,7 @@
<artifactId>enforcer-api</artifactId>
<packaging>jar</packaging>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Enforcer API</name>
<description>This component provides the generic interfaces needed to
implement custom rules for the maven-enforcer-plugin.</description>
@@ -58,18 +58,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java?rev=593089&r1=593088&r2=593089&view=diff
==============================================================================
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
Thu Nov 8 01:20:20 2007
@@ -19,14 +19,8 @@
* under the License.
*/
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-import org.apache.maven.enforcer.rule.api.EnforcerRule;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.Profile;
@@ -34,6 +28,9 @@
import org.apache.maven.profiles.activation.OperatingSystemProfileActivator;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
/**
* This rule checks that the OS is allowed by combinations
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=593089&r1=593088&r2=593089&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Nov 8 01:20:20 2007
@@ -29,7 +29,7 @@
<packaging>maven-plugin</packaging>
<name>Maven Enforcer Plugin</name>
<description>The Loving Iron Fist of Maven</description>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<issueManagement>
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MENFORCER</url>
@@ -123,11 +123,6 @@
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer-rules</artifactId>
<classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=593089&r1=593088&r2=593089&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Nov 8 01:20:20 2007
@@ -110,6 +110,11 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk</url>
</scm>
+ <properties>
+ <api.version>1.0-SNAPSHOT</api.version>
+ <rules.version>1.0-SNAPSHOT</rules.version>
+ <maven.version>2.0.6</maven.version>
+ </properties>
<build>
<resources>
<!-- Include super-pom defined main/resources
@@ -184,25 +189,42 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-api</artifactId>
+ <version>${api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-rules</artifactId>
+ <version>${rules.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-rules</artifactId>
+ <version>${rules.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.7</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.7</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.7</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.7</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -220,23 +242,6 @@
<artifactId>commons-lang</artifactId>
<version>2.3</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-api</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-rules</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-rules</artifactId>
- <version>1.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
