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:http://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>
