diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index a50f70c3d9..01ab595b25 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -211,16 +211,6 @@ false - - gradle - http://repo.gradle.org/gradle/libs-releases-local - - true - - - false - - diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml index 6270c866fe..d385e76b02 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml @@ -22,6 +22,10 @@ org.apache.tomcat.embed tomcat-embed-jasper + + javax.servlet + jstl + diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java index 9554156fb3..5cda29db81 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java @@ -1,5 +1,8 @@ package org.springframework.boot.sample.jsp; +import java.util.Date; +import java.util.Map; + import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -7,7 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; public class WelcomeController { @RequestMapping("/") - public String welcome() { + public String welcome(Map model) { + model.put("time", new Date()); return "welcome"; } diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp index eaf9903ddc..53402dc8a3 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,12 +1,16 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + - ${springUrl} + Spring URL: ${springUrl} at ${time} +
+ JSTL URL: ${url} diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml index 000ee62414..8cd221a46d 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml @@ -68,4 +68,16 @@
+ + + gradle + http://repo.gradle.org/gradle/libs-releases-local + + true + + + false + + +