Răsfoiți Sursa

fix jar conflicts

deason 1 an în urmă
părinte
comite
3cdc948ad3
1 a modificat fișierele cu 38 adăugiri și 19 ștergeri
  1. 38 19
      pom.xml

+ 38 - 19
pom.xml

@@ -62,11 +62,6 @@
             <artifactId>core-schedule</artifactId>
             <version>${qmth-boot-version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.jeffreyning</groupId>
-            <artifactId>mybatisplus-plus</artifactId>
-            <version>1.5.1-RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>com.qmth.boot</groupId>
             <artifactId>core-solar</artifactId>
@@ -86,12 +81,6 @@
             <groupId>com.qmth.boot</groupId>
             <artifactId>data-redis</artifactId>
             <version>${qmth-boot-version}</version>
-            <exclusions>
-                <!--<exclusion>
-                    <groupId>org.redisson</groupId>
-                    <artifactId>redisson</artifactId>
-                </exclusion>-->
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.qmth.boot</groupId>
@@ -118,20 +107,18 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.5.24</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>1.5.24</version>
         </dependency>
         <!-- Swagger jars end -->
 
-        <!--<dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.15.6</version>
-        </dependency>-->
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.5.1-RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -145,7 +132,6 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -189,6 +175,39 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson</artifactId>
+                <version>3.29.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.objenesis</groupId>
+                <artifactId>objenesis</artifactId>
+                <version>3.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>1.5.24</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-models</artifactId>
+                <version>1.5.24</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.16.1</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>1.4.01</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>