You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/01/22 14:30:59 UTC
svn commit: r498611 - in /maven/components/trunk: maven-model/
maven-model/src/main/ maven-model/src/main/mdo/ maven-settings/
maven-settings/src/main/mdo/
Author: vsiveton
Date: Mon Jan 22 05:30:58 2007
New Revision: 498611
URL: http://svn.apache.org/viewvc?view=rev&rev=498611
Log:
MNG-967: maven.mdo, settings.mdo, and generated-sources
Merged from: r498608 (maven-2.0.x)
Added:
maven/components/trunk/maven-model/src/main/
maven/components/trunk/maven-model/src/main/mdo/
maven/components/trunk/maven-model/src/main/mdo/maven.mdo
- copied unchanged from r498316, maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-settings/src/main/mdo/
maven/components/trunk/maven-settings/src/main/mdo/settings.mdo
- copied unchanged from r498316, maven/components/trunk/maven-settings/settings.mdo
Removed:
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-settings/settings.mdo
Modified:
maven/components/trunk/maven-model/pom.xml
maven/components/trunk/maven-model/project.properties
maven/components/trunk/maven-settings/pom.xml
Modified: maven/components/trunk/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?view=diff&rev=498611&r1=498610&r2=498611
==============================================================================
--- maven/components/trunk/maven-model/pom.xml (original)
+++ maven/components/trunk/maven-model/pom.xml Mon Jan 22 05:30:58 2007
@@ -34,7 +34,7 @@
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>4.0.0</version>
- <model>maven.mdo</model>
+ <model>src/main/mdo/maven.mdo</model>
</configuration>
<executions>
<execution>
Modified: maven/components/trunk/maven-model/project.properties
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/project.properties?view=diff&rev=498611&r1=498610&r2=498611
==============================================================================
--- maven/components/trunk/maven-model/project.properties (original)
+++ maven/components/trunk/maven-model/project.properties Mon Jan 22 05:30:58 2007
@@ -29,7 +29,7 @@
maven.compile.target=1.4
# Modello settings
-maven.modello.model=${basedir}/maven.mdo
+maven.modello.model=${basedir}/src/main/mdo/maven.mdo
maven.modello.packageWithVersion=false
maven.modello.version=3.0.0
maven.modello.plugins=xpp3,stax,dom4j
Modified: maven/components/trunk/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/pom.xml?view=diff&rev=498611&r1=498610&r2=498611
==============================================================================
--- maven/components/trunk/maven-settings/pom.xml (original)
+++ maven/components/trunk/maven-settings/pom.xml Mon Jan 22 05:30:58 2007
@@ -33,7 +33,7 @@
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
- <model>settings.mdo</model>
+ <model>src/main/mdo/settings.mdo</model>
</configuration>
<executions>
<execution>