Merge pull request #28 from ClearXs/1.1.x

feat: upgrade springboot to 3.3.2 and remove swagger v2 version
ClearXs · Aug 21, 2024 · 4bd3419 · 4bd3419
2 parents 7a3952e + 876c55b
commit 4bd3419
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 145 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
     <properties>
         <java.version>21</java.version>
         <drools.version>9.44.0.Final</drools.version>
-        <reactor-bom>2023.0.6</reactor-bom>
-        <spring.boot.version>3.3.0</spring.boot.version>
+        <reactor-bom>2023.0.9</reactor-bom>
+        <spring.boot.version>3.3.2</spring.boot.version>
         <spring-ai.version>0.8.1-SNAPSHOT</spring-ai.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-plugin.version>3.8.1</maven-plugin.version>

diff --git a/uno-ai/pom.xml b/uno-ai/pom.xml
@@ -13,9 +13,9 @@
     <description>Through the capabilities of Spring AI, one can delve into artificial intelligence and endow abilities.</description>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-</project>
+</project>
diff --git a/uno-bom/pom.xml b/uno-bom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -27,8 +27,8 @@
         <cglib.version>3.3.0</cglib.version>
         <lombok.version>1.18.22</lombok.version>
         <!-- 单元测试框架 -->
-        <junit-jupiter.version>5.10.2</junit-jupiter.version>
-        <mockito.version>5.11.0</mockito.version>
+        <junit-jupiter.version>5.11.0</junit-jupiter.version>
+        <mockito.version>5.12.0</mockito.version>
         <!-- 多线程单元测试 -->
         <concurrentunit.version>0.4.6</concurrentunit.version>
         <guava.version>33.0.0-jre</guava.version>
@@ -38,14 +38,11 @@
         <jakarta.version>2.0.1</jakarta.version>
         <!-- swagger -->
         <swagger-v3.version>2.2.17</swagger-v3.version>
-        <swagger-v2.version>1.6.2</swagger-v2.version>
-        <springfox-swagger2.version>3.0.0</springfox-swagger2.version>
         <mybatis-spring-boot.version>3.0.3</mybatis-spring-boot.version>
         <mybatis-plus-boot.version>3.5.5</mybatis-plus-boot.version>
         <!-- 数据库 -->
-        <druid.version>1.2.20</druid.version>
-        <mysql-connector.version>8.0.22</mysql-connector.version>
-        <oracle-connector.version>12.2.0.1</oracle-connector.version>
+        <druid.version>1.2.23</druid.version>
+        <mysql-connector.version>8.0.33</mysql-connector.version>
         <postgresql-connector.version>42.7.3</postgresql-connector.version>
         <sqlserver-connector.version>8.4.1.jre8</sqlserver-connector.version>
         <mybatis-plus-dynamic.version>4.3.0</mybatis-plus-dynamic.version>
@@ -56,15 +53,13 @@
         <!-- elasticsearch -->
         <elasticsearch-client.version>8.12.2</elasticsearch-client.version>
         <!-- influxdb -->
-        <influxdb-client.version>7.0.0</influxdb-client.version>
-        <!-- tdengine -->
-        <tdengine.version>3.2.4</tdengine.version>
+        <influxdb-client.version>7.2.0</influxdb-client.version>
         <!-- mongodb -->
-        <mongodb.version>5.0.0</mongodb.version>
+        <mongodb.version>5.1.3</mongodb.version>
         <!-- neo4j -->
-        <neo4j.version>5.17.0</neo4j.version>
+        <neo4j.version>5.22.0</neo4j.version>
         <!-- redisson -->
-        <redisson.version>3.27.1</redisson.version>
+        <redisson.version>3.34.1</redisson.version>
         <mvel.version>2.5.0.Final</mvel.version>
     </properties>
 
@@ -267,12 +262,6 @@
                 <version>${swagger-v3.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger-v2.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
                 <artifactId>mybatis-spring-boot-starter</artifactId>
@@ -337,11 +326,6 @@
                 <version>${mybatis-plus-dynamic.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>${springfox-swagger2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.geotools</groupId>
                 <artifactId>gt-geojson</artifactId>
@@ -377,11 +361,6 @@
                 <artifactId>jakarta.json-api</artifactId>
                 <version>${jakarta.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.taosdata.jdbc</groupId>
-                <artifactId>taos-jdbcdriver</artifactId>
-                <version>${tdengine.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.mongodb</groupId>
                 <artifactId>mongodb-driver-sync</artifactId>

diff --git a/uno-core/pom.xml b/uno-core/pom.xml
@@ -13,8 +13,8 @@
     <description>uno pivotal is the core library.</description>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -113,4 +113,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/uno-http/pom.xml b/uno-http/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>uno-http</artifactId>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -41,17 +41,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jackson-annotations</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
@@ -63,4 +52,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java
@@ -1,9 +1,7 @@
 package cc.allio.uno.http.openapi;
 
-import cc.allio.uno.http.openapi.v2.SwaggerParser;
 import cc.allio.uno.http.openapi.v3.OpenApiParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.models.Swagger;
 import io.swagger.v3.oas.models.OpenAPI;
 
 /**
@@ -25,8 +23,6 @@ private OpenApiSpecificationParser() {
         context = new DefaultParserContext(mapper, execution);
         // 注册OpenApi v3版本解析器
         execution.register(new OpenApiParser(), context);
-        // 注册OpenApi v2版本解析器
-        execution.register(new SwaggerParser(), context);
     }
 
     /**
@@ -41,18 +37,6 @@ public OpenAPI parseV3(String apiJson) {
         return execution.execute(OpenApiParser.class, apiJson, context);
     }
 
-    /**
-     * 解析v2版本OpenApi
-     *
-     * @param apiJson OpenApi json串
-     * @return 解析完成的Swagger对象
-     * @see Swagger
-     */
-    public Swagger parseV2(String apiJson) {
-        ParserExecution execution = context.execution();
-        return execution.execute(SwaggerParser.class, apiJson, context);
-    }
-
     public static OpenApiSpecificationParser holder() {
         return holder;
     }

diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v2/SwaggerParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v2/SwaggerParser.java
diff --git a/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java b/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java
@@ -2,12 +2,9 @@
 
 import cc.allio.uno.core.util.FileUtils;
 import cc.allio.uno.test.BaseTestCase;
-import io.swagger.models.Swagger;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.jupiter.api.Test;
-
 class OpenApi2ParserTest extends BaseTestCase {
 
     private static AtomicReference<String> example;
@@ -19,9 +16,4 @@ protected void onInit() throws Throwable {
         assertNotNull(example.get());
     }
 
-    @Test
-    void parserV2Test() {
-        Swagger swagger = OpenApiSpecificationParser.holder().parseV2(example.get());
-        System.out.println(swagger);
-    }
 }
diff --git a/uno-kafka/pom.xml b/uno-kafka/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>uno-kafka</artifactId>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -32,4 +32,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/uno-netty/pom.xml b/uno-netty/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>uno-netty</artifactId>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -32,4 +32,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/uno-sequential/pom.xml b/uno-sequential/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>uno-sequential</artifactId>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -53,4 +53,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/uno-websocket/pom.xml b/uno-websocket/pom.xml
@@ -13,8 +13,8 @@
     <description>提供封装的websocket，包含鉴权、心跳、连接管理、实现方只需要关注消息的处理</description>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -33,4 +33,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>