Update tidy-maven-plugin
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 6acc5dc..8d81a12 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -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>
diff --git a/aspects/dom-aspects/pom.xml b/aspects/dom-aspects/pom.xml
index bbd866a..068a95e 100644
--- a/aspects/dom-aspects/pom.xml
+++ b/aspects/dom-aspects/pom.xml
@@ -42,8 +42,7 @@
             <artifactId>shared-aspects</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <!-- TODO: decouple this from the Axiom API -->
+        <dependency><!-- TODO: decouple this from the Axiom API -->
             <groupId>${project.groupId}</groupId>
             <artifactId>om-aspects</artifactId>
             <version>${project.version}</version>
diff --git a/aspects/om-aspects/pom.xml b/aspects/om-aspects/pom.xml
index 039835f..23e6749 100644
--- a/aspects/om-aspects/pom.xml
+++ b/aspects/om-aspects/pom.xml
@@ -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>
diff --git a/axiom-all/pom.xml b/axiom-all/pom.xml
index 9ee5024..1a4617d 100644
--- a/axiom-all/pom.xml
+++ b/axiom-all/pom.xml
@@ -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>
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 7ef851c..34d3b6d 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -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>
@@ -105,8 +105,7 @@
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <!-- We need this in the StAX dialect for Woodstox 4 -->
+        <dependency><!-- We need this in the StAX dialect for Woodstox 4 -->
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>stax2-api</artifactId>
             <scope>provided</scope>
diff --git a/axiom-compat/pom.xml b/axiom-compat/pom.xml
index c3fb540..b047410 100644
--- a/axiom-compat/pom.xml
+++ b/axiom-compat/pom.xml
@@ -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>
@@ -45,8 +45,8 @@
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
-	    <artifactId>jaxb-api</artifactId>
-	    <optional>true</optional>
+            <artifactId>jaxb-api</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/axiom-jaxb/pom.xml b/axiom-jaxb/pom.xml
index 136a577..e27b96c 100644
--- a/axiom-jaxb/pom.xml
+++ b/axiom-jaxb/pom.xml
@@ -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>
diff --git a/buildutils/pom.xml b/buildutils/pom.xml
index 4d75516..90f74a9 100644
--- a/buildutils/pom.xml
+++ b/buildutils/pom.xml
@@ -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>
diff --git a/buildutils/shade-axiom-xml/pom.xml b/buildutils/shade-axiom-xml/pom.xml
index 07cc058..224976b 100644
--- a/buildutils/shade-axiom-xml/pom.xml
+++ b/buildutils/shade-axiom-xml/pom.xml
@@ -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>
diff --git a/devguide/pom.xml b/devguide/pom.xml
index bf88645..39ecbd1 100644
--- a/devguide/pom.xml
+++ b/devguide/pom.xml
@@ -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>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3017b39..293df04 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -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>
@@ -82,8 +82,8 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>apidocs</artifactId>
             <version>${project.version}</version>
-            <classifier>javadoc</classifier>
             <type>zip</type>
+            <classifier>javadoc</classifier>
         </dependency>
     </dependencies>
 
diff --git a/implementations/axiom-dom/pom.xml b/implementations/axiom-dom/pom.xml
index 1340567..0dcb180 100644
--- a/implementations/axiom-dom/pom.xml
+++ b/implementations/axiom-dom/pom.xml
@@ -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>
diff --git a/implementations/axiom-impl/pom.xml b/implementations/axiom-impl/pom.xml
index 6eaf353..c01b75b 100644
--- a/implementations/axiom-impl/pom.xml
+++ b/implementations/axiom-impl/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 1ffa298..00842ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -257,38 +257,6 @@
         <skipDeploy>false</skipDeploy>
     </properties>
 
-    <repositories>
-        <!-- Need to declare this here so that Maven can download snapshot versions of the parent POM -->
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -352,8 +320,7 @@
                 <artifactId>xercesImpl</artifactId>
                 <version>2.11.0</version>
             </dependency>
-            <dependency>
-                <!-- Recent versions of Xerces require this (because they need org.w3c.dom.ElementTraversal) -->
+            <dependency><!-- Recent versions of Xerces require this (because they need org.w3c.dom.ElementTraversal) -->
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
                 <version>1.4.01</version>
