[shardingsphere] branch master updated: Refactor : add agent into proxy distribution as default (#23633) (#23637)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 941c4cbfb8e Refactor : add agent into proxy distribution as default 
(#23633) (#23637)
941c4cbfb8e is described below

commit 941c4cbfb8ea72a62df456d037b2ae3bfedb1261
Author: 孙念君 Nianjun Sun <sunnian...@apache.org>
AuthorDate: Wed Jan 18 20:14:00 2023 +0800

    Refactor : add agent into proxy distribution as default (#23633) (#23637)
    
    * Refactor : add agent into proxy distribution as default (#23633)
    
    * Refactor : add agent tar.gz file as another type of distribution (#23633)
---
 .../src/main/assembly/shardingsphere-agent-binary-distribution.xml | 3 ++-
 .../src/main/assembly/shardingsphere-proxy-binary-distribution.xml | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
 
b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
index 16280efaf2b..6ba61d88863 100644
--- 
a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
+++ 
b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
@@ -20,10 +20,11 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
     <id>shardingsphere-agent-bin</id>
     <formats>
+        <format>dir</format>
         <format>tar.gz</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>
-    
<baseDirectory>${project.build.finalName}-shardingsphere-agent-bin</baseDirectory>
+    <baseDirectory>agent</baseDirectory>
     
     <fileSets>
         <fileSet>
diff --git 
a/distribution/proxy/src/main/assembly/shardingsphere-proxy-binary-distribution.xml
 
b/distribution/proxy/src/main/assembly/shardingsphere-proxy-binary-distribution.xml
index 95b2bc2edda..4c7513498e2 100644
--- 
a/distribution/proxy/src/main/assembly/shardingsphere-proxy-binary-distribution.xml
+++ 
b/distribution/proxy/src/main/assembly/shardingsphere-proxy-binary-distribution.xml
@@ -63,6 +63,13 @@
             </includes>
             <outputDirectory>/</outputDirectory>
         </fileSet>
+        <fileSet>
+            
<directory>../../agent/distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
     </fileSets>
     
     <dependencySets>