You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/09/23 13:35:16 UTC
svn commit: r698144 - in /maven/doxia: doxia-sitetools/trunk/pom.xml
doxia-tools/trunk/pom.xml doxia/trunk/pom.xml site/pom.xml
Author: vsiveton
Date: Tue Sep 23 04:35:13 2008
New Revision: 698144
URL: http://svn.apache.org/viewvc?rev=698144&view=rev
Log:
o ordering poms
Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia-tools/trunk/pom.xml
maven/doxia/doxia/trunk/pom.xml
maven/doxia/site/pom.xml
Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=698144&r1=698143&r2=698144&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Tue Sep 23 04:35:13 2008
@@ -37,15 +37,7 @@
<name>Doxia Sitetools</name>
<description>Doxia Sitetools generates sites, consisting of static and dynamic content that was generated by Doxia.</description>
<url>http://maven.apache.org/doxia/doxia-sitetools</url>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <properties>
- <projectVersion>${project.version}</projectVersion>
- <doxiaVersion>1.0-beta-1-SNAPSHOT</doxiaVersion>
- </properties>
+ <inceptionYear>2005</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,34 +87,36 @@
</mailingList>
</mailingLists>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIASITETOOLS</url>
- </issueManagement>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <modules>
+ <module>doxia-decoration-model</module>
+ <module>doxia-doc-renderer</module>
+ <module>doxia-site-renderer</module>
+ </modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/DOXIASITETOOLS</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-sitetools</url>
+ </site>
+ </distributionManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <properties>
+ <projectVersion>${project.version}</projectVersion>
+ <doxiaVersion>1.0-beta-1-SNAPSHOT</doxiaVersion>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -190,7 +184,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -200,16 +193,21 @@
</dependency>
</dependencies>
- <modules>
- <module>doxia-decoration-model</module>
- <module>doxia-doc-renderer</module>
- <module>doxia-site-renderer</module>
- </modules>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-sitetools</url>
- </site>
- </distributionManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=698144&r1=698143&r2=698144&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Tue Sep 23 04:35:13 2008
@@ -37,11 +37,8 @@
<name>Doxia Tools</name>
<description>Set of generic tools.</description>
<url>http://maven.apache.org/doxia/doxia-tools</url>
-
- <properties>
- <projectVersion>${project.version}</projectVersion>
- </properties>
-
+ <inceptionYear>2005</inceptionYear>
+
<mailingLists>
<mailingList>
<name>Doxia Developer List</name>
@@ -90,48 +87,54 @@
</mailingList>
</mailingLists>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIA</url>
- </issueManagement>
+ <modules>
+ <module>doxia-linkcheck</module>
+ <module>doxia-converter</module>
+ </modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-tools/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/DOXIA</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools</url>
+ </site>
+ </distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <source>1.4</source>
- <aggregate>true</aggregate>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <reportSets>
- <reportSet>
- <id>html</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>test-html</id>
- <reports>
- <report>test-javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <properties>
+ <projectVersion>${project.version}</projectVersion>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Plexus -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-30</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -168,40 +171,35 @@
</pluginManagement>
</build>
- <dependencyManagement>
- <dependencies>
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-30</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>doxia-linkcheck</module>
- <module>doxia-converter</module>
- </modules>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools</url>
- </site>
- </distributionManagement>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <source>1.4</source>
+ <aggregate>true</aggregate>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <reportSets>
+ <reportSet>
+ <id>html</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>test-html</id>
+ <reports>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=698144&r1=698143&r2=698144&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Tue Sep 23 04:35:13 2008
@@ -37,15 +37,8 @@
<name>Doxia</name>
<description>Doxia is a content generation framework that provides powerful techniques for generating static and dynamic content, supporting a variety of markup languages.</description>
<url>http://maven.apache.org/doxia/doxia</url>
+ <inceptionYear>2005</inceptionYear>
- <prerequisites>
- <maven>2.0.6</maven>
- </prerequisites>
-
- <properties>
- <projectVersion>${project.version}</projectVersion>
- </properties>
-
<mailingLists>
<mailingList>
<name>Doxia Developer List</name>
@@ -94,77 +87,38 @@
</mailingList>
</mailingLists>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIA</url>
- </issueManagement>
+ <prerequisites>
+ <maven>2.0.6</maven>
+ </prerequisites>
+
+ <modules>
+ <module>doxia-logging-api</module>
+ <module>doxia-sink-api</module>
+ <module>doxia-core</module>
+ <module>doxia-modules</module>
+ <module>doxia-book</module>
+ <module>doxia-maven-plugin</module>
+ </modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/DOXIA</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia</url>
+ </site>
+ </distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <source>1.4</source>
- <aggregate>true</aggregate>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
-<!--
- <taglets>
- <taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </tagletArtifact>
- </taglet>
- <taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </tagletArtifact>
- </taglet>
- <taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </tagletArtifact>
- </taglet>
- </taglets>
--->
- <reportSets>
- <reportSet>
- <id>html</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>test-html</id>
- <reports>
- <report>test-javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <properties>
+ <projectVersion>${project.version}</projectVersion>
+ </properties>
<build>
<plugins>
@@ -237,7 +191,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -247,19 +200,64 @@
</dependency>
</dependencies>
- <modules>
- <module>doxia-logging-api</module>
- <module>doxia-sink-api</module>
- <module>doxia-core</module>
- <module>doxia-modules</module>
- <module>doxia-book</module>
- <module>doxia-maven-plugin</module>
- </modules>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia</url>
- </site>
- </distributionManagement>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <source>1.4</source>
+ <aggregate>true</aggregate>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+<!--
+ <taglets>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+-->
+ <reportSets>
+ <reportSet>
+ <id>html</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>test-html</id>
+ <reports>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/doxia/site/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=698144&r1=698143&r2=698144&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Tue Sep 23 04:35:13 2008
@@ -22,6 +22,7 @@
-->
<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</groupId>
@@ -30,32 +31,14 @@
<relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site</artifactId>
<packaging>pom</packaging>
+
<name>Doxia Site</name>
<description>Site of the Maven Doxia Framework</description>
- <inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/doxia</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIA</url>
- </issueManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/site/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/site/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/site/</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/doxia/</url>
- </site>
- </distributionManagement>
+ <inceptionYear>2005</inceptionYear>
<mailingLists>
<mailingList>
@@ -130,6 +113,30 @@
</mailingList>
</mailingLists>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/site/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/site/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/doxia/site/</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/DOXIA</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/doxia/</url>
+ </site>
+ </distributionManagement>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -227,12 +234,4 @@
-->
</plugins>
</reporting>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- </pluginRepositories>
</project>