diff --git a/pom.xml b/pom.xml
index a62a09747..b8b6965c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -633,7 +633,7 @@
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
-			<version>1.9.6</version>
+			<version>1.9.9.1</version>
 		</dependency>
 
 		<dependency>
@@ -1242,20 +1242,20 @@
 						</goals>
 						<configuration>
 							<target>
-								<mkdir dir="target/classes/sql/postgresql/" />
+								<mkdir dir="target/classes/sql/postgresql/"/>
 								<concat destfile="target/classes/sql/postgresql/import-postgresql.sql">
-									<fileset file="src/main/resources/sql/common/import-header.sql" />
-									<fileset file="src/main/resources/sql/common/import-domains.sql" />
-									<fileset file="src/main/resources/sql/common/import-quota.sql" />
-									<fileset file="src/main/resources/sql/common/import-welcome-messages.sql" />
-									<fileset file="src/main/resources/sql/common/import-functionalities.sql" />
-									<fileset file="src/main/resources/sql/common/import-mail-activation.sql" />
-									<fileset file="src/main/resources/sql/common/import_mail_structure.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql" />
-									<fileset file="src/main/resources/sql/common/import-settings.sql" />
-									<fileset file="src/main/resources/sql/common/import-footer.sql" />
+									<fileset file="src/main/resources/sql/common/import-header.sql"/>
+									<fileset file="src/main/resources/sql/common/import-domains.sql"/>
+									<fileset file="src/main/resources/sql/common/import-quota.sql"/>
+									<fileset file="src/main/resources/sql/common/import-welcome-messages.sql"/>
+									<fileset file="src/main/resources/sql/common/import-functionalities.sql"/>
+									<fileset file="src/main/resources/sql/common/import-mail-activation.sql"/>
+									<fileset file="src/main/resources/sql/common/import_mail_structure.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql"/>
+									<fileset file="src/main/resources/sql/common/import-settings.sql"/>
+									<fileset file="src/main/resources/sql/common/import-footer.sql"/>
 								</concat>
 							</target>
 						</configuration>
@@ -1268,13 +1268,13 @@
 						<phase>process-resources</phase>
 						<configuration>
 							<target>
-								<mkdir dir="target/classes/sql/postgresql/" />
+								<mkdir dir="target/classes/sql/postgresql/"/>
 								<concat destfile="target/classes/sql/postgresql/import-all-emails.sql">
-									<fileset file="src/main/resources/sql/common/import-header.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql" />
-									<fileset file="src/main/resources/sql/common/import-footer.sql" />
+									<fileset file="src/main/resources/sql/common/import-header.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql"/>
+									<fileset file="src/main/resources/sql/common/import-footer.sql"/>
 								</concat>
 							</target>
 						</configuration>
@@ -1287,11 +1287,11 @@
 						<phase>generate-test-sources</phase>
 						<configuration>
 							<target>
-								<mkdir dir="target/classes/sql/h2/" />
+								<mkdir dir="target/classes/sql/h2/"/>
 								<concat destfile="target/classes/sql/h2/import-all-emails.sql">
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql" />
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql"/>
 								</concat>
 							</target>
 						</configuration>
@@ -1304,14 +1304,14 @@
 						<phase>process-resources</phase>
 						<configuration>
 							<target>
-								<mkdir dir="target/classes/sql/postgresql/" />
+								<mkdir dir="target/classes/sql/postgresql/"/>
 								<concat destfile="target/classes/sql/postgresql/reset-default-emails-config.sql">
-									<fileset file="src/main/resources/sql/common/import-reset-default-emails-configuration-header.sql" />
-									<fileset file="src/main/resources/sql/common/import_mail_structure.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql" />
-									<fileset file="src/main/resources/sql/common/import-reset-default-emails-configuration-footer.sql" />
+									<fileset file="src/main/resources/sql/common/import-reset-default-emails-configuration-header.sql"/>
+									<fileset file="src/main/resources/sql/common/import_mail_structure.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql"/>
+									<fileset file="src/main/resources/sql/common/import-reset-default-emails-configuration-footer.sql"/>
 								</concat>
 							</target>
 						</configuration>
@@ -1324,13 +1324,13 @@
 						<phase>process-resources</phase>
 						<configuration>
 							<target>
-								<mkdir dir="target/classes/sql/postgresql/" />
+								<mkdir dir="target/classes/sql/postgresql/"/>
 								<concat destfile="target/classes/sql/postgresql/update-default-emails-config.sql">
-									<fileset file="src/main/resources/sql/common/import-update-default-emails-configuration-header.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql" />
-									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql" />
-									<fileset file="src/main/resources/sql/common/import-update-default-emails-configuration-footer.sql" />
+									<fileset file="src/main/resources/sql/common/import-update-default-emails-configuration-header.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_layout/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_content/*.sql"/>
+									<fileset file="src/main/resources/sql/common/mail_updates/mail_footer/*.sql"/>
+									<fileset file="src/main/resources/sql/common/import-update-default-emails-configuration-footer.sql"/>
 								</concat>
 							</target>
 						</configuration>
@@ -1590,7 +1590,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -1667,7 +1667,7 @@
 								<phase>compile</phase>
 								<configuration>
 									<target name="copySql">
-										<copy file="${basedir}/src/test/resources/DISABLED-springContext-datasource-integration.xml" tofile="${project.build.outputDirectory}/springContext-datasource.xml" overwrite="true" />
+										<copy file="${basedir}/src/test/resources/DISABLED-springContext-datasource-integration.xml" tofile="${project.build.outputDirectory}/springContext-datasource.xml" overwrite="true"/>
 									</target>
 								</configuration>
 								<goals>
@@ -1695,7 +1695,7 @@
 								<configuration>
 									<target name="copy-mongo-java-server">
 										<copy todir="${project.build.outputDirectory}/" overwrite="true" flatten="true">
-											<fileset dir="src/mongo-java-server/resources" />
+											<fileset dir="src/mongo-java-server/resources"/>
 										</copy>
 									</target>
 								</configuration>