diff --git a/app-client/pom.xml b/app-client/pom.xml
index 091ca2bca4..5ae9e380a1 100644
--- a/app-client/pom.xml
+++ b/app-client/pom.xml
@@ -94,8 +94,9 @@
     </pluginRepositories>
 
     <properties>
-    <!-- Explicitly declaring the source encoding eliminates the following message: -->
-    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index 58039998c8..d7a38825d0 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -92,10 +92,9 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -190,9 +189,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -240,8 +239,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+       <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/bean-validation-custom-constraint/pom.xml b/bean-validation-custom-constraint/pom.xml
index 9b411a40ee..7cca591a8e 100644
--- a/bean-validation-custom-constraint/pom.xml
+++ b/bean-validation-custom-constraint/pom.xml
@@ -152,9 +152,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -194,8 +194,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
 
         <!-- Define plug-in versions required for Deployment and Testing Tools -->
diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
index 582a24a3dd..8fd2615ebd 100644
--- a/bean-validation/pom.xml
+++ b/bean-validation/pom.xml
@@ -144,9 +144,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -194,8 +194,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
 
         <!-- Define plug-in versions required for Deployment and Testing Tools -->
diff --git a/bmt/pom.xml b/bmt/pom.xml
index 14b478fe1c..6b204e193e 100644
--- a/bmt/pom.xml
+++ b/bmt/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-           message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-           resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -177,8 +176,7 @@
    </dependencies>
 
     <build>
-      <!-- Set the name of the WAR, used as the context root when the app
-         is deployed -->
+      <!-- Set the name of the WAR, used as the context root when the app is deployed -->
       <finalName>${project.artifactId}</finalName>
       <plugins>
          <plugin>
diff --git a/cdi-alternative/pom.xml b/cdi-alternative/pom.xml
index 7a2b678f56..6fabd25277 100644
--- a/cdi-alternative/pom.xml
+++ b/cdi-alternative/pom.xml
@@ -94,9 +94,9 @@
         The pom builds the web WAR artifact.
     -->
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -115,9 +115,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
@@ -155,8 +152,7 @@
         </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cdi-decorator/pom.xml b/cdi-decorator/pom.xml
