Return-Path: 
 <scm-commits-return-1553-apmail-maven-scm-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-scm-commits-archive@www.apache.org
Received: (qmail 10116 invoked from network); 25 Dec 2009 11:17:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 25 Dec 2009 11:17:08 -0000
Received: (qmail 53492 invoked by uid 500); 25 Dec 2009 11:17:08 -0000
Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org
Received: (qmail 53427 invoked by uid 500); 25 Dec 2009 11:17:08 -0000
Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:scm-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:scm-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:scm-commits@maven.apache.org>
List-Id: <scm-commits.maven.apache.org>
Reply-To: scm-dev@maven.apache.org
Delivered-To: mailing list scm-commits@maven.apache.org
Received: (qmail 53417 invoked by uid 99); 25 Dec 2009 11:17:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 11:17:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 11:16:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 299BA23889DE; Fri, 25 Dec 2009 11:16:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r893850 - in /maven/scm/trunk: ./
 maven-scm-providers/maven-scm-provider-clearcase/
 maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/
 maven-scm-providers/maven-scm-provider-local/
 maven-scm-providers/maven-scm-provider-local/sr...
Date: Fri, 25 Dec 2009 11:16:08 -0000
To: scm-commits@maven.apache.org
From: hboutemy@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091225111637.299BA23889DE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hboutemy
Date: Fri Dec 25 11:15:37 2009
New Revision: 893850

URL: http://svn.apache.org/viewvc?rev=893850&view=rev
Log:
[SCM-463] updated to Modello 1.1

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
    maven/scm/trunk/pom.xml

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml Fri Dec 25 11:15:37 2009
@@ -60,7 +60,9 @@
         </executions>
         <configuration>
           <version>1.1.0</version>
-          <model>src/main/mdo/clearcase-settings.mdo</model>
+          <models>
+            <model>src/main/mdo/clearcase-settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/CLEARCASE/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-clearcase-${version}.xsd">
   <id>clearcase</id>
   <name>Clearcase</name>
   <description>Clearcase Provider Model.</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml Fri Dec 25 11:15:37 2009
@@ -61,7 +61,9 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/maven-scm-local-metadata.mdo</model>
+          <models>
+            <model>src/main/mdo/maven-scm-local-metadata.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/LOCAL/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-local-${version}.xsd">
   <id>maven-scm-local-metadata</id>
   <name>LocalScmMetadata</name>
   <description>Metadata for Maven SCM Local provider</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml Fri Dec 25 11:15:37 2009
@@ -60,7 +60,9 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/starteam-settings.mdo</model>
+          <models>
+            <model>src/main/mdo/starteam-settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/STARTEAM/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-starteam-${version}.xsd">
   <id>starteam</id>
   <name>Starteam</name>
   <description>Starteam Provider Model.</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Fri Dec 25 11:15:37 2009
@@ -49,6 +49,7 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-21</version><!-- Workaround for SCM-518 -->
         <executions>
           <execution>
             <goals>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/VSS/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-vss-${version}.xsd">
   <id>vss</id>
   <name>Vss</name>
   <description>VSS Provider Model.</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml Fri Dec 25 11:15:37 2009
@@ -57,7 +57,9 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/cvs-settings.mdo</model>
+          <models>
+            <model>src/main/mdo/cvs-settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/CVS/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-cvs-${version}.xsd">
   <id>cvs</id>
   <name>Cvs</name>
   <description>CVS Provider Model.</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml Fri Dec 25 11:15:37 2009
@@ -56,7 +56,9 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/git-settings.mdo</model>
+          <models>
+            <model>src/main/mdo/git-settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/GIT/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-git-${version}.xsd">
   <id>git</id>
   <name>Git</name>
   <description>git Provider Model.</description>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml Fri Dec 25 11:15:37 2009
@@ -49,7 +49,9 @@
         </executions>
         <configuration>
           <version>1.1.0</version>
-          <model>src/main/mdo/svn-settings.mdo</model>
+          <models>
+            <model>src/main/mdo/svn-settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo Fri Dec 25 11:15:37 2009
@@ -19,7 +19,10 @@
   ~ under the License.
 -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
+  xml.namespace="http://maven.apache.org/SCM/SVN/${version}"
+  xml.schemaLocation="http://maven.apache.org/xsd/scm-svn-${version}.xsd">
   <id>svn</id>
   <name>Svn</name>
   <description>SVN Provider Model.</description>

Modified: maven/scm/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=893850&r1=893849&r2=893850&view=diff
==============================================================================
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Fri Dec 25 11:15:37 2009
@@ -92,12 +92,12 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/scm/trunk</developerConnection>
     <url>http://svn.apache.org/viewvc/maven/scm/</url>
   </scm>
-  
+
   <issueManagement>
     <system>jira</system>
     <url>http://jira.codehaus.org/browse/SCM</url>
   </issueManagement>
-  
+
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -255,7 +255,7 @@
   </dependencies>
 
   <build>
-  
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -268,14 +268,14 @@
         <plugin>
           <groupId>org.codehaus.modello</groupId>
           <artifactId>modello-maven-plugin</artifactId>
-          <version>1.0-alpha-21</version>
+          <version>1.1</version>
         </plugin>
         <!--  due to MJAVADOC-275 -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.5</version>
-        </plugin>        
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -328,6 +328,6 @@
           </plugin>
         </plugins>
       </reporting>
-    </profile>   
+    </profile>
   </profiles>
 </project>