From 772066ccce055e627aa4033b5cc8631956a8bdb6 Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Fri, 25 Mar 2016 20:18:21 +0100
Subject: [PATCH] Spring Emails

---
 .../spring-configuration/spring-configuration.xml  |  9 ++++---
 SpringJava/Emails/spring-emails/pom.xml            | 30 +++++++++++++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/SpringJava/Emails/spring-emails-web-client/src/main/resources/spring-configuration/spring-configuration.xml b/SpringJava/Emails/spring-emails-web-client/src/main/resources/spring-configuration/spring-configuration.xml
index 2bd1433..fa22293 100644
--- a/SpringJava/Emails/spring-emails-web-client/src/main/resources/spring-configuration/spring-configuration.xml
+++ b/SpringJava/Emails/spring-emails-web-client/src/main/resources/spring-configuration/spring-configuration.xml
@@ -14,14 +14,17 @@
                       http://www.springframework.org/schema/task
         			  http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
-
-    <!-- Searches for beans in packages (instead of XML configuration we can use in this way annotations like @Service, @Endpoint, etc, etc)  -->
+    <!--
+    	Searches for beans in packages (instead of XML configuration we can use
+    	in this way annotations like @Service, @Endpoint, etc, etc)
+    -->
     <context:component-scan base-package="de.spring.emails"/>
     
     
     <!--  Enable Asynchronous Spring Tasks -->
 	<task:annotation-driven />
-	<task:executor id="asyncEmailSender" pool-size="0-2" keep-alive="60" queue-capacity="2" rejection-policy="CALLER_RUNS" />
+	<task:executor id="asyncEmailSender" pool-size="0-2" keep-alive="60"
+		queue-capacity="2" rejection-policy="CALLER_RUNS" />
 	
 
 	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
diff --git a/SpringJava/Emails/spring-emails/pom.xml b/SpringJava/Emails/spring-emails/pom.xml
index 63bc9ef..bf9c1a3 100644
--- a/SpringJava/Emails/spring-emails/pom.xml
+++ b/SpringJava/Emails/spring-emails/pom.xml
@@ -95,7 +95,7 @@
 				<artifactId>spring-context</artifactId>
 				<version>${spring.version}</version>
 				<!--
-					Required dependency for getting rid of commons logging and use my 
+					Required dependency for getting rid of commons logging and use my
 					own logging library (in my case I decided to use log4j 2 under slf4j)
 				-->
 				<exclusions>
@@ -111,7 +111,7 @@
 				<artifactId>spring-webmvc</artifactId>
 				<version>${spring.version}</version>
 				<!--
-					Required dependency for getting rid of commons logging and use my 
+					Required dependency for getting rid of commons logging and use my
 					own logging library (in my case I decided to use log4j 2 under slf4j)
 				-->
 				<exclusions>
@@ -125,6 +125,16 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-oxm</artifactId>
 				<version>${spring.version}</version>
+				<!--
+					Required dependency for getting rid of commons logging and use my
+					own logging library (in my case I decided to use log4j 2 under slf4j)
+				-->
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			
 			
@@ -168,6 +178,16 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-context-support</artifactId>
 				<version>${spring.version}</version>
+				<!--
+					Required dependency for getting rid of commons logging and use my
+					own logging library (in my case I decided to use log4j 2 under slf4j)
+				-->
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.velocity</groupId>
@@ -194,8 +214,10 @@
 				<artifactId>spring-test</artifactId>
 				<version>${spring.version}</version>
 				<scope>test</scope>
-				<!-- Required dependency for getting rid of commons logging and use my 
-					own logging library (in my case I decided to use log4j 2 under slf4j) -->
+				<!--
+					Required dependency for getting rid of commons logging and use my
+					own logging library (in my case I decided to use log4j 2 under slf4j)
+				-->
 				<exclusions>
 					<exclusion>
 						<groupId>commons-logging</groupId>
-- 
2.1.4