Author: bentmann Date: Thu Aug 14 08:22:16 2008 New Revision: 685941 URL: http://svn.apache.org/viewvc?rev=685941&view=rev Log: o Reordered POM
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml maven/plugins/trunk/maven-deploy-plugin/pom.xml maven/plugins/trunk/maven-gpg-plugin/pom.xml maven/plugins/trunk/maven-idea-plugin/pom.xml maven/plugins/trunk/maven-jar-plugin/pom.xml maven/plugins/trunk/maven-repository-plugin/pom.xml maven/plugins/trunk/maven-shade-plugin/pom.xml maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -18,23 +18,19 @@ under the License. --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-changes-plugin</artifactId> + <version>2.1-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven Changes Report Plugin</name> - <version>2.1-SNAPSHOT</version> - <prerequisites> - <maven>2.0.6</maven> - </prerequisites> - <issueManagement> - <system>jira</system> - <url>http://jira.codehaus.org/browse/MCHANGES</url> - </issueManagement> <developers> <developer> @@ -53,86 +49,30 @@ <email>[EMAIL PROTECTED]</email> </developer> </developers> - <contributors> <contributor> <name>Justin Edelson</name> </contributor> </contributors> + <prerequisites> + <maven>2.0.6</maven> + </prerequisites> + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/</url> </scm> + <issueManagement> + <system>jira</system> + <url>http://jira.codehaus.org/browse/MCHANGES</url> + </issueManagement> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.modello</groupId> - <artifactId>modello-maven-plugin</artifactId> - <executions> - <execution> - <id>site-docs</id> - <phase>pre-site</phase> - <goals> - <goal>xdoc</goal> - <goal>xsd</goal> - </goals> - </execution> - <execution> - <id>standard</id> - <goals> - <goal>java</goal> - <goal>xpp3-reader</goal> - <goal>xpp3-writer</goal> - </goals> - </execution> - <execution> - <id>generate-xsd</id> - <phase>generate-resources</phase> - <goals> - <goal>xsd</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}/META-INF/changes/xsd</outputDirectory> - </configuration> - </execution> - </executions> - <configuration> - <version>1.0.0</version> - <models> - <model>src/main/mdo/changes.mdo</model> - </models> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <executions> - <execution> - <id>create-component-descriptor</id> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - <execution> - <id>merge</id> - <configuration> - <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> - <descriptors> - <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor> - </descriptors> - </configuration> - <phase>generate-resources</phase> - <goals> - <goal>merge-descriptors</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <properties> + <doxiaVersion>1.0-alpha-11</doxiaVersion> + <doxiaSitetoolsVersion>1.0-alpha-11</doxiaSitetoolsVersion> + </properties> <dependencies> <!-- maven --> @@ -315,6 +255,98 @@ </dependency> </dependencies> + + <!-- remove when modello is released --> + <pluginRepositories> + <pluginRepository> + <id>snapshots.codehaus</id> + <url>http://snapshots.repository.codehaus.org/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>apache.snapshots</id> + <url>http://people.apache.org/repo/m2-snapshot-repository/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <executions> + <execution> + <id>site-docs</id> + <phase>pre-site</phase> + <goals> + <goal>xdoc</goal> + <goal>xsd</goal> + </goals> + </execution> + <execution> + <id>standard</id> + <goals> + <goal>java</goal> + <goal>xpp3-reader</goal> + <goal>xpp3-writer</goal> + </goals> + </execution> + <execution> + <id>generate-xsd</id> + <phase>generate-resources</phase> + <goals> + <goal>xsd</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}/META-INF/changes/xsd</outputDirectory> + </configuration> + </execution> + </executions> + <configuration> + <version>1.0.0</version> + <models> + <model>src/main/mdo/changes.mdo</model> + </models> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <executions> + <execution> + <id>create-component-descriptor</id> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + <execution> + <id>merge</id> + <configuration> + <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> + <descriptors> + <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor> + </descriptors> + </configuration> + <phase>generate-resources</phase> + <goals> + <goal>merge-descriptors</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> <reporting> <plugins> @@ -382,33 +414,4 @@ </profile> </profiles> - <properties> - <doxiaVersion>1.0-alpha-11</doxiaVersion> - <doxiaSitetoolsVersion>1.0-alpha-11</doxiaSitetoolsVersion> - </properties> - - <!-- remove when modello is released --> - <pluginRepositories> - <pluginRepository> - <id>snapshots.codehaus</id> - <url>http://snapshots.repository.codehaus.org/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>apache.snapshots</id> - <url>http://people.apache.org/repo/m2-snapshot-repository/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </project> Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -18,30 +18,34 @@ under the License. --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven Deploy Plugin</name> - <version>2.5-SNAPSHOT</version> <inceptionYear>2004</inceptionYear> + <prerequisites> <maven>2.0.6</maven> </prerequisites> - <issueManagement> - <system>JIRA</system> - <url>http://jira.codehaus.org/browse/MDEPLOY</url> - </issueManagement> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://jira.codehaus.org/browse/MDEPLOY</url> + </issueManagement> <dependencies> <dependency> @@ -81,6 +85,7 @@ <scope>test</scope> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -89,6 +94,7 @@ </plugin> </plugins> </build> + <profiles> <profile> <id>run-its</id> Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -18,29 +18,33 @@ under the License. --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-gpg-plugin</artifactId> - <packaging>maven-plugin</packaging> <version>1.0-alpha-5-SNAPSHOT</version> + <packaging>maven-plugin</packaging> + <name>Maven GPG Plugin</name> + <prerequisites> <maven>2.0.6</maven> </prerequisites> - <issueManagement> - <system>jira</system> - <url>http://jira.codehaus.org/browse/MGPG</url> - </issueManagement> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-gpg-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-gpg-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/</url> </scm> + <issueManagement> + <system>jira</system> + <url>http://jira.codehaus.org/browse/MGPG</url> + </issueManagement> <dependencies> <dependency> Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -19,31 +19,33 @@ --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-idea-plugin</artifactId> + <version>2.3-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven IDEA Plugin</name> - <version>2.3-SNAPSHOT</version> <prerequisites> <maven>2.0.1</maven> </prerequisites> - <issueManagement> - <system>JIRA</system> - <url>http://jira.codehaus.org/browse/MIDEA</url> - </issueManagement> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://jira.codehaus.org/browse/MIDEA</url> + </issueManagement> <dependencies> <dependency> @@ -105,6 +107,15 @@ </dependency> </dependencies> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.1</version> + </plugin> + </plugins> + </reporting> + <profiles> <profile> <id>reporting</id> @@ -331,13 +342,4 @@ </build> </profile> </profiles> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1</version> - </plugin> - </plugins> - </reporting> </project> \ No newline at end of file Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-jar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jar-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -18,30 +18,20 @@ under the License. --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven Jar Plugin</name> - <version>2.3-SNAPSHOT</version> - <prerequisites> - <maven>2.0.6</maven> - </prerequisites> - <issueManagement> - <system>JIRA</system> - <url>http://jira.codehaus.org/browse/MJAR</url> - </issueManagement> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin/</developerConnection> - <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/</url> - </scm> - + <contributors> <contributor> <name>Jerome Lacoste</name> @@ -55,6 +45,20 @@ </contributor> </contributors> + <prerequisites> + <maven>2.0.6</maven> + </prerequisites> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin/</developerConnection> + <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>http://jira.codehaus.org/browse/MJAR</url> + </issueManagement> + <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -119,6 +123,19 @@ </dependency> </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <profiles> <profile> <id>run-its</id> @@ -154,16 +171,4 @@ </build> </profile> </profiles> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - </plugins> - </reporting> </project> Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -18,32 +18,34 @@ under the License. --> <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-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>12-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-repository-plugin</artifactId> + <version>2.2-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven Repository Plugin</name> - <version>2.2-SNAPSHOT</version> <prerequisites> <maven>2.0.6</maven> </prerequisites> - <issueManagement> - <system>JIRA</system> - <url>http://jira.codehaus.org/browse/MREPOSITORY</url> - </issueManagement> - <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://jira.codehaus.org/browse/MREPOSITORY</url> + </issueManagement> <dependencies> <dependency> Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -29,22 +29,26 @@ <artifactId>maven-shade-plugin</artifactId> <version>1.2-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven Shade Plugin</name> - <issueManagement> - <system>jira</system> - <url>http://jira.codehaus.org/browse/MSHADE</url> - </issueManagement> + <prerequisites> + <maven>2.0.6</maven> + </prerequisites> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin</url> </scm> + <issueManagement> + <system>jira</system> + <url>http://jira.codehaus.org/browse/MSHADE</url> + </issueManagement> - <prerequisites> - <maven>2.0.6</maven> - </prerequisites> + <properties> + <currentVersion>${project.version}</currentVersion> + </properties> <dependencies> <!-- Maven --> @@ -122,10 +126,6 @@ </plugins> </build> - <properties> - <currentVersion>${project.version}</currentVersion> - </properties> - <profiles> <profile> <id>run-its</id> Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=685941&r1=685940&r2=685941&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu Aug 14 08:22:16 2008 @@ -19,30 +19,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> <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> <version>11</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1-SNAPSHOT</version> <packaging>maven-plugin</packaging> + <name>Maven War Plugin</name> - <version>2.1-beta-1-SNAPSHOT</version> + + <prerequisites> + <maven>2.0.6</maven> + </prerequisites> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/</url> </scm> - - <prerequisites> - <maven>2.0.6</maven> - </prerequisites> <issueManagement> <system>JIRA</system> <url>http://jira.codehaus.org/browse/MWAR</url> </issueManagement> + <dependencies> <dependency> <groupId>org.apache.maven</groupId>