o ordered POM following our conventions

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@685840 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 10:35:52 +00:00 · 2008-08-14 10:35:52 +00:00 · 4ae217c887
parent 7a4c3a9bd5
commit 4ae217c887
8 changed files with 131 additions and 124 deletions
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@ -18,29 +18,26 @@
  ~ 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>
    <groupId>org.apache.maven.plugins</groupId>
    <artifactId>maven-plugins</artifactId>
    <version>11</version>
  </parent>

-  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-plugin-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Maven Plugin Plugin</name>
  <version>2.4.3-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>

+  <name>Maven Plugin Plugin</name>
  <description>
    The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree,
    to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the
    plugin registry, the artifact metadata and a generic help goal.
  </description>

-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/</developerConnection>
@ -57,6 +54,16 @@
    </site>
  </distributionManagement>

+  <prerequisites>
+    <maven>2.0.6</maven>
+  </prerequisites>
+
+  <properties>
+    <doxiaVersion>1.0-alpha-10</doxiaVersion>
+    <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
+    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
+  </properties>
+
  <!-- Copy from project up -->
  <dependencyManagement>
    <dependencies>
@ -96,12 +103,6 @@
    </dependencies>
  </dependencyManagement>

-  <properties>
-    <doxiaVersion>1.0-alpha-10</doxiaVersion>
-    <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
-    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
-  </properties>
-
  <dependencies>
    <!-- doxia -->
    <dependency>
@ -285,6 +286,7 @@
              <onlyCurrentVersion>true</onlyCurrentVersion>
              <resolutionIds>Closed</resolutionIds>
              <sortColumnNames>Type,Key</sortColumnNames>
+              <component>13021</component>
            </configuration>
            <reportSets>
              <reportSet>
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@ -29,9 +29,16 @@
  </parent>

  <artifactId>maven-plugin-tools-ant</artifactId>
+
  <name>Maven Plugin Tool for Ant</name>
  <description>Descriptor extractor for plugins written in Ant.</description>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/</url>
+  </scm>
+
  <dependencies>
    <!-- maven -->
    <dependency>
@ -53,10 +60,4 @@
      <artifactId>plexus-utils</artifactId>
    </dependency>
  </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/</url>
-  </scm>
 </project>
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@ -29,9 +29,16 @@
  </parent>

  <artifactId>maven-plugin-tools-api</artifactId>
+
  <name>Maven Plugin Tools APIs</name>
  <description>The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins.</description>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/</url>
+  </scm>
+
  <dependencies>
    <!-- maven -->
    <dependency>
@ -102,12 +109,6 @@
    </dependency>
  </dependencies>

-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/</url>
-  </scm>
-
  <profiles>
    <profile>
      <id>reporting</id>
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@ -29,9 +29,16 @@
  </parent>

  <artifactId>maven-plugin-tools-beanshell</artifactId>
+
  <name>Maven Plugin Tool for Beanshell</name>
  <description>Descriptor extractor for plugins written in Beanshell.</description>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</url>
+  </scm>
+
  <dependencies>
    <!-- maven -->
    <dependency>
@ -50,10 +57,4 @@
      <version>1.3.0</version>
    </dependency>
  </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</url>
-  </scm>
 </project>
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@ -29,9 +29,16 @@
  </parent>

  <artifactId>maven-plugin-tools-java</artifactId>
+
  <name>Maven Plugin Tool for Java</name>
  <description>Descriptor extractor for plugins written in Java.</description>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/</url>
+  </scm>
+
  <dependencies>
    <!-- maven -->
    <dependency>
@ -70,10 +77,4 @@
      <version>1.6.3</version>
    </dependency>
  </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/</url>
-  </scm>
 </project>
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@ -29,9 +29,17 @@
  </parent>

  <artifactId>maven-plugin-tools-javadoc</artifactId>
+
  <name>Maven Plugin Tools Javadoc</name>
+  <description>The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc.</description>
  <inceptionYear>2008</inceptionYear>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</url>
+  </scm>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven.plugin-tools</groupId>
@ -168,10 +176,4 @@
      </build>
   </profile>
 </profiles>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</url>
-  </scm>
 </project>
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@ -29,8 +29,33 @@
  </parent>

  <artifactId>maven-plugin-tools-model</artifactId>
+
  <name>Maven Plugin Metadata Model</name>
-  <description>The Maven Plugin Metadata Model provides an API to play with the Metadat model.</description>
+  <description>The Maven Plugin Metadata Model provides an API to play with the Metadata model.</description>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/</url>
+  </scm>
+
+  <dependencies>
+    <!-- maven -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-descriptor</artifactId>
+    </dependency>
+
+    <!-- plexus -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>

  <build>
    <plugins>
@ -49,7 +74,7 @@
            <id>site-docs</id>
            <phase>pre-site</phase>
            <goals>
-              <goal>xsd</goal>
+              <goal>xdoc</goal>
            </goals>
          </execution>
          <execution>
@ -74,28 +99,4 @@
      </plugin>
    </plugins>
  </build>
-
-  <dependencies>
-    <!-- maven -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
-    </dependency>
-
-    <!-- plexus -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/</url>
-  </scm>
 </project>
--- a/pom.xml
+++ b/pom.xml
@ -39,21 +39,6 @@
  <url>http://maven.apache.org/plugin-tools/</url>
  <inceptionYear>2004</inceptionYear>

-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MPLUGIN</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk</url>
-  </scm>
-
  <mailingLists>
    <mailingList>
      <name>Maven User List</name>
@ -128,42 +113,9 @@
    </mailingList>
  </mailingLists>

-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/plugin-tools/</url>
-    </site>
-  </distributionManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-7</version>
-          <configuration>
-            <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version}</stagingSiteURL>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/plugin-tools/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+  <prerequisites>
+    <maven>2.0.6</maven>
+  </prerequisites>

  <modules>
    <module>maven-plugin-tools-api</module>
@ -175,6 +127,27 @@
    <module>maven-plugin-tools-javadoc</module>
  </modules>

+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk</url>
+  </scm>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.codehaus.org/browse/MPLUGIN</url>
+  </issueManagement>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scp://people.apache.org/www/maven.apache.org/plugin-tools/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
+    <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
+  </properties>
+
  <dependencyManagement>
    <dependencies>
      <!-- maven -->
@ -235,8 +208,33 @@
    </dependency>
  </dependencies>

-  <properties>
-    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
-    <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
-  </properties>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-7</version>
+          <configuration>
+            <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version}</stagingSiteURL>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/plugin-tools/tags</tagBase>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>