Author: dennisl
Date: Sat Oct 20 07:47:25 2007
New Revision: 586734
URL: http://svn.apache.org/viewvc?rev=586734&view=rev
Log:
o Apply the dependency cleanup from r580699, r580700, r580701, r580703,
r580705, r580706, r580707, r580708, r580709, r580710, r580711, r580712,
r580713, r580714, r580719, r580721 to the branch.
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml
Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml Sat Oct 20
07:47:25 2007
@@ -31,44 +31,61 @@
<description>A component to write books like user manuals and guides in any
format supported by Doxia.</description>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xdoc</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-apt</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-itext</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-latex</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-docbook-simple</artifactId>
<version>${projectVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml Sat Oct 20
07:47:25 2007
@@ -54,11 +54,6 @@
</build>
<dependencies>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
</dependency>
@@ -70,11 +65,5 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </dependency>
- -->
</dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml
(original)
+++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml Sat
Oct 20 07:47:25 2007
@@ -40,16 +40,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>doxia-book</artifactId>
<version>${projectVersion}</version>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml
Sat Oct 20 07:47:25 2007
@@ -52,4 +52,10 @@
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml
Sat Oct 20 07:47:25 2007
@@ -57,4 +57,10 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml
Sat Oct 20 07:47:25 2007
@@ -27,4 +27,10 @@
<artifactId>doxia-module-docbook-simple</artifactId>
<name>Doxia :: Docbook Simple Module</name>
<description>A Doxia module for Docbook source documents.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml
Sat Oct 20 07:47:25 2007
@@ -64,4 +64,10 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml
Sat Oct 20 07:47:25 2007
@@ -44,14 +44,13 @@
</developers>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>1.4</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.4-RC3</version>
</dependency>
</dependencies>
<build>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml
Sat Oct 20 07:47:25 2007
@@ -29,4 +29,10 @@
<artifactId>doxia-module-latex</artifactId>
<name>Doxia :: Latex Module</name>
<description>A Doxia module for LaTeX source documents.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml
Sat Oct 20 07:47:25 2007
@@ -31,6 +31,7 @@
<description>A Doxia module for Rich Text Format source
documents.</description>
<dependencies>
+ <!-- test -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-apt</artifactId>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml
Sat Oct 20 07:47:25 2007
@@ -52,4 +52,10 @@
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
---
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml
(original)
+++
maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml
Sat Oct 20 07:47:25 2007
@@ -29,4 +29,10 @@
<artifactId>doxia-module-xhtml</artifactId>
<name>Doxia :: XHTML Module</name>
<description>A Doxia module for Xhtml source documents.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml?rev=586734&r1=586733&r2=586734&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml
(original)
+++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml Sat Oct
20 07:47:25 2007
@@ -35,6 +35,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ </dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