@@ -532,6 +499,38 @@
         </dependencies>
     </dependencyManagement>
 
+    <repositories>
+        <!-- Need to declare this here so that Maven can download snapshot versions of the parent POM -->
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -641,8 +640,8 @@
                             <groupId>net.sf.docbook</groupId>
                             <artifactId>docbook-xml</artifactId>
                             <version>5.0-all</version>
-                            <classifier>resources</classifier>
                             <type>zip</type>
+                            <classifier>resources</classifier>
                         </dependency>
                         <!-- Upgrade to xml-resolver 1.2. This is merely to make debugging easier (version 1.1
                              neither has debug information nor a source JAR) -->
@@ -756,8 +755,7 @@
                             <artifactId>aspectjtools</artifactId>
                             <version>${aspectj.version}</version>
                         </dependency>
-                        <dependency>
-                            <!-- Dirty hack to work around Java 9 incompatibility in the plugin -->
+                        <dependency><!-- Dirty hack to work around Java 9 incompatibility in the plugin -->
                             <groupId>com.sun</groupId>
                             <artifactId>tools</artifactId>
                             <version>${java.version}</version>
@@ -1033,8 +1031,7 @@
                     </signature>
                 </configuration>
             </plugin>
-            <plugin>
-                <!-- This serves two purposes:
+            <plugin><!-- This serves two purposes:
                       (1) we want to generate source JARs for all builds, not just release builds;
                       (2) we need (some of) the source JARs to generate the Javadoc in the apidocs module. -->
                 <artifactId>maven-source-plugin</artifactId>
@@ -1057,8 +1054,7 @@
                     <attach>true</attach>
                 </configuration>
             </plugin>
-            <plugin>
-                <!-- We need this to make sure that shade:shade is executed after source:jar-no-fork
+            <plugin><!-- We need this to make sure that shade:shade is executed after source:jar-no-fork
                      (see MSHADE-120). -->
                 <artifactId>maven-shade-plugin</artifactId>
             </plugin>