index e91f8e656f..7d339125c9 100644
--- a/cdi-decorator/pom.xml
+++ b/cdi-decorator/pom.xml
@@ -93,10 +93,9 @@
     <!-- The pom builds the web WAR artifact. -->
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
@@ -146,8 +145,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app is
-            deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cdi-injection/pom.xml b/cdi-injection/pom.xml
index 9b49a5c58e..259f6d7b1b 100644
--- a/cdi-injection/pom.xml
+++ b/cdi-injection/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/cdi-interceptors/pom.xml b/cdi-interceptors/pom.xml
index c323d308b0..9f2f3311a1 100644
--- a/cdi-interceptors/pom.xml
+++ b/cdi-interceptors/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -189,8 +188,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app is
-            deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cdi-portable-extension/pom.xml b/cdi-portable-extension/pom.xml
index 288524848a..e55dc93ed8 100644
--- a/cdi-portable-extension/pom.xml
+++ b/cdi-portable-extension/pom.xml
@@ -157,6 +157,7 @@
     </dependencies>
 
     <build>
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cdi-stereotype/pom.xml b/cdi-stereotype/pom.xml
index f348ea94b4..f436345320 100644
--- a/cdi-stereotype/pom.xml
+++ b/cdi-stereotype/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -171,8 +170,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app is
-            deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cdi-veto/pom.xml b/cdi-veto/pom.xml
index c6210a2ead..b0b45c4485 100644
--- a/cdi-veto/pom.xml
+++ b/cdi-veto/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message:
-        [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-        resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
diff --git a/cluster-ha-singleton/pom.xml b/cluster-ha-singleton/pom.xml
index e81d5cebeb..e38a2aea13 100644
--- a/cluster-ha-singleton/pom.xml
+++ b/cluster-ha-singleton/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/cluster-ha-singleton/service/pom.xml b/cluster-ha-singleton/service/pom.xml
index 10ca43759d..4e9f17bc63 100644
--- a/cluster-ha-singleton/service/pom.xml
+++ b/cluster-ha-singleton/service/pom.xml
@@ -66,7 +66,7 @@
     </dependencies>
 
     <build>
-        <!-- Specify the artifact name -->
+        <!-- Specify the archive name -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/cmt/pom.xml b/cmt/pom.xml
index c3027056f1..df6e13dc52 100644
--- a/cmt/pom.xml
+++ b/cmt/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -178,8 +177,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/contacts-jquerymobile/functional-tests/pom.xml b/contacts-jquerymobile/functional-tests/pom.xml
index f47c95c227..bd133fb03a 100644
--- a/contacts-jquerymobile/functional-tests/pom.xml
+++ b/contacts-jquerymobile/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/contacts-jquerymobile/pom.xml b/contacts-jquerymobile/pom.xml
index 850470ec4b..cc9b8dde81 100644
--- a/contacts-jquerymobile/pom.xml
+++ b/contacts-jquerymobile/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- You can reference property in pom.xml or filtered resources (must enable third-party plug-in if using Maven < 2.1) -->
@@ -199,9 +200,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -269,8 +270,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name given to the generated WAR, and hence the context
-            root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- This skips all tests, though you can tune it to run just unit tests based on a custom pattern -->
diff --git a/ejb-asynchronous/pom.xml b/ejb-asynchronous/pom.xml
index 941fdbcee0..bc0435d8fe 100644
--- a/ejb-asynchronous/pom.xml
+++ b/ejb-asynchronous/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/ejb-in-ear/pom.xml b/ejb-in-ear/pom.xml
index 238c27f320..11cb27f4de 100644
--- a/ejb-in-ear/pom.xml
+++ b/ejb-in-ear/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
         <version.jboss.bom.eap>7.0.0-build-12</version.jboss.bom.eap>
diff --git a/ejb-in-war/pom.xml b/ejb-in-war/pom.xml
index cb13889a6c..77ba6bfe3c 100644
--- a/ejb-in-war/pom.xml
+++ b/ejb-in-war/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -114,9 +114,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
@@ -180,8 +177,7 @@
     </dependencies>
 
     <build>
-      <!-- Set the name of the WAR, used as the context root when the app
-         is deployed -->
+      <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
index 8db4176365..dd09f370e0 100644
--- a/ejb-multi-server/pom.xml
+++ b/ejb-multi-server/pom.xml
@@ -93,10 +93,9 @@
     </pluginRepositories>
 
     <properties>
-    <!-- Explicitly declaring the source encoding eliminates the following
-      message: -->
-    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-      resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml
index 703f6fbcc4..1715fb34b1 100644
--- a/ejb-remote/client/pom.xml
+++ b/ejb-remote/client/pom.xml
@@ -39,9 +39,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/ejb-remote/server-side/pom.xml b/ejb-remote/server-side/pom.xml
index 89c092dc49..04cd9800f2 100644
--- a/ejb-remote/server-side/pom.xml
+++ b/ejb-remote/server-side/pom.xml
@@ -34,9 +34,9 @@
     </licenses>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/ejb-security-interceptors/pom.xml b/ejb-security-interceptors/pom.xml
index 1647aa4e49..5b48e6301a 100644
--- a/ejb-security-interceptors/pom.xml
+++ b/ejb-security-interceptors/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -159,8 +158,7 @@
     </dependencies>
 
     <build>
-          <!-- Set the name of the jar, used as the context root when the app is
-              deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
 
@@ -174,7 +172,7 @@
             <generateClient>true</generateClient>
           </configuration>
         </plugin>
-                <!-- Add the maven exec plug-in to allow us to run a java program via maven -->
+            <!-- Add the Maven exec plug-in to allow us to run a Java program via Maven -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
diff --git a/ejb-security/pom.xml b/ejb-security/pom.xml
index ca9af729b3..63245b69ac 100644
--- a/ejb-security/pom.xml
+++ b/ejb-security/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -162,8 +161,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- WildFly plug-in to deploy the WAR -->
diff --git a/ejb-throws-exception/ejb/pom.xml b/ejb-throws-exception/ejb/pom.xml
index 1c31303abb..797f5c407b 100644
--- a/ejb-throws-exception/ejb/pom.xml
+++ b/ejb-throws-exception/ejb/pom.xml
@@ -66,9 +66,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
index a98a3914f6..1d26b9f66f 100644
--- a/ejb-throws-exception/pom.xml
+++ b/ejb-throws-exception/pom.xml
@@ -91,6 +91,9 @@
     </pluginRepositories>
 
     <properties>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- EAP component version management BOM -->
         <version.jboss.bom.eap>7.0.0-build-12</version.jboss.bom.eap>
diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml
index 0f17f29211..2152aa81b1 100644
--- a/ejb-timer/pom.xml
+++ b/ejb-timer/pom.xml
@@ -153,8 +153,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed. -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed. -->
         <finalName>${project.artifactId}</finalName>
 
         <plugins>
diff --git a/greeter/pom.xml b/greeter/pom.xml
index 97f00134a0..1041095a57 100644
--- a/greeter/pom.xml
+++ b/greeter/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-         message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -180,8 +179,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-           is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld-html5/functional-tests/pom.xml b/helloworld-html5/functional-tests/pom.xml
index 7f0233c515..e9eeda8943 100644
--- a/helloworld-html5/functional-tests/pom.xml
+++ b/helloworld-html5/functional-tests/pom.xml
@@ -89,9 +89,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/helloworld-html5/pom.xml b/helloworld-html5/pom.xml
index 1a5b0b27c3..5d6326edfc 100644
--- a/helloworld-html5/pom.xml
+++ b/helloworld-html5/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -154,7 +154,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app is deployed. -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index b8c9511ea3..5f0e0b20ab 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -137,6 +137,7 @@
     </dependencies>
 
     <build>
+        <!-- Set the name of the archive -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld-mbean/pom.xml b/helloworld-mbean/pom.xml
index 12f4fcad57..8b162a729d 100644
--- a/helloworld-mbean/pom.xml
+++ b/helloworld-mbean/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-             message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-             resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -120,9 +119,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
diff --git a/helloworld-mdb-propertysubstitution/pom.xml b/helloworld-mdb-propertysubstitution/pom.xml
index 24039e68ca..01bc3c7284 100644
--- a/helloworld-mdb-propertysubstitution/pom.xml
+++ b/helloworld-mdb-propertysubstitution/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -113,7 +112,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to use -->
             <!-- JBoss distributes a complete set of Java EE APIs including a Bill
                 of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
                 of artifacts. We use this here so that we always get the correct versions
@@ -156,8 +154,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml
index b620b11864..da4460f8d6 100644
--- a/helloworld-mdb/pom.xml
+++ b/helloworld-mdb/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -157,8 +156,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml
index 27827cc4f0..961797f68d 100644
--- a/helloworld-rs/pom.xml
+++ b/helloworld-rs/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
index bd6c8de22f..ead6899282 100644
--- a/helloworld-singleton/pom.xml
+++ b/helloworld-singleton/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -112,7 +112,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to use -->
             <!-- JBoss distributes a complete set of Java EE APIs including a Bill
                     of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
                     of artifacts. We use this here so that we always get the correct versions
diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
index d3ebd68564..0c9dd336a0 100644
--- a/helloworld-ws/pom.xml
+++ b/helloworld-ws/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -118,9 +117,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including a Bill
                 of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
                 of artifacts. We use this here so that we always get the correct versions
@@ -177,8 +173,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index db08e28a95..8b3e395701 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -157,8 +156,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml
index d2210677a2..d459fb799b 100644
--- a/hibernate5/pom.xml
+++ b/hibernate5/pom.xml
@@ -90,9 +90,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -172,9 +172,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -207,8 +207,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/inter-app/pom.xml b/inter-app/pom.xml
index 8c4b7f60dd..8d2d10ea8a 100644
--- a/inter-app/pom.xml
+++ b/inter-app/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -147,8 +146,7 @@
     </dependencyManagement>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Disable WildFly plug-in, as nothing to deploy -->
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
index e41575f2e9..0e760f9d59 100644
--- a/jaxrs-client/pom.xml
+++ b/jaxrs-client/pom.xml
@@ -94,10 +94,9 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -216,8 +215,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/jaxws-addressing/pom.xml b/jaxws-addressing/pom.xml
index 8c1b44579b..3b8c928b8a 100644
--- a/jaxws-addressing/pom.xml
+++ b/jaxws-addressing/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-      <!-- Explicitly declaring the source encoding eliminates the following message: -->
-      <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+      <!-- Explicitly declaring the source encoding eliminates the following
+          message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+          filtered resources, i.e. build is platform dependent! -->
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <!-- JBoss dependency versions -->
       <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
diff --git a/jaxws-addressing/service/pom.xml b/jaxws-addressing/service/pom.xml
index b209c2ddd9..ccbe7ac05b 100644
--- a/jaxws-addressing/service/pom.xml
+++ b/jaxws-addressing/service/pom.xml
@@ -37,7 +37,7 @@
    </licenses>
 
     <build>
-       <!-- define the name for the deployable archive instead of using the default name with the version -->
+       <!-- Set the name for the deployable archive instead of using the default name with the version -->
        <finalName>${project.artifactId}</finalName>
        <sourceDirectory>src/main/java</sourceDirectory>
 
diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
index 4cfed8656e..5df4f3a99c 100644
--- a/jaxws-ejb/pom.xml
+++ b/jaxws-ejb/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/jaxws-ejb/service/pom.xml b/jaxws-ejb/service/pom.xml
index 393c473113..c00acca2d3 100644
--- a/jaxws-ejb/service/pom.xml
+++ b/jaxws-ejb/service/pom.xml
@@ -56,7 +56,7 @@
     </dependencies>
 
     <build>
-        <!-- define the name for the deployable archive instead of using the default name with the version -->
+        <!-- Set the name of the archive instead of using the default name with the version -->
         <finalName>${project.artifactId}</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
 
diff --git a/jaxws-pojo/client/pom.xml b/jaxws-pojo/client/pom.xml
index bc7982ff3b..ee03243615 100644
--- a/jaxws-pojo/client/pom.xml
+++ b/jaxws-pojo/client/pom.xml
@@ -47,7 +47,7 @@
     </dependencies>
 
     <build>
-        <!-- define the name for the deployable archive instead of using the default name with the version -->
+        <!-- Set the name for the deployable archive instead of using the default name with the version -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
 
diff --git a/jaxws-pojo/pom.xml b/jaxws-pojo/pom.xml
index af63bd24e9..00559725d7 100644
--- a/jaxws-pojo/pom.xml
+++ b/jaxws-pojo/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- JBoss dependency versions -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -112,9 +113,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of JBoss' Java EE APIs we want to import. Any
-            dependencies from org.jboss.spec will have their version defined by this
-            BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including a Bill
             of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
             of artifacts. We use this here so that we always get the correct versions
diff --git a/jaxws-pojo/service/pom.xml b/jaxws-pojo/service/pom.xml
index 4a1bda98f1..09426bbe21 100644
--- a/jaxws-pojo/service/pom.xml
+++ b/jaxws-pojo/service/pom.xml
@@ -38,7 +38,7 @@
     </licenses>
 
     <build>
-        <!-- define the name for the deployable archive instead of using the default name with the version -->
+        <!-- Set the name for the deployable archive instead of using the default name with the version -->
         <finalName>${project.artifactId}</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
 
diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml
index 2e2c4e936a..9cb42ff9e5 100644
--- a/jaxws-retail/pom.xml
+++ b/jaxws-retail/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-      <!-- Explicitly declaring the source encoding eliminates the following message: -->
-      <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <!-- JBoss dependency versions -->
       <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -113,9 +114,6 @@
 
     <dependencyManagement>
       <dependencies>
-         <!-- Define the version of JBoss' Java EE APIs we want to import. Any
-         dependencies from org.jboss.spec will have their version defined by this
-         BOM -->
          <!-- JBoss distributes a complete set of Java EE APIs including a Bill
          of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
          of artifacts. We use this here so that we always get the correct versions
diff --git a/jaxws-retail/service/pom.xml b/jaxws-retail/service/pom.xml
index 3a7af567e2..3e21720c74 100644
--- a/jaxws-retail/service/pom.xml
+++ b/jaxws-retail/service/pom.xml
@@ -52,7 +52,7 @@
    </dependencies>
 
     <build>
-      <!-- define the name for the deployable archive instead of using the default name with the version -->
+        <!-- Set the name of the archive -->
       <finalName>${project.artifactId}</finalName>
       <sourceDirectory>src/main/java</sourceDirectory>
 
diff --git a/jsonp/pom.xml b/jsonp/pom.xml
index f2d758054c..77ae33f1f3 100644
--- a/jsonp/pom.xml
+++ b/jsonp/pom.xml
@@ -93,9 +93,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -197,8 +196,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml
index 0e5352c826..b47860db45 100644
--- a/jta-crash-rec/pom.xml
+++ b/jta-crash-rec/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -183,8 +182,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml
index 9e4cee2cb0..3b2b89ef65 100644
--- a/jts/application-component-1/pom.xml
+++ b/jts/application-component-1/pom.xml
@@ -83,8 +83,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/jts/application-component-2/pom.xml b/jts/application-component-2/pom.xml
index a0c6014dce..8f6e88c0ab 100644
--- a/jts/application-component-2/pom.xml
+++ b/jts/application-component-2/pom.xml
@@ -65,8 +65,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the archive -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- The WildFly plug-in deploys your WAR to a local JBoss EAP container -->
diff --git a/jts/pom.xml b/jts/pom.xml
index 13f39c3888..d04c4dff7b 100644
--- a/jts/pom.xml
+++ b/jts/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/kitchensink-angularjs/functional-tests/pom.xml b/kitchensink-angularjs/functional-tests/pom.xml
index 4fd5e863c9..0234e03053 100644
--- a/kitchensink-angularjs/functional-tests/pom.xml
+++ b/kitchensink-angularjs/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/kitchensink-angularjs/pom.xml b/kitchensink-angularjs/pom.xml
index 418ff3a362..c106f83c33 100644
--- a/kitchensink-angularjs/pom.xml
+++ b/kitchensink-angularjs/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -170,9 +169,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -222,8 +221,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the 
-            name given to the generated war, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/kitchensink-ear/ejb/pom.xml b/kitchensink-ear/ejb/pom.xml
index 725b5e61e4..256906c31c 100644
--- a/kitchensink-ear/ejb/pom.xml
+++ b/kitchensink-ear/ejb/pom.xml
@@ -63,9 +63,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/kitchensink-ear/pom.xml b/kitchensink-ear/pom.xml
index 77309e62c8..f54eecd2c6 100644
--- a/kitchensink-ear/pom.xml
+++ b/kitchensink-ear/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -162,7 +161,7 @@
     <build>
         <pluginManagement>
             <plugins>
-                <!-- The WildFly plug-in deploys your ear to a local JBoss EAP container -->
+                <!-- The WildFly plug-in deploys your EAR to a local JBoss EAP container -->
                 <!-- Due to Maven's lack of intelligence with EARs we need
                     to configure the WildFly Maven plug-in to skip deployment for all modules.
                     We then enable it specifically in the ear module. -->
diff --git a/kitchensink-ear/web/pom.xml b/kitchensink-ear/web/pom.xml
index 23d1f3c429..2983654012 100644
--- a/kitchensink-ear/web/pom.xml
+++ b/kitchensink-ear/web/pom.xml
@@ -75,20 +75,20 @@
          <scope>provided</scope>
       </dependency>
 
-       <!-- Bean Validation Implementation -->
-       <!-- Provides portable constraints such as @Email -->
-       <!-- Hibernate Validator is shipped in JBoss EAP -->
-       <dependency>
-           <groupId>org.hibernate</groupId>
-           <artifactId>hibernate-validator</artifactId>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.slf4j</groupId>
-                   <artifactId>slf4j-api</artifactId>
-               </exclusion>
-           </exclusions>
-       </dependency>
+      <!-- Bean Validation Implementation 
+           Provides portable constraints such as @Email 
+           Hibernate Validator is shipped in JBoss EAP -->
+      <dependency>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-validator</artifactId>
+          <scope>provided</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-api</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
 
    </dependencies>
 
diff --git a/kitchensink-html5-mobile/pom.xml b/kitchensink-html5-mobile/pom.xml
index 2cbae194c0..904deb8472 100644
--- a/kitchensink-html5-mobile/pom.xml
+++ b/kitchensink-html5-mobile/pom.xml
@@ -91,8 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -225,8 +226,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name given to the generated WAR, and hence the context
-            root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/kitchensink-jsp/pom.xml b/kitchensink-jsp/pom.xml
index 46b2ef07b2..9c5e558ce9 100644
--- a/kitchensink-jsp/pom.xml
+++ b/kitchensink-jsp/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -192,9 +191,9 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -242,8 +241,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/kitchensink-ml-ear/pom.xml b/kitchensink-ml-ear/pom.xml
index c4c2c64bb3..faebdb7b8c 100644
--- a/kitchensink-ml-ear/pom.xml
+++ b/kitchensink-ml-ear/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/kitchensink-ml-ear/web/pom.xml b/kitchensink-ml-ear/web/pom.xml
index a6d70c4021..84b4157a81 100644
--- a/kitchensink-ml-ear/web/pom.xml
+++ b/kitchensink-ml-ear/web/pom.xml
@@ -90,9 +90,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/kitchensink-ml/pom.xml b/kitchensink-ml/pom.xml
index 87d4fb0774..7f5662f4a8 100644
--- a/kitchensink-ml/pom.xml
+++ b/kitchensink-ml/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -175,9 +174,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -255,8 +254,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
index 2f790a9d9f..7ac6ea69da 100644
--- a/kitchensink/pom.xml
+++ b/kitchensink/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -176,9 +175,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -242,8 +241,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 65691f3709..77ed269d31 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/logging-tools/pom.xml b/logging-tools/pom.xml
index 9522d515ff..40867e3683 100644
--- a/logging-tools/pom.xml
+++ b/logging-tools/pom.xml
@@ -91,9 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
diff --git a/logging/pom.xml b/logging/pom.xml
index ba223d37e7..91a0bc2abd 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/mail/pom.xml b/mail/pom.xml
index e7ff80574a..3ef3d81369 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -156,8 +156,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/managed-executor-service/pom.xml b/managed-executor-service/pom.xml
index 450c728b28..1a7e7c69b1 100644
--- a/managed-executor-service/pom.xml
+++ b/managed-executor-service/pom.xml
@@ -123,7 +123,7 @@
                 of artifacts. We use this here so that we always get the correct versions
                 of artifacts. Here we use the jboss-eap-javaee7-with-tools stack (you can
                 read this as the JBoss stack of the Java EE APIs, with some extras tools
-                for your project, such as Arquillian for testing) a -->
+                for your project, such as Arquillian for testing) -->
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-eap-javaee7-with-tools</artifactId>
@@ -208,9 +208,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -299,8 +299,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/numberguess/pom.xml b/numberguess/pom.xml
index 0e5e08c723..c7348b6fc7 100644
--- a/numberguess/pom.xml
+++ b/numberguess/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
@@ -112,9 +112,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
@@ -158,8 +155,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/payment-cdi-event/pom.xml b/payment-cdi-event/pom.xml
index 09e7c075d8..d6d4f5c78e 100644
--- a/payment-cdi-event/pom.xml
+++ b/payment-cdi-event/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -143,8 +142,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/picketlink-sts/pom.xml b/picketlink-sts/pom.xml
index 2972e07ff2..a65fa2082d 100644
--- a/picketlink-sts/pom.xml
+++ b/picketlink-sts/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
@@ -173,8 +173,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-                         is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
 
