From fdd76ee1a3d2d5fe9685b76ac83de1b5439b8a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Fri, 20 Jan 2023 23:47:08 +0800
Subject: [PATCH] v3.0.0

---
 maku-framework/pom.xml |  4 ++++
 maku-server/pom.xml    | 55 +++++++++++++++++++++++---------------------------
 pom.xml                |  8 +++++++-
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/maku-framework/pom.xml b/maku-framework/pom.xml
index da7a4df..d5d43e9 100644
--- a/maku-framework/pom.xml
+++ b/maku-framework/pom.xml
@@ -70,6 +70,10 @@
             <artifactId>easyexcel</artifactId>
         </dependency>
         <dependency>
+            <artifactId>okio</artifactId>
+            <groupId>com.squareup.okio</groupId>
+        </dependency>
+        <dependency>
             <groupId>com.fhs-opensource</groupId>
             <artifactId>easy-trans-mybatis-plus-extend</artifactId>
         </dependency>
diff --git a/maku-server/pom.xml b/maku-server/pom.xml
index 615b084..f252142 100644
--- a/maku-server/pom.xml
+++ b/maku-server/pom.xml
@@ -15,41 +15,36 @@
             <artifactId>maku-boot-system</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>net.maku</groupId>
-            <artifactId>maku-boot-new</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.maku</groupId>
-            <artifactId>maku-module-quartz</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.maku</groupId>
-            <artifactId>maku-module-generator</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.maku</groupId>
-            <artifactId>maku-module-message</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.maku</groupId>
-            <artifactId>maku-module-monitor</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.maku</groupId>-->
+<!--            <artifactId>maku-boot-new</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>net.maku</groupId>-->
+<!--            <artifactId>maku-module-quartz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>net.maku</groupId>-->
+<!--            <artifactId>maku-module-generator</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>net.maku</groupId>-->
+<!--            <artifactId>maku-module-message</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>net.maku</groupId>-->
+<!--            <artifactId>maku-module-monitor</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <artifactId>okio</artifactId>
-            <groupId>com.squareup.okio</groupId>
-            <version>3.3.0</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 42257dd..83632fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     </modules>
 
     <properties>
-        <revision>2.5.0</revision>
+        <revision>3.0.0</revision>
         <skipTests>true</skipTests>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,6 +45,7 @@
         <qcloud.cos.version>5.6.97</qcloud.cos.version>
         <huaweicloud.obs.version>3.22.3</huaweicloud.obs.version>
         <easyexcel.version>3.1.5</easyexcel.version>
+        <okio.version>3.3.0</okio.version>
         <easytrans.version>2.1.6</easytrans.version>
     </properties>
 
@@ -142,6 +143,11 @@
                 <version>${easyexcel.version}</version>
             </dependency>
             <dependency>
+                <artifactId>okio</artifactId>
+                <groupId>com.squareup.okio</groupId>
+                <version>${okio.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.fhs-opensource</groupId>
                 <artifactId>easy-trans-spring-boot-starter</artifactId>
                 <version>${easytrans.version}</version>