⏪ Reverting changes. 回滚错误引入

pigx-common/pigx-common-bom/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>group.springframework</groupId>
         <artifactId>spring-cloud-dependencies-parent</artifactId>
-        <version>2022.0.0</version>
+        <version>2021.0.7</version>
         <relativePath/>
     </parent>
 
@@ -29,14 +29,14 @@
         <dm.version>8.1.2.79</dm.version>
         <highgo.version>6.2.0</highgo.version>
         <knife4j.version>3.0.3</knife4j.version>
-        <springdoc.version>2.1.0</springdoc.version>
-        <swagger.core.version>2.2.14</swagger.core.version>
+        <swagger.core.version>2.2.8</swagger.core.version>
+        <springdoc.version>1.6.15</springdoc.version>
         <mp.weixin.version>4.4.0</mp.weixin.version>
-        <ijpay.version>2.9.6-17</ijpay.version>
+        <ijpay.version>2.8.0</ijpay.version>
         <groovy.version>3.0.3</groovy.version>
         <jsoup.version>1.13.1</jsoup.version>
         <aviator.version>5.3.3</aviator.version>
-        <flowable.version>7.0.0.M1</flowable.version>
+        <flowable.version>6.8.0</flowable.version>
         <security.oauth.version>2.3.6.RELEASE</security.oauth.version>
         <fastjson.version>1.2.83</fastjson.version>
         <xxl.job.version>2.3.0</xxl.job.version>
@@ -46,6 +46,7 @@
         <seata.version>1.6.1</seata.version>
         <asm.version>7.1</asm.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <javaformat.plugin.version>0.0.23</javaformat.plugin.version>
         <docker.plugin.version>0.33.0</docker.plugin.version>
         <cloud.plugin.version>1.0.0</cloud.plugin.version>
         <sentinel.version>1.8.4</sentinel.version>
@@ -202,7 +203,7 @@
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
                 <version>${dynamic-ds.version}</version>
             </dependency>
             <!-- 连表查询依赖	-->
@@ -220,7 +221,7 @@
             <!-- druid 连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-3-starter</artifactId>
+                <artifactId>druid-spring-boot-starter</artifactId>
                 <version>${druid.version}</version>
             </dependency>
             <dependency>
@@ -263,12 +264,6 @@
                 <artifactId>fastjson</artifactId>
                 <version>${fastjson.version}</version>
             </dependency>
-            <!--计算引擎-->
-            <dependency>
-                <groupId>com.googlecode.aviator</groupId>
-                <artifactId>aviator</artifactId>
-                <version>${aviator.version}</version>
-            </dependency>
             <!-- 对象对比工具-->
             <dependency>
                 <groupId>org.javers</groupId>
@@ -276,33 +271,46 @@
                 <version>${javers.version}</version>
             </dependency>
             <!--springdoc -->
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-webmvc-core</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.springboot</groupId>
                 <artifactId>knife4j-openapi3-ui</artifactId>
-                <version>${knife4j.version}</version>
-            </dependency>
-
-            <!--springdoc -->
-            <dependency>
-                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-                <version>${springdoc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-                <version>${springdoc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-                <version>${springdoc.version}</version>
+                <version>3.0.3</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-annotations-jakarta</artifactId>
+                <artifactId>swagger-models</artifactId>
                 <version>${swagger.core.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-webflux-ui</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-webflux-core</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-common</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-security</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
             <!--微信依赖-->
             <dependency>
                 <groupId>com.github.binarywang</groupId>
@@ -319,6 +327,18 @@
                 <artifactId>weixin-java-common</artifactId>
                 <version>${mp.weixin.version}</version>
             </dependency>
+            <!--计算引擎-->
+            <dependency>
+                <groupId>com.googlecode.aviator</groupId>
+                <artifactId>aviator</artifactId>
+                <version>${aviator.version}</version>
+            </dependency>
+            <!--工作流依赖-->
+            <dependency>
+                <groupId>org.flowable</groupId>
+                <artifactId>flowable-spring-boot-starter-process</artifactId>
+                <version>${flowable.version}</version>
+            </dependency>
             <!--支付相关SDK-->
             <dependency>
                 <groupId>com.github.javen205</groupId>
@@ -348,12 +368,6 @@
                 <artifactId>jsoup</artifactId>
                 <version>${jsoup.version}</version>
             </dependency>
-            <!--工作流依赖-->
-            <dependency>
-                <groupId>org.flowable</groupId>
-                <artifactId>flowable-spring-boot-starter-process</artifactId>
-                <version>${flowable.version}</version>
-            </dependency>
             <!--  指定 log4j 版本-->
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>