diff --git a/resteasy-jaxrs-client/pom.xml b/resteasy-jaxrs-client/pom.xml
index 77452eca9b..456011278c 100644
--- a/resteasy-jaxrs-client/pom.xml
+++ b/resteasy-jaxrs-client/pom.xml
@@ -91,9 +91,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml
index f34572d582..7abefea8f8 100644
--- a/servlet-async/pom.xml
+++ b/servlet-async/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml
index c362ea352a..3331d8f79e 100644
--- a/servlet-filterlistener/pom.xml
+++ b/servlet-filterlistener/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
        <!-- JBoss dependency versions -->
@@ -156,8 +156,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml
index b403c12e81..ea5be43e83 100644
--- a/servlet-security/pom.xml
+++ b/servlet-security/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
        <!-- JBoss dependency versions -->
@@ -156,8 +156,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+         <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- WildFly plug-in to deploy the WAR -->
diff --git a/shopping-cart/pom.xml b/shopping-cart/pom.xml
index 2e0eadef36..b07ca3e408 100644
--- a/shopping-cart/pom.xml
+++ b/shopping-cart/pom.xml
@@ -91,9 +91,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
diff --git a/shopping-cart/server/pom.xml b/shopping-cart/server/pom.xml
index 4b7a51af15..63ba0a4ad8 100644
--- a/shopping-cart/server/pom.xml
+++ b/shopping-cart/server/pom.xml
@@ -57,7 +57,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the deployment -->
+        <!-- Set the name of the deployment archive -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- WildFly plug-in to deploy the application -->
diff --git a/shrinkwrap-resolver/pom.xml b/shrinkwrap-resolver/pom.xml
index d5f1a0c5b1..f87215a596 100644
--- a/shrinkwrap-resolver/pom.xml
+++ b/shrinkwrap-resolver/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
@@ -225,8 +224,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/spring-greeter/functional-tests/pom.xml b/spring-greeter/functional-tests/pom.xml
index 9bc4430fb6..fbfe0b2274 100644
--- a/spring-greeter/functional-tests/pom.xml
+++ b/spring-greeter/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-greeter/pom.xml b/spring-greeter/pom.xml
index 3ebd3f2cac..f52f36fc1a 100644
--- a/spring-greeter/pom.xml
+++ b/spring-greeter/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-        resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- WildFly plug-in for deployment -->
diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml b/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml
index a6dfff42b0..f80a07fe0d 100644
--- a/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml
+++ b/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-kitchensink-asyncrequestmapping/pom.xml b/spring-kitchensink-asyncrequestmapping/pom.xml
index 05c8b58092..21c02d03ef 100644
--- a/spring-kitchensink-asyncrequestmapping/pom.xml
+++ b/spring-kitchensink-asyncrequestmapping/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -156,10 +155,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
-        <dependency>
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
+       <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
@@ -272,6 +271,7 @@
     </dependencies>
 
     <build>
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Deployent on AS from console -->
diff --git a/spring-kitchensink-basic/functional-tests/pom.xml b/spring-kitchensink-basic/functional-tests/pom.xml
index 1741d16762..d08722d016 100644
--- a/spring-kitchensink-basic/functional-tests/pom.xml
+++ b/spring-kitchensink-basic/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-kitchensink-basic/pom.xml b/spring-kitchensink-basic/pom.xml
index cad3c56e37..29e48117a0 100644
--- a/spring-kitchensink-basic/pom.xml
+++ b/spring-kitchensink-basic/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -156,9 +155,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -272,6 +271,7 @@
     </dependencies>
 
     <build>
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Deployent on AS from console -->
diff --git a/spring-kitchensink-controlleradvice/functional-tests/pom.xml b/spring-kitchensink-controlleradvice/functional-tests/pom.xml
index 0c122fd6d3..962012824e 100644
--- a/spring-kitchensink-controlleradvice/functional-tests/pom.xml
+++ b/spring-kitchensink-controlleradvice/functional-tests/pom.xml
@@ -92,10 +92,9 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
         <m2e.cdi.activation>false</m2e.cdi.activation>
