diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml
index 8f78469989..b15c18f991 100644
--- a/spring-jms/pom.xml
+++ b/spring-jms/pom.xml
@@ -26,6 +26,12 @@
 			<artifactId>activemq-all</artifactId>
 			<version>${activemq.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -36,8 +42,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.2</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>1.8</source>
+						<target>1.8</target>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -52,6 +58,16 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<finalName>spring-jms</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>spring-jms</finalName>
 	</build>
 </project>
\ No newline at end of file
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
index 8751b42ff8..1ef3902a31 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
@@ -1,16 +1,11 @@
 package com.baeldung.spring.jms;
 
+import org.springframework.jms.core.JmsTemplate;
+
+import javax.jms.Queue;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.Session;
-
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
 public class SampleJmsMessageSender {
 
     private JmsTemplate jmsTemplate;
@@ -25,16 +20,12 @@ public class SampleJmsMessageSender {
     }
 
     public void simpleSend() {
-        this.jmsTemplate.send(this.queue, new MessageCreator() {
-            public Message createMessage(Session session) throws JMSException {
-                return session.createTextMessage("hello queue world");
-            }
-        });
+        jmsTemplate.send(queue, s -> s.createTextMessage("hello queue world"));
     }
 
     public void sendMessage(final Employee employee) {
         System.out.println("Jms Message Sender : " + employee);
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("name", employee.getName());
         map.put("age", employee.getAge());
         this.jmsTemplate.convertAndSend(map);
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
index 3ad4d70829..eb9d51160d 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
@@ -1,13 +1,12 @@
 package com.baeldung.spring.jms;
 
-import java.util.Map;
+import org.springframework.jms.core.JmsTemplate;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
-
-import org.springframework.jms.core.JmsTemplate;
+import java.util.Map;
 
 public class SampleListener implements MessageListener {
 
@@ -31,7 +30,6 @@ public class SampleListener implements MessageListener {
 
     public Employee receiveMessage() throws JMSException {
         Map map = (Map) getJmsTemplate().receiveAndConvert();
-        Employee employee = new Employee((String) map.get("name"), (Integer) map.get("age"));
-        return employee;
+        return new Employee((String) map.get("name"), (Integer) map.get("age"));
     }
 }
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
index c61cd5bc89..368a62841f 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
@@ -1,13 +1,13 @@
 package com.baeldung.spring.jms;
 
+import org.springframework.jms.support.converter.MessageConversionException;
+import org.springframework.jms.support.converter.MessageConverter;
+
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 import javax.jms.Session;
 
-import org.springframework.jms.support.converter.MessageConversionException;
-import org.springframework.jms.support.converter.MessageConverter;
-
 public class SampleMessageConverter implements MessageConverter {
 
     public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
@@ -20,8 +20,7 @@ public class SampleMessageConverter implements MessageConverter {
 
     public Object fromMessage(Message message) throws JMSException, MessageConversionException {
         MapMessage mapMessage = (MapMessage) message;
-        Employee employee = new Employee(mapMessage.getString("name"), mapMessage.getInt("age"));
-        return employee;
+        return new Employee(mapMessage.getString("name"), mapMessage.getInt("age"));
     }
 
 }
diff --git a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java
similarity index 78%
rename from spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java
rename to spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java
index aceb551563..439bc6caad 100644
--- a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java
+++ b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java
@@ -1,25 +1,25 @@
-package com.baeldung.spring.jms;
-
-import com.baeldung.spring.jms.SampleJmsMessageSender;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class DefaultTextMessageSenderTest {
-
-    private static SampleJmsMessageSender messageProducer;
-
-    @SuppressWarnings("resource")
-    @BeforeClass
-    public static void setUp() {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" });
-        messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender");
-    }
-
-    @Test
-    public void testSimpleSend() {
-        messageProducer.simpleSend();
-    }
-
-}
+package com.baeldung.spring.jms;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class DefaultTextMessageSenderTest {
+
+    private static SampleJmsMessageSender messageProducer;
+
+    @SuppressWarnings("resource")
+    @BeforeClass
+    public static void setUp() {
+        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+          "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml");
+        messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender");
+    }
+
+    @Test
+    public void testSimpleSend() {
+        messageProducer.simpleSend();
+    }
+
+}
diff --git a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
similarity index 75%
rename from spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
rename to spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
index d649938533..da9bb0294d 100644
--- a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
+++ b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java
@@ -1,26 +1,25 @@
-package com.baeldung.spring.jms;
-
-import com.baeldung.spring.jms.Employee;
-import com.baeldung.spring.jms.SampleJmsMessageSender;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class MapMessageConvertAndSendTest {
-
-    private static SampleJmsMessageSender messageProducer;
-
-    @SuppressWarnings("resource")
-    @BeforeClass
-    public static void setUp() {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" });
-        messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender");
-    }
-
-    @Test
-    public void testSendMessage() {
-        messageProducer.sendMessage(new Employee("JavaDeveloper2", 22));
-    }
-
-}
+package com.baeldung.spring.jms;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class MapMessageConvertAndSendTest {
+
+    private static SampleJmsMessageSender messageProducer;
+
+    @SuppressWarnings("resource")
+    @BeforeClass
+    public static void setUp() {
+        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+          "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml");
+        messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender");
+    }
+
+    @Test
+    public void testSendMessage() {
+        messageProducer.sendMessage(new Employee("JavaDeveloper2", 22));
+    }
+
+}