From 846cafabb572f089ab34b66aeb7493b206b0488c Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 19 May 2022 23:39:50 +0800
Subject: [PATCH] 调整依赖引入的位置
---
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml | 15 ---------------
jeecg-boot/jeecg-boot-module-system/pom.xml | 9 +++++++++
jeecg-boot/pom.xml | 17 ++++++++++++++++-
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
index 3d0c2ff..6aa643d 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
@@ -106,21 +106,6 @@
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${dynamic-datasource-spring-boot-starter.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jeecgframework.boot</groupId>
- <artifactId>hibernate-re</artifactId>
- <version>3.2.0-beta</version>
- </dependency>
<!-- 数据库驱动 -->
<!--mysql-->
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index db30358..7e2de71 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -34,6 +34,15 @@
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>hibernate-re</artifactId>
+ </dependency>
+
<!-- 企业微信/钉钉 api -->
<dependency>
<groupId>org.jeecgframework</groupId>
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 2eb1b2a..0fe1c7f 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -203,7 +203,22 @@
<artifactId>jeecg-boot-starter-shardingsphere</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.6.7.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>hibernate-re</artifactId>
+ <version>3.2.0-beta</version>
+ </dependency>
<!-- 七牛云SDK -->
<dependency>
--
libgit2 0.22.2