Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8433 from vpavic:polish-hibernate-deps

Browse Source 
* pr/8433:
  Remove dependency management for `hibernate-entitymanager`
This commit is contained in:
Stephane Nicoll
2017-03-02 18:32:01 +01:00
parent 9c88ba3b90 1c789f1a8d
commit c64bc2accf
9 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/pom.xml
View File

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

11
spring-boot-dependencies/pom.xml
View File

@@ -1678,17 +1678,6 @@
<artifactId>hibernate-ehcache</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>

2
spring-boot-devtools/pom.xml
View File

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

2
spring-boot-docs/pom.xml
View File

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

2
spring-boot-samples/spring-boot-sample-jpa/pom.xml
View File

@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
</dependency>
<!-- Runtime -->
<dependency>

12
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
View File

@@ -42,18 +42,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<exclusions>
<exclusion>
<artifactId>
jboss-transaction-api_1.2_spec
</artifactId>
<groupId>org.jboss.spec.javax.transaction</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>

2
spring-boot-test-autoconfigure/pom.xml
View File

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

2
spring-boot/pom.xml
View File

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

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

@@ -86,7 +86,6 @@ final class TldSkipPatterns {
patterns.add("ehcache-core-*.jar");
patterns.add("hibernate-core-*.jar");
patterns.add("hibernate-commons-annotations-*.jar");
patterns.add("hibernate-entitymanager-*.jar");
patterns.add("hibernate-jpa-2.1-api-*.jar");
patterns.add("hibernate-validator-*.jar");
patterns.add("hsqldb-*.jar");