From d0700172fa18bef2cbba6b0c2bb32c61dbeb32db Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 15:30:39 +0800
Subject: [PATCH] update 合并oss.sql至主sql
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index c0ff2fa..fe00af9 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -9,6 +9,11 @@
<artifactId>ruoyi-xxl-job-admin</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
+ <mysql-connector-java.version>8.0.23</mysql-connector-java.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -70,7 +75,6 @@
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
- <version>${xxl-job-core-version}</version>
</dependency>
</dependencies>
@@ -93,11 +97,14 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.4.13</version>
+ <version>${docker.plugin.version}</version>
<configuration>
<!-- made of '[a-z0-9-_.]' -->
- <imageName>${project.artifactId}:${project.version}</imageName>
+ <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
<dockerDirectory>${project.basedir}</dockerDirectory>
+ <dockerHost>${docker.registry.host}</dockerHost>
+ <registryUrl>${docker.registry.url}</registryUrl>
+ <serverId>${docker.registry.url}</serverId>
<resources>
<resource>
<targetPath>/</targetPath>
--
Gitblit v1.9.3