diff --git a/spring-kitchensink-controlleradvice/pom.xml b/spring-kitchensink-controlleradvice/pom.xml
index 84074e56b1..2d68eb9d52 100644
--- a/spring-kitchensink-controlleradvice/pom.xml
+++ b/spring-kitchensink-controlleradvice/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -156,9 +155,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/spring-kitchensink-matrixvariables/functional-tests/pom.xml b/spring-kitchensink-matrixvariables/functional-tests/pom.xml
index fd728b5222..a7f0e4023d 100644
--- a/spring-kitchensink-matrixvariables/functional-tests/pom.xml
+++ b/spring-kitchensink-matrixvariables/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-kitchensink-matrixvariables/pom.xml b/spring-kitchensink-matrixvariables/pom.xml
index d980e90809..0a37d6036d 100644
--- a/spring-kitchensink-matrixvariables/pom.xml
+++ b/spring-kitchensink-matrixvariables/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -156,9 +155,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/spring-kitchensink-springmvctest/functional-tests/pom.xml b/spring-kitchensink-springmvctest/functional-tests/pom.xml
index f8def1108a..6a5e48c4c7 100644
--- a/spring-kitchensink-springmvctest/functional-tests/pom.xml
+++ b/spring-kitchensink-springmvctest/functional-tests/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-kitchensink-springmvctest/pom.xml b/spring-kitchensink-springmvctest/pom.xml
index dc92255026..6acf79d050 100644
--- a/spring-kitchensink-springmvctest/pom.xml
+++ b/spring-kitchensink-springmvctest/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -178,9 +177,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Bean Validation Implementation -->
-        <!-- Provides portable constraints such as @Email -->
-        <!-- Hibernate Validator is shipped in JBoss EAP -->
+        <!-- Bean Validation Implementation 
+             Provides portable constraints such as @Email 
+             Hibernate Validator is shipped in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -313,6 +312,7 @@
     </dependencies>
 
     <build>
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Deployent on AS from console -->
diff --git a/spring-petclinic/functional-tests/pom.xml b/spring-petclinic/functional-tests/pom.xml
index aad0b4d33a..8b4b13d18f 100644
--- a/spring-petclinic/functional-tests/pom.xml
+++ b/spring-petclinic/functional-tests/pom.xml
@@ -93,9 +93,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-                                 message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-                         resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- To disable warning of missing beans.xml file in JBoss Tools -->
diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml
index 8d04a451b9..72ba35d97a 100644
--- a/spring-resteasy/pom.xml
+++ b/spring-resteasy/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -207,8 +206,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name given to the generated WAR, and hence the context
-            root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- The WildFly plug-in deploys the WAR to a local JBoss EAP container -->
diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml
index 01ee17500f..e6e11a47c8 100644
--- a/tasks-jsf/pom.xml
+++ b/tasks-jsf/pom.xml
@@ -91,9 +91,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -182,8 +181,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+       <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/tasks-rs/pom.xml b/tasks-rs/pom.xml
index 15764b9371..9c4a06abab 100644
--- a/tasks-rs/pom.xml
+++ b/tasks-rs/pom.xml
@@ -90,9 +90,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -195,8 +195,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/tasks/pom.xml b/tasks/pom.xml
index ca40d037ad..2e418e2742 100644
--- a/tasks/pom.xml
+++ b/tasks/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- EAP component version management BOM -->
@@ -175,8 +174,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the
-            name given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml
index 5d4545e1dd..924017fa5d 100644
--- a/temperature-converter/pom.xml
+++ b/temperature-converter/pom.xml
@@ -91,10 +91,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
@@ -112,9 +112,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import.
-                Any dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
@@ -164,8 +161,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/template/pom.xml b/template/pom.xml
index 58af26baaa..0ab0c767c7 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -35,9 +35,9 @@
     </licenses>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-        resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -122,8 +122,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-        is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml
