Author: bentmann
Date: Sun Dec 28 03:52:40 2008
New Revision: 729720
URL: http://svn.apache.org/viewvc?rev=729720&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations
Modified:
maven/site/trunk/pom.xml
maven/site/trunk/src/site/apt/developers/conventions/code.apt
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
maven/site/trunk/src/site/apt/pom.apt
Modified: maven/site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=729720&r1=729719&r2=729720&view=diff
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Sun Dec 28 03:52:40 2008
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: maven/site/trunk/src/site/apt/developers/conventions/code.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/conventions/code.apt?rev=729720&r1=729719&r2=729720&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/developers/conventions/code.apt (original)
+++ maven/site/trunk/src/site/apt/developers/conventions/code.apt Sun Dec 28
03:52:40 2008
@@ -236,7 +236,7 @@
The following is the recommended ordering for all Maven POM files:
+-----+
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion/>
<parent/>
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=729720&r1=729719&r2=729720&view=diff
==============================================================================
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Sun Dec 28 03:52:40 2008
@@ -577,7 +577,7 @@
+----+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>com.test</groupId>
<artifactId>bom</artifactId>
@@ -613,7 +613,7 @@
+----+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.test</groupId>
@@ -653,7 +653,7 @@
+----+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.test</groupId>
@@ -674,7 +674,7 @@
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.test</groupId>
@@ -701,7 +701,7 @@
+----+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>com.test</groupId>
<artifactId>use</artifactId>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt?rev=729720&r1=729719&r2=729720&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt Sun Dec 28
03:52:40 2008
@@ -40,7 +40,7 @@
* Migrating the POM
The Project Object Model (POM) has moved from the <<<project.xml>>> file to
<<<pom.xml>>>.
- The XML schema has also changed, from
{{{http://maven.apache.org/maven-v3_0_0.xsd}Version 3}} to
+ The XML schema has also changed, from
{{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}Version 3}} to
{{{http://maven.apache.org/xsd/maven-4.0.0.xsd}Version 4}}.
The new POM is nominally a superset of the old, so the first step in creating
a
Modified: maven/site/trunk/src/site/apt/pom.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=729720&r1=729719&r2=729720&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Sun Dec 28 03:52:40 2008
@@ -123,7 +123,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<!-- The Basics -->
@@ -180,7 +180,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mojo</groupId>
@@ -237,7 +237,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<packaging>war</packaging>
...
@@ -281,7 +281,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<dependencies>
<dependency>
@@ -392,7 +392,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<dependencies>
<dependency>
@@ -427,7 +427,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mojo</groupId>
@@ -463,7 +463,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -524,7 +524,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mojo</groupId>
@@ -605,7 +605,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<!-- "Project Build" contains more elements than just the BaseBuild set -->
<build>...</build>
@@ -677,7 +677,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<build>
...
<resources>
@@ -739,7 +739,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<build>
...
<plugins>
@@ -802,7 +802,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<build>
<plugins>
@@ -867,7 +867,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<build>
...
@@ -906,7 +906,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<build>
...
@@ -937,7 +937,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@@ -967,7 +967,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<build>
...
@@ -1006,7 +1006,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<reporting>
<outputDirectory>${basedir}/target/site</outputDirectory>
@@ -1043,7 +1043,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<reporting>
<plugins>
@@ -1134,7 +1134,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<organization>
<name>Codehaus Mojo</name>
@@ -1157,7 +1157,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<developers>
<developer>
@@ -1211,7 +1211,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<contributors>
<contributor>
@@ -1247,7 +1247,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<issueManagement>
<system>Bugzilla</system>
@@ -1273,7 +1273,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<ciManagement>
<system>continuum</system>
@@ -1302,7 +1302,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<mailingLists>
<mailingList>
@@ -1342,7 +1342,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<scm>
<connection>scm:svn:http://127.0.0.1/svn/my-project</connection>
@@ -1384,7 +1384,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<prerequisites>
<maven>2.0.4</maven>
@@ -1419,7 +1419,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<repositories>
<repository>
@@ -1489,7 +1489,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<distributionManagement>
...
@@ -1537,7 +1537,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<distributionManagement>
<repository>
@@ -1585,7 +1585,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<distributionManagement>
...
@@ -1610,7 +1610,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<distributionManagement>
...
@@ -1646,7 +1646,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<profiles>
<profile>
@@ -1674,7 +1674,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd";>
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
...
<profiles>
<profile>
