From bc8f5ab8c485652880a8856da36daec6445cf377 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 14 Jul 2019 01:32:22 +0530
Subject: [PATCH 1/2] [BAEL-11603] - Fixed tests in spring-mvc-java module

---
 spring-mvc-java/pom.xml                                   | 7 ++++++-
 .../src/test/java/com/baeldung/htmlunit/TestConfig.java   | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index e5dd5ad9e1..cb16e91bc4 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -144,6 +144,11 @@
             <artifactId>spring-messaging</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${javax.el.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -290,7 +295,7 @@
         <!-- excel -->
         <poi.version>3.16-beta1</poi.version>
 
-        <javax.el.version>3.0.1-b06</javax.el.version>
+        <javax.el.version>3.0.1-b09</javax.el.version>
 		
     </properties>
 
diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
index 529879fada..8c8a2f5b62 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
+++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
@@ -13,6 +13,8 @@ import org.thymeleaf.spring4.SpringTemplateEngine;
 import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
+import com.baeldung.excel.ExcelPOIHelper;
+
 @Configuration
 @EnableWebMvc
 @ComponentScan(basePackages = { "com.baeldung.web.controller" })
@@ -44,5 +46,9 @@ public class TestConfig implements WebMvcConfigurer {
         templateEngine.setTemplateResolver(templateResolver());
         return templateEngine;
     }
-
+    
+    @Bean
+    public ExcelPOIHelper excelPOIHelper() {
+        return new ExcelPOIHelper();
+    }
 }

From da86b78fa5a54f850c5c24bac02cc830a99ca820 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Fri, 19 Jul 2019 00:10:31 +0530
Subject: [PATCH 2/2] [BAEL-11603] - Moved MessageController to a child package
 and removed ExcelPOIHelper bean definition from TestConfig

---
 .../web/controller/{ => message}/MessageController.java  | 2 +-
 .../src/test/java/com/baeldung/htmlunit/TestConfig.java  | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)
 rename spring-mvc-java/src/main/java/com/baeldung/web/controller/{ => message}/MessageController.java (94%)

diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
similarity index 94%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java
rename to spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
index 111bf023f7..fdb0d75530 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
@@ -1,4 +1,4 @@
-package com.baeldung.web.controller;
+package com.baeldung.web.controller.message;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
index 8c8a2f5b62..75efd57ae4 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
+++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
@@ -13,11 +13,9 @@ import org.thymeleaf.spring4.SpringTemplateEngine;
 import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
-import com.baeldung.excel.ExcelPOIHelper;
-
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.web.controller" })
+@ComponentScan(basePackages = { "com.baeldung.web.controller.message" })
 public class TestConfig implements WebMvcConfigurer {
 
     @Autowired
@@ -46,9 +44,4 @@ public class TestConfig implements WebMvcConfigurer {
         templateEngine.setTemplateResolver(templateResolver());
         return templateEngine;
     }
-    
-    @Bean
-    public ExcelPOIHelper excelPOIHelper() {
-        return new ExcelPOIHelper();
-    }
 }