@@ -1128,7 +1124,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tidy-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <!-- The default binding to the verify phase doesn't work here because some
@@ -1326,7 +1322,7 @@
                                 <exclude>dependency-reduced-pom.xml</exclude>
                                 <exclude>.repository/**</exclude>
                             </excludes>
-                        </configuration> 
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/samples/pom.xml b/samples/pom.xml
index d5ce79d..0b7d616 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -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>
diff --git a/systests/eclipse-tests/pom.xml b/systests/eclipse-tests/pom.xml
index f7077e6..f542a90 100644
--- a/systests/eclipse-tests/pom.xml
+++ b/systests/eclipse-tests/pom.xml
@@ -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>
diff --git a/systests/jaxws-tests/pom.xml b/systests/jaxws-tests/pom.xml
index 2259c89..c591013 100644
--- a/systests/jaxws-tests/pom.xml
+++ b/systests/jaxws-tests/pom.xml
@@ -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>
diff --git a/systests/old-tests/pom.xml b/systests/old-tests/pom.xml
index ca3443b..dfb8451 100644
--- a/systests/old-tests/pom.xml
+++ b/systests/old-tests/pom.xml
@@ -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>
diff --git a/systests/osgi-tests/pom.xml b/systests/osgi-tests/pom.xml
index f45c3df..2704594 100644
--- a/systests/osgi-tests/pom.xml
+++ b/systests/osgi-tests/pom.xml
@@ -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>
diff --git a/systests/pom.xml b/systests/pom.xml
index 0243f6a..61b78be 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -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>
diff --git a/systests/psychopath-tests/pom.xml b/systests/psychopath-tests/pom.xml
index 95dae9d..23e9079 100644
--- a/systests/psychopath-tests/pom.xml
+++ b/systests/psychopath-tests/pom.xml
@@ -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>
@@ -28,18 +28,6 @@
 
     <artifactId>psychopath-tests</artifactId>
 
-    <repositories>
-        <repository>
-            <id>kepler</id>
-            <layout>p2</layout>
-            <!-- Note that http://download.eclipse.org/releases/kepler is a combined repository that
-                 also contains the services releases. It is therefore not stable, i.e. its content
-                 may change over time. To avoid that, we use the repository that contains the
-                 original release artifacts. -->
-            <url>http://download.eclipse.org/releases/kepler/201306260900</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -72,6 +60,18 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>kepler</id>
+            <layout>p2</layout>
+            <!-- Note that http://download.eclipse.org/releases/kepler is a combined repository that
+                 also contains the services releases. It is therefore not stable, i.e. its content
+                 may change over time. To avoid that, we use the repository that contains the
+                 original release artifacts. -->
+            <url>http://download.eclipse.org/releases/kepler/201306260900</url>
+        </repository>
+    </repositories>
+
     <build>
         <extensions>
             <extension>
diff --git a/systests/spring-ws-tests/pom.xml b/systests/spring-ws-tests/pom.xml
index c874235..3d4208e 100644
--- a/systests/spring-ws-tests/pom.xml
+++ b/systests/spring-ws-tests/pom.xml
@@ -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>
@@ -63,8 +63,7 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <!-- Need this because the Xalan version in some JREs doesn't interact well with JDOM -->
+        <dependency><!-- Need this because the Xalan version in some JREs doesn't interact well with JDOM -->
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
             <scope>test</scope>
diff --git a/systests/wildfly-tests/pom.xml b/systests/wildfly-tests/pom.xml
index 79cf9b7..e3af81d 100644
--- a/systests/wildfly-tests/pom.xml
+++ b/systests/wildfly-tests/pom.xml
@@ -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>
diff --git a/testing/axiom-testsuite/pom.xml b/testing/axiom-testsuite/pom.xml
index e4892ec..1155676 100644
--- a/testing/axiom-testsuite/pom.xml
+++ b/testing/axiom-testsuite/pom.xml
@@ -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>
@@ -169,7 +169,7 @@
                                      all contain a valid license header -->
                                 <exclude>src/main/resources/**</exclude>
                             </excludes>
-                        </configuration> 
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/testing/axiom-truth/pom.xml b/testing/axiom-truth/pom.xml
index e6e17de..fc025eb 100644
--- a/testing/axiom-truth/pom.xml
+++ b/testing/axiom-truth/pom.xml
@@ -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>
diff --git a/testing/dom-testsuite/pom.xml b/testing/dom-testsuite/pom.xml
index e88b5c3..5086970 100644
--- a/testing/dom-testsuite/pom.xml
+++ b/testing/dom-testsuite/pom.xml
@@ -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>
@@ -248,7 +248,7 @@
                                      all contain a valid license header -->
                                 <exclude>src/main/resources/**</exclude>
                             </excludes>
-                        </configuration> 
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/testing/jaxen-testsuite/pom.xml b/testing/jaxen-testsuite/pom.xml
index e50b6ab..97d4df0 100644
--- a/testing/jaxen-testsuite/pom.xml
+++ b/testing/jaxen-testsuite/pom.xml
@@ -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>
@@ -60,7 +60,7 @@
                                 <exclude>src/main/java/org/jaxen/test/**</exclude>
                                 <exclude>src/main/resources/META-INF/LICENSE-JAXEN</exclude>
                             </excludes>
-                        </configuration> 
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/testing/multiton/pom.xml b/testing/multiton/pom.xml
index 4e0617b..d344c55 100644
--- a/testing/multiton/pom.xml
+++ b/testing/multiton/pom.xml
@@ -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>
diff --git a/testing/testutils/pom.xml b/testing/testutils/pom.xml
index 4d9463a..28696d6 100644
--- a/testing/testutils/pom.xml
+++ b/testing/testutils/pom.xml
@@ -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>
@@ -47,8 +47,7 @@
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
         </dependency>
-        <dependency>
-            <!-- We use this only for LDAP like filters -->
+        <dependency><!-- We use this only for LDAP like filters -->
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
diff --git a/testing/xml-testsuite/pom.xml b/testing/xml-testsuite/pom.xml
index cf67106..7f25817 100644
--- a/testing/xml-testsuite/pom.xml
+++ b/testing/xml-testsuite/pom.xml
@@ -118,7 +118,7 @@
                                      all contain a valid license header -->
                                 <exclude>src/main/resources/**</exclude>
                             </excludes>
-                        </configuration> 
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/userguide/pom.xml b/userguide/pom.xml
index 9d6e731..792c716 100644
--- a/userguide/pom.xml
+++ b/userguide/pom.xml
@@ -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>