index f09666f593..1b71c4db3e 100644
--- a/thread-racing/pom.xml
+++ b/thread-racing/pom.xml
@@ -90,10 +90,10 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
 
@@ -225,7 +225,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the war, used as the context root when the app is deployed. -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed. -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/websocket-client/pom.xml b/websocket-client/pom.xml
index c662b1d8fb..7b4ee582cb 100644
--- a/websocket-client/pom.xml
+++ b/websocket-client/pom.xml
@@ -91,9 +91,9 @@
     </pluginRepositories>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered 
-            resources, i.e. build is platform dependent! -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -220,8 +220,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml
index 42730dd1b0..7fe9e45128 100644
--- a/websocket-endpoint/pom.xml
+++ b/websocket-endpoint/pom.xml
@@ -91,9 +91,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -214,8 +213,7 @@
     </dependencies>
 
     <build>
-        <!-- Maven will append the version to the finalName (which is the name
-            given to the generated WAR, and hence the context root) -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/xml-dom4j/pom.xml b/xml-dom4j/pom.xml
index 9b9c37ede3..94376cfc8b 100644
--- a/xml-dom4j/pom.xml
+++ b/xml-dom4j/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -189,8 +188,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app
-            is deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
diff --git a/xml-jaxp/pom.xml b/xml-jaxp/pom.xml
index 4f84d0421e..58dcdefd7a 100644
--- a/xml-jaxp/pom.xml
+++ b/xml-jaxp/pom.xml
@@ -92,9 +92,8 @@
 
     <properties>
         <!-- Explicitly declaring the source encoding eliminates the following
-            message: -->
-        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-            resources, i.e. build is platform dependent! -->
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy 
+            filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- JBoss dependency versions -->
@@ -115,9 +114,6 @@
     <!-- NOTE: -->
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import. Any
-                dependencies from org.jboss.spec will have their version defined by this
-                BOM -->
             <!-- JBoss distributes a complete set of Java EE APIs including a Bill
                 of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
                 of artifacts. We use this here so that we always get the correct versions
@@ -178,8 +174,7 @@
     </dependencies>
 
     <build>
-        <!-- Set the name of the WAR, used as the context root when the app is
-            deployed -->
+        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>