Author: vsiveton
Date: Mon Dec 15 16:17:19 2008
New Revision: 726889
URL: http://svn.apache.org/viewvc?rev=726889&view=rev
Log:
o reordering poms
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml?rev=726889&r1=726888&r2=726889&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
(original)
+++
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
Mon Dec 15 16:17:19 2008
@@ -21,15 +21,25 @@
<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>doxia-sitetools</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>doxia-decoration-model</artifactId>
<name>Doxia Decoration Model</name>
<description>The Decoration Model handles the site descriptor, also known as
site.xml.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -78,10 +88,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml?rev=726889&r1=726888&r2=726889&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
(original)
+++
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
Mon Dec 15 16:17:19 2008
@@ -21,37 +21,18 @@
<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>doxia-sitetools</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>doxia-doc-renderer</artifactId>
<name>Doxia Document Renderer Component</name>
<description>The Document Renderer handles the rendering of documents, in
formats like PDF and RTF.</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <version>1.0.0</version>
- <model>src/main/mdo/document.mdo</model>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<developers>
<developer>
<id>vsiveton</id>
@@ -64,6 +45,7 @@
<timezone>-5</timezone>
</developer>
</developers>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -115,4 +97,27 @@
<artifactId>doxia-module-xhtml</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xpp3-writer</goal>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xsd</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/document.mdo</model>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml?rev=726889&r1=726888&r2=726889&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
(original)
+++
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
Mon Dec 15 16:17:19 2008
@@ -21,15 +21,18 @@
<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>doxia-sitetools</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>doxia-site-renderer</artifactId>
<name>Doxia Site Renderer Component</name>
<description>The Site Renderer handles the rendering of sites.</description>
+
<contributors>
<contributor>
<name>Vincent Siveton</name>
@@ -41,6 +44,7 @@
<timezone>-5</timezone>
</contributor>
</contributors>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml?rev=726889&r1=726888&r2=726889&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml
(original)
+++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/pom.xml Mon Dec
15 16:17:19 2008
@@ -21,6 +21,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>
<artifactId>maven-parent</artifactId>
@@ -37,11 +38,6 @@
<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>
- <properties>
- <projectVersion>${project.version}</projectVersion>
- <doxiaVersion>1.0-SNAPSHOT</doxiaVersion>
- </properties>
-
<mailingLists>
<mailingList>
<name>Doxia Developer List</name>
@@ -90,45 +86,32 @@
</mailingList>
</mailingLists>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIASITETOOLS</url>
- </issueManagement>
+ <modules>
+ <module>doxia-decoration-model</module>
+ <module>doxia-doc-renderer</module>
+ <module>doxia-site-renderer</module>
+ </modules>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/</developerConnection>
<url>https://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/</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-javadoc-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-4</version>
- <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>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-17</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <properties>
+ <projectVersion>${project.version}</projectVersion>
+ <doxiaVersion>1.0-SNAPSHOT</doxiaVersion>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -191,7 +174,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -201,16 +183,32 @@
</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-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-4</version>
+ <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>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-17</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
