feat(#shade fastjson) : pack fastjson into fatjar

mike.wq · mike.wq · commit 236f9e6b4f8a · 2024-06-18T16:16:27.000+08:00
diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/chatbot/BotReplier.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/chatbot/BotReplier.java
@@ -1,7 +1,6 @@
 package com.dingtalk.open.app.api.chatbot;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONWriter;
 import com.dingtalk.open.app.api.open.http.HttpConstants;
 import com.dingtalk.open.app.api.util.IoUtils;
 
diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <name>app-stream-client</name>
 
     <dependencies>
@@ -78,13 +78,18 @@
                                     <include>com.dingtalk.open:app-stream-network-ws</include>
                                     <include>com.dingtalk.open:app-stream-protocol</include>
                                     <include>io.netty:*</include>
+                                    <include>com.alibaba.fastjson2:*</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>shade.io.netty</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.alibaba.fastjson2</pattern>
+                                    <shadedPattern>shade.com.alibaba.fastjson2</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
diff --git a/app-stream-network/app-stream-network-api/pom.xml b/app-stream-network/app-stream-network-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-network-api</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
 
     <name>app-stream-network-api</name>
diff --git a/app-stream-network/app-stream-network-core/pom.xml b/app-stream-network/app-stream-network-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-rsocket/pom.xml b/app-stream-network/app-stream-network-rsocket/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/pom.xml b/app-stream-network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/app-stream-protocol/pom.xml b/app-stream-protocol/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
 
     <artifactId>app-stream-protocol</artifactId>
diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dingtalk-stream</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <name>app-stream-client</name>
 
     <dependencies>
@@ -78,13 +78,18 @@
                                     <include>com.dingtalk.open:app-stream-network-ws</include>
                                     <include>com.dingtalk.open:app-stream-protocol</include>
                                     <include>io.netty:*</include>
+                                    <incllude>com.alibaba.fastjson2:*</incllude>
                                 </includes>
                             </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>shade.io.netty</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.alibaba.fastjson2</pattern>
+                                    <shadedPattern>shade.com.alibaba.fastjson2</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.dingtalk.open</groupId>
     <artifactId>open-app-stream-client</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <modules>
         <module>app-stream-client</module>
         <module>app-stream-api</module>
diff --git a/version.sh b/version.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-mvn versions:set -DnewVersion=1.3.4
+mvn versions:set -DnewVersion=1.3.5
