[shardingsphere] branch master updated: agent build with assembly (#8367)

[kimmking]

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

kimmking 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 3078142  agent build with assembly (#8367)
3078142 is described below

commit 3078142e327eec60fa336798d559ed6f1c1af181
Author: xiaoyu <549477...@qq.com>
AuthorDate: Thu Nov 26 21:52:13 2020 +0800

    agent build with assembly (#8367)
---
 .../shardingsphere-agent-distribution/pom.xml      | 19 ++++++++-
 .../shardingsphere-agent-binary-distribution.xml   | 49 ++++++++--------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml 
b/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
index 321ef2c..ee13fe4 100644
--- a/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
@@ -29,19 +29,34 @@
 
     <artifactId>shardingsphere-agent-distribution</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-agent-bootstrap</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-agent-plugin-metrics</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
+        <finalName>shardingsphere-agent</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>shardingsphere-agent</finalName>
                     <descriptors>
                         
<descriptor>src/main/assembly/shardingsphere-agent-binary-distribution.xml</descriptor>
                     </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>shardingsphere-agent</id>
+                        <id>bin</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
diff --git 
a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
 
b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
index 34d06e0..422bd4b 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
+++ 
b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
@@ -17,36 +17,12 @@
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
-    <id>shardingsphere-agent</id>
+    <id>bin</id>
     <formats>
         <format>dir</format>
         <format>tar.gz</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                
<include>${project.groupId}:shardingsphere-agent-bootstrap</include>
-            </includes>
-            <binaries>
-                <unpack>false</unpack>
-                <outputDirectory>/</outputDirectory>
-                <includeDependencies>false</includeDependencies>
-            </binaries>
-        </moduleSet>
-
-        <moduleSet>
-            <includes>
-                
<include>${project.groupId}:shardingsphere-agent-plugin-metrics</include>
-            </includes>
-            <binaries>
-                <unpack>false</unpack>
-                <outputDirectory>plugins</outputDirectory>
-                <includeDependencies>false</includeDependencies>
-            </binaries>
-        </moduleSet>
-
-    </moduleSets>
     
     <fileSets>
         <fileSet>
@@ -64,10 +40,21 @@
         </fileSet>
     </fileSets>
     
-<!--    <dependencySets>-->
-<!--        <dependencySet>-->
-<!--            <outputDirectory>lib</outputDirectory>-->
-<!--            <fileMode>0644</fileMode>-->
-<!--        </dependencySet>-->
-<!--    </dependencySets>-->
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                
<include>${project.groupId}:shardingsphere-agent-plugin-metrics</include>
+            </includes>
+            <outputDirectory>plugins</outputDirectory>
+            <fileMode>0644</fileMode>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                
<include>${project.groupId}:shardingsphere-agent-bootstrap</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+            
<outputFileNameMapping>shardingsphere-agent.jar</outputFileNameMapping>
+            <fileMode>0644</fileMode>
+        </dependencySet>
+    </dependencySets>
 </assembly>