Merge branch 'forms-boot14' into validation-boot14

Conflicts:
	src/main/java/com/naturalprogrammer/spring/tutorial/controllers/SignupController.java

Author: naturalprogrammer

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.2.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

src/main/java/com/naturalprogrammer/spring/tutorial/controllers/MailController.java

@@ -2,7 +2,6 @@
 
 import javax.mail.MessagingException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,7 +12,6 @@ public class MailController {
 
 	private MailSender mailSender;
 
-	@Autowired
 	public MailController(MailSender mailSender) {
 		this.mailSender = mailSender;
 	}

src/main/java/com/naturalprogrammer/spring/tutorial/controllers/SignupController.java

@@ -6,8 +6,9 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.naturalprogrammer.spring.tutorial.domain.User;
 
@@ -17,14 +18,14 @@ public class SignupController {
 
 	private static final Log log = LogFactory.getLog(SignupController.class);
 
-	@RequestMapping(method=RequestMethod.GET)
+    @GetMapping
 	public String signup(Model model) {
 
 		model.addAttribute(new User());
 		return "signup";
 	}
 
-	@RequestMapping(method=RequestMethod.POST)
+    @PostMapping
 	public String doSignup(@Validated User user, BindingResult result) {
 
 		if (result.hasErrors())

src/test/java/com/naturalprogrammer/spring/tutorial/NpSpringTutorialApplicationTests.java

@@ -2,13 +2,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NpSpringTutorialApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class NpSpringTutorialApplicationTests {
 
 	@Test