diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 5ba82115f085..af26b89a21c7 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1455,6 +1455,11 @@
 				<artifactId>hibernate-envers</artifactId>
 				<version>${hibernate.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate-java8</artifactId>
+				<version>${hibernate.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-jpamodelgen</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
index 05c543be7e68..5de53ab00f1d 100755
--- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
@@ -55,4 +55,13 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>hibernate5</id>
+			<properties>
+				<hibernate.version>5.0.1.Final</hibernate.version>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties
index 6a78bc896200..d12ab6e5374b 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties
@@ -1,3 +1,6 @@
 spring.h2.console.enabled=true
 
-logging.level.org.hibernate.SQL=debug
\ No newline at end of file
+logging.level.org.hibernate.SQL=debug
+
+
+spring.jpa.properties.hibernate.id.new_generator_mappings=false
\ No newline at end of file