optimize: merge the packaging processes of namingserver and seata-server

.asf.yaml

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 github:
   description: ":fire: Seata is an easy-to-use, high-performance, open source distributed transaction solution."
   homepage: https://seata.apache.org/

changes/en-us/2.x.md

@@ -83,6 +83,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize NacosMockTest UT case
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize `tableMeta` cache scheduled refresh issue
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
+- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
 
 
 ### refactor:

changes/zh-cn/2.x.md

@@ -82,6 +82,8 @@
 - [[#6793](https://github.com/apache/incubator-seata/pull/6795)] 独立server的meta信息初始化逻辑
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] 优化`tableMeta`缓存定时刷新问题
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
+- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
+
 
 ### refactor:
 

codecov.yml

@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

distribution/Dockerfile

@@ -34,13 +34,12 @@ WORKDIR /$BASE_DIR
 
 # ADD FORM distribution
 ADD bin/ /seata-server/bin
-ADD conf/ /seata-server/conf
 ADD ext/ /seata-server/ext
-ADD lib/ /seata-server/lib
-ADD script/ /seata-server/script
 ADD target/ /seata-server/target
-ADD LICENSE /seata-server/LICENSE
-ADD NOTICE /seata-server/NOTICE
+ADD lib/ /seata-server/lib
+ADD conf/ /seata-server/conf
+ADD LICENSE ./LICENSE
+ADD NOTICE ./LICENSE
 
 # set extra environment
 ENV LOADER_PATH="/seata-server/lib"

distribution/pom.xml

@@ -45,57 +45,25 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.seata</groupId>
-                    <artifactId>apm-seata-skywalking-plugin</artifactId>
+                    <artifactId>seata-namingserver</artifactId>
                     <version>${project.version}</version>
                 </dependency>
-            </dependencies>
-            <build>
-                <finalName>apache-seata</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>${maven-assembly-plugin.version}</version>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>release-seata.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>release-seata-namingserver</id>
-            <properties>
-                <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
-            </properties>
-            <dependencies>
                 <dependency>
                     <groupId>org.apache.seata</groupId>
-                    <artifactId>seata-namingserver</artifactId>
+                    <artifactId>apm-seata-skywalking-plugin</artifactId>
                     <version>${project.version}</version>
                 </dependency>
             </dependencies>
             <build>
-                <finalName>apache-seata-namingserver</finalName>
+                <finalName>apache-seata</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <version>${maven-assembly-plugin.version}</version>
                         <configuration>
                             <descriptors>
-                                <descriptor>release-seata-namingserver.xml</descriptor>
+                                <descriptor>release-seata.xml</descriptor>
                             </descriptors>
                         </configuration>
                         <executions>

distribution/release-seata.xml

@@ -39,42 +39,60 @@
                 <include>bin/seata-server.sh</include>
                 <include>bin/seata-setup.sh</include>
             </includes>
+            <outputDirectory>seata-server/</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
 
-        <fileSet>
-            <includes>
-                <include>logs/**</include>
-            </includes>
-        </fileSet>
-
         <fileSet>
             <directory>../server/src/main/resources/logback/</directory>
-            <outputDirectory>conf/logback/</outputDirectory>
+            <outputDirectory>seata-server/conf/logback/</outputDirectory>
             <includes>
                 <include>**/*.xml</include>
             </includes>
         </fileSet>
 
         <fileSet>
             <directory>../ext/apm-seata-skywalking-plugin/target/ext/skywalking-agent/</directory>
-            <outputDirectory>ext/apm-skywalking</outputDirectory>
+            <outputDirectory>seata-server/ext/apm-skywalking</outputDirectory>
         </fileSet>
 
         <fileSet>
             <directory>../server/target/lib/</directory>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>seata-server/lib</outputDirectory>
         </fileSet>
 
         <fileSet>
             <directory>../script/</directory>
-            <outputDirectory>script</outputDirectory>
+            <outputDirectory>seata-server/script</outputDirectory>
             <includes>
                 <include>**/server/</include>
                 <include>**/logstash/</include>
                 <include>**/config-center/</include>
             </includes>
         </fileSet>
+
+        <!-- namingserver -->
+        <fileSet>
+            <includes>
+                <include>bin/seata-namingserver.bat</include>
+                <include>bin/seata-namingserver.sh</include>
+                <include>bin/seata-namingserver-setup.sh</include>
+            </includes>
+            <outputDirectory>seata-namingserver/</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>../namingserver/target/lib/</directory>
+            <outputDirectory>seata-namingserver/lib</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../namingserver/src/main/resources/logback/</directory>
+            <outputDirectory>seata-namingserver/conf/logback/</outputDirectory>
+            <includes>
+                <include>**/*.xml</include>
+            </includes>
+        </fileSet>
+
     </fileSets>
 
     <files>
@@ -100,39 +118,56 @@
 
         <file>
             <source>../server/target/seata-server-exec.jar</source>
-            <outputDirectory>target/</outputDirectory>
+            <outputDirectory>seata-server/target/</outputDirectory>
             <destName>seata-server.jar</destName>
         </file>
 
         <file>
             <source>../server/src/main/resources/application.yml</source>
-            <outputDirectory>conf/</outputDirectory>
+            <outputDirectory>seata-server/conf/</outputDirectory>
         </file>
         <file>
             <source>../server/src/main/resources/application.example.yml</source>
-            <outputDirectory>conf/</outputDirectory>
+            <outputDirectory>seata-server/conf/</outputDirectory>
         </file>
         <file>
             <source>../server/src/main/resources/application.raft.example.yml</source>
-            <outputDirectory>conf/</outputDirectory>
+            <outputDirectory>seata-server/conf/</outputDirectory>
         </file>
 
         <file>
             <source>../server/src/main/resources/logback-spring.xml</source>
-            <outputDirectory>conf/</outputDirectory>
+            <outputDirectory>seata-server/conf/</outputDirectory>
         </file>
 
         <file>
             <source>NOTICE.md</source>
-            <outputDirectory>lib/jdbc/</outputDirectory>
+            <outputDirectory>seata-server/lib/jdbc/</outputDirectory>
         </file>
+
+        <!-- namingserver -->
+        <file>
+            <source>../namingserver/target/seata-namingserver-exec.jar</source>
+            <outputDirectory>seata-namingserver/target/</outputDirectory>
+            <destName>seata-namingserver.jar</destName>
+        </file>
+        <file>
+            <source>../namingserver/src/main/resources/logback-spring.xml</source>
+            <outputDirectory>seata-namingserver/conf/</outputDirectory>
+        </file>
+        <file>
+            <source>../namingserver/src/main/resources/application.yml</source>
+            <outputDirectory>seata-namingserver/conf/</outputDirectory>
+        </file>
+
     </files>
 
     <moduleSets>
         <moduleSet>
             <useAllReactorProjects>true</useAllReactorProjects>
             <includes>
                 <include>org.apache.seata:seata-server</include>
+                <include>org.apache.seata:seata-namingserver</include>
             </includes>
         </moduleSet>
     </moduleSets>

namingserver/pom.xml

@@ -162,7 +162,7 @@
 
     <profiles>
         <profile>
-            <id>release-seata-namingserver</id>
+            <id>release-seata</id>
             <properties>
                 <dependencies.copy.skip>false</dependencies.copy.skip>
             </properties>