Drop back to Hibernate 5.0.9.Final

The upgrade to Hibernate 5.2.0.Final has provide to be too
problematic to live with. It requires Java 8, is incompatible with
a number of other projects in the Hibernate ecosystem, and it's
unclear for how long it will be maintained. We'd previously used
Hibernate 5.1.0.Final but its maintenance is also unclear with
Hibernate 5.1.1.Final being more than 3 months overdue.

This commit drops back to Hibernate 5.0.9.Final. This has a few
advantages:

- It's Java 7 compatible
- It's had some time to mature and should be reasonably free of
  regressions for those moving from 4.3.x
- It's used in both Wildfly and JBoss EAP so there's a fair chance
  that it will continue to be maintained.

Closes gh-6198

spring-boot-autoconfigure/pom.xml

@@ -257,7 +257,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-boot-dependencies/pom.xml

@@ -82,7 +82,7 @@
 		<h2.version>1.4.192</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
 		<hazelcast.version>3.6.3</hazelcast.version>
-		<hibernate.version>5.2.0.Final</hibernate.version>
+		<hibernate.version>5.0.9.Final</hibernate.version>
 		<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
 		<hikaricp.version>2.4.6</hikaricp.version>
 		<hikaricp-java6.version>2.3.13</hikaricp-java6.version>
@@ -1717,11 +1717,21 @@
 				<artifactId>hibernate-ehcache</artifactId>
 				<version>${hibernate.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate-entitymanager</artifactId>
+				<version>${hibernate.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<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>

spring-boot-devtools/pom.xml

@@ -51,7 +51,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-boot-docs/pom.xml

@@ -442,7 +442,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -2634,31 +2634,17 @@ http://spring.io/guides/gs/accessing-data-jpa/['`Accessing Data with JPA`'] guid
 http://spring.io and read the http://projects.spring.io/spring-data-jpa/[Spring Data JPA]
 and  http://hibernate.org/orm/documentation/[Hibernate] reference documentation.
 
+
 [NOTE]
 ====
-As of Hibernate 5.2, the `hibernate-entitymanager` module has been merged in
-`hibernate-core`. If you need to downgrade, you'll need to directly add the
-dependency yourself, for example:
-
-[source,xml,indent=0]
-----
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-data-jpa</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.hibernate</groupId>
-		<artifactId>hibernate-entitymanager</artifactId>
-		<version>${hibernate.version}</version>
-	</dependency>
-----
-
-As Hibernate does not bundle the `hibernate-entitymanager` and `hibernate-java8`
-artifacts anymore, Spring Boot doesn't provide dependency management for them.
+By default, Spring Boot uses Hibernate 5.0.x. However it's also possible to use 4.3.x
+or 5.2.x if you wish. Please refer to the
+{github-code}/spring-boot-samples/spring-boot-sample-hibernate4[Hibernate 4] and
+{github-code}/spring-boot-samples/spring-boot-sample-hibernate52[Hibernate 5.2] samples
+to see how to do so.
 ====
 
 
-
 [[boot-features-entity-classes]]
 ==== Entity Classes
 Traditionally, JPA '`Entity`' classes are specified in a `persistence.xml` file. With

spring-boot-samples/README.adoc

@@ -80,6 +80,9 @@ The following sample applications are provided:
 | link:spring-boot-sample-hibernate4[spring-boot-sample-hibernate4]
 | Demonstrates how to use Hibernate 4
 
+| link:spring-boot-sample-hibernate4[spring-boot-sample-hibernate52]
+| Demonstrates how to use Hibernate 5.2
+
 | link:spring-boot-sample-hornetq[spring-boot-sample-hornetq]
 | Message-oriented application using HornetQ
 

spring-boot-samples/pom.xml

@@ -46,6 +46,7 @@
 		<module>spring-boot-sample-flyway</module>
 		<module>spring-boot-sample-hateoas</module>
 		<module>spring-boot-sample-hibernate4</module>
+		<module>spring-boot-sample-hibernate52</module>
 		<module>spring-boot-sample-hornetq</module>
 		<module>spring-boot-sample-hypermedia</module>
 		<module>spring-boot-sample-hypermedia-gson</module>

spring-boot-samples/spring-boot-sample-hibernate4/pom.xml

@@ -24,11 +24,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

spring-boot-samples/spring-boot-sample-hibernate4/src/test/java/sample/hibernate4/SampleDataJpaApplicationTests.java → spring-boot-samples/spring-boot-sample-hibernate4/src/test/java/sample/hibernate4/SampleHibernate4ApplicationTests.java

@@ -51,7 +51,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 		"spring.datasource.jmx-enabled:true" })
 @ActiveProfiles("scratch")
 // Separate profile for web tests to avoid clashing databases
