diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml
new file mode 100644
index 00000000000..ba769821114
--- /dev/null
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glassfish-web-app error-url="">
+	<class-loader delegate="false"/>
+</glassfish-web-app>
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-json/pom.xml b/spring-boot-starters/spring-boot-starter-json/pom.xml
index 99d1d7c51ea..1129d86bf25 100644
--- a/spring-boot-starters/spring-boot-starter-json/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-json/pom.xml
@@ -22,6 +22,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jdk8</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>