Skip to content

Commit 1c789f1

Browse files
vpavicsnicoll
authored andcommitted
Remove dependency management for hibernate-entitymanager
Closes gh-8433
1 parent 9c88ba3 commit 1c789f1

File tree

9 files changed

+6
-30
lines changed

9 files changed

+6
-30
lines changed

spring-boot-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
</dependency>
282282
<dependency>
283283
<groupId>org.hibernate</groupId>
284-
<artifactId>hibernate-entitymanager</artifactId>
284+
<artifactId>hibernate-core</artifactId>
285285
<optional>true</optional>
286286
</dependency>
287287
<dependency>

spring-boot-dependencies/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,17 +1678,6 @@
16781678
<artifactId>hibernate-ehcache</artifactId>
16791679
<version>${hibernate.version}</version>
16801680
</dependency>
1681-
<dependency>
1682-
<groupId>org.hibernate</groupId>
1683-
<artifactId>hibernate-entitymanager</artifactId>
1684-
<version>${hibernate.version}</version>
1685-
<exclusions>
1686-
<exclusion>
1687-
<groupId>xml-apis</groupId>
1688-
<artifactId>xml-apis</artifactId>
1689-
</exclusion>
1690-
</exclusions>
1691-
</dependency>
16921681
<dependency>
16931682
<groupId>org.hibernate</groupId>
16941683
<artifactId>hibernate-envers</artifactId>

spring-boot-devtools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>org.hibernate</groupId>
54-
<artifactId>hibernate-entitymanager</artifactId>
54+
<artifactId>hibernate-core</artifactId>
5555
<optional>true</optional>
5656
</dependency>
5757
<dependency>

spring-boot-docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
</dependency>
441441
<dependency>
442442
<groupId>org.hibernate</groupId>
443-
<artifactId>hibernate-entitymanager</artifactId>
443+
<artifactId>hibernate-core</artifactId>
444444
<optional>true</optional>
445445
</dependency>
446446
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dependency>
3131
<dependency>
3232
<groupId>org.hibernate</groupId>
33-
<artifactId>hibernate-entitymanager</artifactId>
33+
<artifactId>hibernate-core</artifactId>
3434
</dependency>
3535
<!-- Runtime -->
3636
<dependency>

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@
4242
</exclusion>
4343
</exclusions>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.hibernate</groupId>
47-
<artifactId>hibernate-entitymanager</artifactId>
48-
<exclusions>
49-
<exclusion>
50-
<artifactId>
51-
jboss-transaction-api_1.2_spec
52-
</artifactId>
53-
<groupId>org.jboss.spec.javax.transaction</groupId>
54-
</exclusion>
55-
</exclusions>
56-
</dependency>
5745
<dependency>
5846
<groupId>javax.transaction</groupId>
5947
<artifactId>javax.transaction-api</artifactId>

spring-boot-test-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dependency>
6262
<dependency>
6363
<groupId>org.hibernate</groupId>
64-
<artifactId>hibernate-entitymanager</artifactId>
64+
<artifactId>hibernate-core</artifactId>
6565
<exclusions>
6666
<exclusion>
6767
<groupId>org.jboss.spec.javax.transaction</groupId>

spring-boot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
</dependency>
162162
<dependency>
163163
<groupId>org.hibernate</groupId>
164-
<artifactId>hibernate-entitymanager</artifactId>
164+
<artifactId>hibernate-core</artifactId>
165165
<optional>true</optional>
166166
</dependency>
167167
<dependency>

spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TldSkipPatterns.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ final class TldSkipPatterns {
8686
patterns.add("ehcache-core-*.jar");
8787
patterns.add("hibernate-core-*.jar");
8888
patterns.add("hibernate-commons-annotations-*.jar");
89-
patterns.add("hibernate-entitymanager-*.jar");
9089
patterns.add("hibernate-jpa-2.1-api-*.jar");
9190
patterns.add("hibernate-validator-*.jar");
9291
patterns.add("hsqldb-*.jar");

0 commit comments

Comments
 (0)