Author: dennisl
Date: Sat Feb 7 23:33:05 2009
New Revision: 741980
URL: http://svn.apache.org/viewvc?rev=741980&view=rev
Log:
o Merge of r725783 from trunk again. The javadoc plugin failure had nothing to
do with this change.
Modified:
maven/doxia/doxia/branches/doxia-1.0.x/ (props changed)
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
Propchange: maven/doxia/doxia/branches/doxia-1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 7 23:33:05 2009
@@ -1 +1 @@
-/maven/doxia/doxia/trunk:709883
+/maven/doxia/doxia/trunk:709883,725783
Modified: maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml?rev=741980&r1=741979&r2=741980&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml Sat Feb 7
23:33:05 2009
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
- <classifier>tests</classifier>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/pom.xml?rev=741980&r1=741979&r2=741980&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0.x/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/pom.xml Sat Feb 7 23:33:05 2009
@@ -131,7 +131,7 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>${projectVersion}</version>
- <classifier>tests</classifier>
+ <type>test-jar</type>
</dependency>
<!-- Plexus -->
<dependency>
