Author: vsiveton
Date: Tue Dec 23 07:46:33 2008
New Revision: 729006
URL: http://svn.apache.org/viewvc?rev=729006&view=rev
Log:
o order pom
Modified:
maven/enforcer/trunk/enforcer-api/pom.xml
maven/enforcer/trunk/enforcer-rules/pom.xml
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=729006&r1=729005&r2=729006&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Tue Dec 23 07:46:33 2008
@@ -20,18 +20,34 @@
-->
<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>
+
<parent>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
<version>2-SNAPSHOT</version>
</parent>
+
<artifactId>enforcer-api</artifactId>
- <packaging>jar</packaging>
<version>1.0-alpha-5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>Enforcer API</name>
<description>
This component provides the generic interfaces needed to implement custom
rules for the maven-enforcer-plugin.
</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -76,15 +92,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- </dependency>
- </dependencies>
</project>
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=729006&r1=729005&r2=729006&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Dec 23 07:46:33 2008
@@ -20,59 +20,20 @@
-->
<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>
+
<parent>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
<version>2-SNAPSHOT</version>
</parent>
+
<artifactId>enforcer-rules</artifactId>
- <packaging>jar</packaging>
<version>1.0-alpha-5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>Enforcer Rules</name>
<description>This component contains the standard Enforcer
Rules</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- <goal>install</goal>
- <goal>test</goal>
- </goals>
- <configuration>
- <parallel>false</parallel>
- </configuration>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -121,4 +82,48 @@
<artifactId>easymock</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>shitty-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <parallel>false</parallel>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
+ </plugins>
+ </build>
</project>
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=729006&r1=729005&r2=729006&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Tue Dec 23 07:46:33 2008
@@ -20,26 +20,22 @@
-->
<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>
+
<parent>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
<version>2-SNAPSHOT</version>
</parent>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-5-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
+
<name>Maven Enforcer Plugin</name>
<description>The Loving Iron Fist of Maven</description>
- <version>1.0-alpha-5-SNAPSHOT</version>
<url>http://maven.apache.org/plugins/maven-enforcer-plugin/</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.codehaus.org/browse/MENFORCER</url>
- </issueManagement>
- <prerequisites>
- <!--because of the encoding fixes, I need a new plexus-utils. The new
plexus utils can only be used in 2.0.6 or later:
http://jira.codehaus.org/browse/MNG-2892 -->
- <maven>2.0.6</maven>
- </prerequisites>
+
<developers>
<developer>
<id>brianf</id>
@@ -51,19 +47,67 @@
<timezone>5</timezone>
</developer>
</developers>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+
+ <prerequisites>
+ <!--because of the encoding fixes, I need a new plexus-utils. The new
plexus utils can only be used in 2.0.6 or later:
http://jira.codehaus.org/browse/MNG-2892 -->
+ <maven>2.0.6</maven>
+ </prerequisites>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/MENFORCER</url>
+ </issueManagement>
<distributionManagement>
<site>
<id>apache.website</id>
<url>${site.deploy.url}/plugins/maven-enforcer-plugin</url>
</site>
</distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-rules</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-rules</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -111,56 +155,14 @@
</resource>
</resources>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-rules</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.enforcer</groupId>
- <artifactId>enforcer-rules</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- </dependency>
- </dependencies>
+
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${maven.plugin.plugin.version}</version>
- </plugin>
- </plugins>
- </reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven.plugin.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=729006&r1=729005&r2=729006&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Tue Dec 23 07:46:33 2008
@@ -19,34 +19,24 @@
-->
<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>
+
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>9</version>
+ <version>10</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
+ <version>2-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>Enforcer</name>
- <version>2-SNAPSHOT</version>
<description>Enforcer is a build rule execution framework.</description>
<url>http://maven.apache.org/enforcer</url>
- <prerequisites>
- <maven>2.0.6</maven>
- </prerequisites>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MENFORCER</url>
- </issueManagement>
<inceptionYear>2007</inceptionYear>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+
<developers>
<developer>
<id>brianf</id>
@@ -58,6 +48,7 @@
<timezone>5</timezone>
</developer>
</developers>
+
<mailingLists>
<mailingList>
<name>Maven User List</name>
@@ -130,11 +121,33 @@
</otherArchives>
</mailingList>
</mailingLists>
+
+ <prerequisites>
+ <maven>2.0.6</maven>
+ </prerequisites>
+
+ <modules>
+ <module>enforcer-api</module>
+ <module>enforcer-rules</module>
+ <module>maven-enforcer-plugin</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MENFORCER</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>${site.deploy.url}/enforcer/</url>
+ </site>
+ </distributionManagement>
+
<properties>
<api.version>1.0-alpha-4-SNAPSHOT</api.version>
<rules.version>1.0-alpha-4-SNAPSHOT</rules.version>
@@ -142,46 +155,7 @@
<maven.plugin.plugin.version>2.4.3</maven.plugin.plugin.version>
<site.deploy.url>scp://people.apache.org/www/maven.apache.org</site.deploy.url>
</properties>
- <build>
- <resources>
- <!-- Include super-pom defined main/resources
- Removing this section will break the build.
- Since we have defined a new build/resources
- section for the Apache process LICENSE and NOTICE
- files, this original default section is now
- required. -->
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${maven.plugin.plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/maven/enforcer/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>${site.deploy.url}/enforcer/</url>
- </site>
- </distributionManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -251,6 +225,42 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <build>
+ <resources>
+ <!-- Include super-pom defined main/resources
+ Removing this section will break the build.
+ Since we have defined a new build/resources
+ section for the Apache process LICENSE and NOTICE
+ files, this original default section is now
+ required. -->
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven.plugin.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/maven/enforcer/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<plugins>
<plugin>
@@ -279,9 +289,4 @@
</plugin>
</plugins>
</reporting>
- <modules>
- <module>enforcer-api</module>
- <module>enforcer-rules</module>
- <module>maven-enforcer-plugin</module>
- </modules>
</project>