-public class SampleDataJpaApplicationTests {
+public class SampleHibernate4ApplicationTests {
 
 	@Autowired
 	private WebApplicationContext context;

spring-boot-samples/spring-boot-sample-hibernate52/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<!-- Your own application should inherit from spring-boot-starter-parent -->
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-samples</artifactId>
+		<version>1.4.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-sample-hibernate52</artifactId>
+	<name>Spring Boot Hibernate 5.2 Sample</name>
+	<description>Spring Boot Hibernate 5.2 Sample</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+		<hibernate.version>5.2.0.Final</hibernate.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-entitymanager</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>springloaded</artifactId>
+						<version>${spring-loaded.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+</project>

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/SampleHibernate52Application.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SampleHibernate52Application {
+
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(SampleHibernate52Application.class, args);
+	}
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/City.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class City implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@Column(nullable = false)
+	private String name;
+
+	@Column(nullable = false)
+	private String state;
+
+	@Column(nullable = false)
+	private String country;
+
+	@Column(nullable = false)
+	private String map;
+
+	protected City() {
+	}
+
+	public City(String name, String country) {
+		super();
+		this.name = name;
+		this.country = country;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getState() {
+		return this.state;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public String getMap() {
+		return this.map;
+	}
+
+	@Override
+	public String toString() {
+		return getName() + "," + getState() + "," + getCountry();
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/Hotel.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+import org.hibernate.annotations.NaturalId;
+
+@Entity
+public class Hotel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@ManyToOne(optional = false)
+	@NaturalId
+	private City city;
+
+	@Column(nullable = false)
+	@NaturalId
+	private String name;
+
+	@Column(nullable = false)
+	private String address;
+
+	@Column(nullable = false)
+	private String zip;
+
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "hotel")
+	private Set<Review> reviews;
+
+	protected Hotel() {
+	}
+
+	public Hotel(City city, String name) {
+		this.city = city;
+		this.name = name;
+	}
+
+	public City getCity() {
+		return this.city;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getAddress() {
+		return this.address;
+	}
+
+	public String getZip() {
+		return this.zip;
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/HotelSummary.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+public interface HotelSummary {
+
+	City getCity();
+
+	String getName();
+
+	Double getAverageRating();
+
+	default Integer getAverageRatingRounded() {
+		return getAverageRating() == null ? null : (int) Math.round(getAverageRating());
+	}
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/Rating.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+public enum Rating {
+	TERRIBLE, POOR, AVERAGE, GOOD, EXCELLENT,
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/RatingCount.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+public interface RatingCount {
+
+	Rating getRating();
+
+	long getCount();
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/Review.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.springframework.util.Assert;
+
+@Entity
+public class Review implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@ManyToOne(optional = false)
+	private Hotel hotel;
+
+	@Column(nullable = false, name = "idx")
+	private int index;
+
+	@Column(nullable = false)
+	@Enumerated(EnumType.ORDINAL)
+	private Rating rating;
+
+	@Column(name = "CHECK_IN_DATE", nullable = false)
+	@Temporal(TemporalType.DATE)
+	private Date checkInDate;
+
+	@Column(name = "TRIP_TYPE", nullable = false)
+	@Enumerated(EnumType.ORDINAL)
+	private TripType tripType;
+
+	@Column(nullable = false)
+	private String title;
+
+	@Column(nullable = false, length = 5000)
+	private String details;
+
+	protected Review() {
+	}
+
+	public Review(Hotel hotel, int index, ReviewDetails details) {
+		Assert.notNull(hotel, "Hotel must not be null");
+		Assert.notNull(details, "Details must not be null");
+		this.hotel = hotel;
+		this.index = index;
+		this.rating = details.getRating();
+		this.checkInDate = details.getCheckInDate();
+		this.tripType = details.getTripType();
+		this.title = details.getTitle();
+		this.details = details.getDetails();
+	}
+
+	public Hotel getHotel() {
+		return this.hotel;
+	}
+
+	public int getIndex() {
+		return this.index;
+	}
+
+	public Rating getRating() {
+		return this.rating;
+	}
+
+	public void setRating(Rating rating) {
+		this.rating = rating;
+	}
+
+	public Date getCheckInDate() {
+		return this.checkInDate;
+	}
+
+	public void setCheckInDate(Date checkInDate) {
+		this.checkInDate = checkInDate;
+	}
+
+	public TripType getTripType() {
+		return this.tripType;
+	}
+
+	public void setTripType(TripType tripType) {
+		this.tripType = tripType;
+	}
+
+	public String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDetails() {
+		return this.details;
+	}
+
+	public void setDetails(String details) {
+		this.details = details;
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/ReviewDetails.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ReviewDetails implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Rating rating;
+
+	private Date checkInDate;
+
+	private TripType tripType;
+
+	private String title;
+
+	private String details;
+
+	public ReviewDetails() {
+	}
+
+	public Rating getRating() {
+		return this.rating;
+	}
+
+	public void setRating(Rating rating) {
+		this.rating = rating;
+	}
+
+	public Date getCheckInDate() {
+		return this.checkInDate;
+	}
+
+	public void setCheckInDate(Date checkInDate) {
+		this.checkInDate = checkInDate;
+	}
+
+	public TripType getTripType() {
+		return this.tripType;
+	}
+
+	public void setTripType(TripType tripType) {
+		this.tripType = tripType;
+	}
+
+	public String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDetails() {
+		return this.details;
+	}
+
+	public void setDetails(String details) {
+		this.details = details;
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/TripType.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.domain;
+
+public enum TripType {
+	BUSINESS, COUPLES, FAMILY, FRIENDS, SOLO
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/CityRepository.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.City;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.Repository;
+
+interface CityRepository extends Repository<City, Long> {
+
+	Page<City> findAll(Pageable pageable);
+
+	Page<City> findByNameContainingAndCountryContainingAllIgnoringCase(String name,
+			String country, Pageable pageable);
+
+	City findByNameAndCountryAllIgnoringCase(String name, String country);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/CitySearchCriteria.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import java.io.Serializable;
+
+import org.springframework.util.Assert;
+
+public class CitySearchCriteria implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private String name;
+
+	public CitySearchCriteria() {
+	}
+
+	public CitySearchCriteria(String name) {
+		Assert.notNull(name, "Name must not be null");
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/CityService.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.HotelSummary;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface CityService {
+
+	Page<City> findCities(CitySearchCriteria criteria, Pageable pageable);
+
+	City getCity(String name, String country);
+
+	Page<HotelSummary> getHotels(City city, Pageable pageable);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/CityServiceImpl.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.HotelSummary;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+@Component("cityService")
+@Transactional
+class CityServiceImpl implements CityService {
+
+	private final CityRepository cityRepository;
+
+	private final HotelRepository hotelRepository;
+
+	public CityServiceImpl(CityRepository cityRepository,
+			HotelRepository hotelRepository) {
+		this.cityRepository = cityRepository;
+		this.hotelRepository = hotelRepository;
+	}
+
+	@Override
+	public Page<City> findCities(CitySearchCriteria criteria, Pageable pageable) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+		String name = criteria.getName();
+
+		if (!StringUtils.hasLength(name)) {
+			return this.cityRepository.findAll(null);
+		}
+
+		String country = "";
+		int splitPos = name.lastIndexOf(",");
+
+		if (splitPos >= 0) {
+			country = name.substring(splitPos + 1);
+			name = name.substring(0, splitPos);
+		}
+
+		return this.cityRepository
+				.findByNameContainingAndCountryContainingAllIgnoringCase(name.trim(),
+						country.trim(), pageable);
+	}
+
+	@Override
+	public City getCity(String name, String country) {
+		Assert.notNull(name, "Name must not be null");
+		Assert.notNull(country, "Country must not be null");
+		return this.cityRepository.findByNameAndCountryAllIgnoringCase(name, country);
+	}
+
+	@Override
+	public Page<HotelSummary> getHotels(City city, Pageable pageable) {
+		Assert.notNull(city, "City must not be null");
+		return this.hotelRepository.findByCity(city, pageable);
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/HotelRepository.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import java.util.List;
+
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.Hotel;
+import sample.hibernate52.domain.HotelSummary;
+import sample.hibernate52.domain.RatingCount;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+
+interface HotelRepository extends Repository<Hotel, Long> {
+
+	Hotel findByCityAndName(City city, String name);
+
+	@Query("select h.city as city, h.name as name, avg(r.rating) as averageRating "
+			+ "from Hotel h left outer join h.reviews r where h.city = ?1 group by h")
+	Page<HotelSummary> findByCity(City city, Pageable pageable);
+
+	@Query("select r.rating as rating, count(r) as count "
+			+ "from Review r where r.hotel = ?1 group by r.rating order by r.rating DESC")
+	List<RatingCount> findRatingCounts(Hotel hotel);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/HotelService.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.Hotel;
+import sample.hibernate52.domain.Review;
+import sample.hibernate52.domain.ReviewDetails;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface HotelService {
+
+	Hotel getHotel(City city, String name);
+
+	Page<Review> getReviews(Hotel hotel, Pageable pageable);
+
+	Review getReview(Hotel hotel, int index);
+
+	Review addReview(Hotel hotel, ReviewDetails details);
+
+	ReviewsSummary getReviewSummary(Hotel hotel);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/HotelServiceImpl.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.Hotel;
+import sample.hibernate52.domain.Rating;
+import sample.hibernate52.domain.RatingCount;
+import sample.hibernate52.domain.Review;
+import sample.hibernate52.domain.ReviewDetails;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+
+@Component("hotelService")
+@Transactional
+class HotelServiceImpl implements HotelService {
+
+	private final HotelRepository hotelRepository;
+
+	private final ReviewRepository reviewRepository;
+
+	public HotelServiceImpl(HotelRepository hotelRepository,
+			ReviewRepository reviewRepository) {
+		this.hotelRepository = hotelRepository;
+		this.reviewRepository = reviewRepository;
+	}
+
+	@Override
+	public Hotel getHotel(City city, String name) {
+		Assert.notNull(city, "City must not be null");
+		Assert.hasLength(name, "Name must not be empty");
+		return this.hotelRepository.findByCityAndName(city, name);
+	}
+
+	@Override
+	public Page<Review> getReviews(Hotel hotel, Pageable pageable) {
+		Assert.notNull(hotel, "Hotel must not be null");
+		return this.reviewRepository.findByHotel(hotel, pageable);
+	}
+
+	@Override
+	public Review getReview(Hotel hotel, int reviewNumber) {
+		Assert.notNull(hotel, "Hotel must not be null");
+		return this.reviewRepository.findByHotelAndIndex(hotel, reviewNumber);
+	}
+
+	@Override
+	public Review addReview(Hotel hotel, ReviewDetails details) {
+		Review review = new Review(hotel, 1, details);
+		return this.reviewRepository.save(review);
+	}
+
+	@Override
+	public ReviewsSummary getReviewSummary(Hotel hotel) {
+		List<RatingCount> ratingCounts = this.hotelRepository.findRatingCounts(hotel);
+		return new ReviewsSummaryImpl(ratingCounts);
+	}
+
+	private static class ReviewsSummaryImpl implements ReviewsSummary {
+
+		private final Map<Rating, Long> ratingCount;
+
+		public ReviewsSummaryImpl(List<RatingCount> ratingCounts) {
+			this.ratingCount = new HashMap<Rating, Long>();
+			for (RatingCount ratingCount : ratingCounts) {
+				this.ratingCount.put(ratingCount.getRating(), ratingCount.getCount());
+			}
+		}
+
+		@Override
+		public long getNumberOfReviewsWithRating(Rating rating) {
+			Long count = this.ratingCount.get(rating);
+			return count == null ? 0 : count;
+		}
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/ReviewRepository.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.Hotel;
+import sample.hibernate52.domain.Review;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.Repository;
+
+interface ReviewRepository extends Repository<Review, Long> {
+
+	Page<Review> findByHotel(Hotel hotel, Pageable pageable);
+
+	Review findByHotelAndIndex(Hotel hotel, int index);
+
+	Review save(Review review);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/ReviewsSummary.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.service;
+
+import sample.hibernate52.domain.Rating;
+
+public interface ReviewsSummary {
+
+	long getNumberOfReviewsWithRating(Rating rating);
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/web/SampleController.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52.web;
+
+import sample.hibernate52.service.CityService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class SampleController {
+
+	@Autowired
+	private CityService cityService;
+
+	@GetMapping("/")
+	@ResponseBody
+	@Transactional(readOnly = true)
+	public String helloWorld() {
+		return this.cityService.getCity("Bath", "UK").getName();
+	}
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/main/resources/application.properties

+spring.h2.console.enabled=true
+
+logging.level.org.hibernate.SQL=debug

spring-boot-samples/spring-boot-sample-hibernate52/src/test/java/sample/hibernate52/SampleHibernate52ApplicationTests.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.hibernate52;
+
+import java.lang.management.ManagementFactory;
+
+import javax.management.ObjectName;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * Integration test to run the application.
+ *
+ * @author Oliver Gierke
+ * @author Dave Syer
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+// Enable JMX so we can test the MBeans (you can't do this in a properties file)
+@TestPropertySource(properties = { "spring.jmx.enabled:true",
+		"spring.datasource.jmx-enabled:true" })
+@ActiveProfiles("scratch")
+// Separate profile for web tests to avoid clashing databases
+public class SampleHibernate52ApplicationTests {
+
+	@Autowired
+	private WebApplicationContext context;
+
+	private MockMvc mvc;
+
+	@Before
+	public void setUp() {
+		this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build();
+	}
+
+	@Test
+	public void testHome() throws Exception {
+
+		this.mvc.perform(get("/")).andExpect(status().isOk())
+				.andExpect(content().string("Bath"));
+	}
+
+	@Test
+	public void testJmx() throws Exception {
+		assertThat(ManagementFactory.getPlatformMBeanServer()
+				.queryMBeans(new ObjectName("jpa.sample:type=ConnectionPool,*"), null))
+						.hasSize(1);
+	}
+
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/test/java/sample/hibernate52/service/CityRepositoryIntegrationTests.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.hibernate52.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import sample.hibernate52.domain.City;
+import sample.hibernate52.service.CityRepository;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link CityRepository}.
+ *
+ * @author Oliver Gierke
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class CityRepositoryIntegrationTests {
+
+	@Autowired
+	CityRepository repository;
+
+	@Test
+	public void findsFirstPageOfCities() {
+
+		Page<City> cities = this.repository.findAll(new PageRequest(0, 10));
+		assertThat(cities.getTotalElements()).isGreaterThan(20L);
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/test/java/sample/hibernate52/service/HotelRepositoryIntegrationTests.java

+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.hibernate52.service;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import sample.hibernate52.domain.City;
+import sample.hibernate52.domain.Hotel;
+import sample.hibernate52.domain.HotelSummary;
+import sample.hibernate52.domain.Rating;
+import sample.hibernate52.domain.RatingCount;
+import sample.hibernate52.service.CityRepository;
+import sample.hibernate52.service.HotelRepository;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link HotelRepository}.
+ *
+ * @author Oliver Gierke
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class HotelRepositoryIntegrationTests {
+
+	@Autowired
+	CityRepository cityRepository;
+	@Autowired
+	HotelRepository repository;
+
+	@Test
+	public void executesQueryMethodsCorrectly() {
+		City city = this.cityRepository
+				.findAll(new PageRequest(0, 1, Direction.ASC, "name")).getContent()
+				.get(0);
+		assertThat(city.getName()).isEqualTo("Atlanta");
+
+		Page<HotelSummary> hotels = this.repository.findByCity(city,
+				new PageRequest(0, 10, Direction.ASC, "name"));
+		Hotel hotel = this.repository.findByCityAndName(city,
+				hotels.getContent().get(0).getName());
+		assertThat(hotel.getName()).isEqualTo("Doubletree");
+
+		List<RatingCount> counts = this.repository.findRatingCounts(hotel);
+		assertThat(counts).hasSize(1);
+		assertThat(counts.get(0).getRating()).isEqualTo(Rating.AVERAGE);
+		assertThat(counts.get(0).getCount()).isGreaterThan(1L);
+	}
+}

spring-boot-samples/spring-boot-sample-hibernate52/src/test/resources/application-scratch.properties

+spring.datasource.name=scratchdb
+spring.jmx.default-domain=jpa.sample
\ No newline at end of file

spring-boot-samples/spring-boot-sample-jpa/pom.xml

@@ -25,7 +25,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>

spring-boot-starters/spring-boot-starter-data-jpa/pom.xml

@@ -40,6 +40,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-jta_1.1_spec</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>javax.transaction-api</artifactId>

spring-boot-test-autoconfigure/pom.xml

@@ -56,7 +56,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.jboss.spec.javax.transaction</groupId>

spring-boot/pom.xml

@@ -171,7 +171,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>