Fix es7 dist not uploaded in the release process. (#4112)

Author: wu-sheng

apm-dist-es7/pom.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm</artifactId>
+        <groupId>org.apache.skywalking</groupId>
+        <version>6.6.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apache-skywalking-apm-es7</artifactId>
+    <packaging>pom</packaging>
+
+    <profiles>
+        <profile>
+            <id>agent</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.skywalking</groupId>
+                    <artifactId>apm-agent</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>backend</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.skywalking</groupId>
+                    <artifactId>server-starter-es7</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>ui</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.skywalking</groupId>
+                    <artifactId>apm-webapp</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>dist-es7</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>apache-skywalking-apm-bin-es7</finalName>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/binary-es7.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <attach>true</attach>
+                    <tarLongFileMode>posix</tarLongFileMode>
+                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>dist-es7</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
+                                <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.zip" overwrite="true" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

apm-dist/src/main/assembly/binary-es7.xml renamed to apm-dist-es7/src/main/assembly/binary-es7.xml

@@ -27,7 +27,7 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/bin</directory>
+            <directory>${project.basedir}/../dist-material/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <includes>
                 <include>*.sh</include>
@@ -36,7 +36,7 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>src/main/assembly</directory>
+            <directory>${project.basedir}/../dist-material</directory>
             <outputDirectory>/config</outputDirectory>
             <includes>
                 <include>log4j2.xml</include>
@@ -87,7 +87,7 @@
         </fileSet>
 
         <fileSet>
-            <directory>${project.basedir}/release-docs</directory>
+            <directory>${project.basedir}/../dist-material/release-docs</directory>
             <outputDirectory>/</outputDirectory>
         </fileSet>
     </fileSets>

apm-dist/pom.xml

@@ -88,19 +88,6 @@
                             </descriptors>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>dist-es7</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>apache-skywalking-apm-bin-es7</finalName>
-                            <descriptors>
-                                <descriptor>${project.basedir}/src/main/assembly/binary-es7.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
                 </executions>
                 <configuration>
                     <attach>true</attach>
@@ -125,19 +112,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>dist-es7</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
-                                <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.zip" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

apm-dist/src/main/assembly/binary.xml

@@ -27,7 +27,7 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/bin</directory>
+            <directory>${project.basedir}/../dist-material/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <includes>
                 <include>*.sh</include>
@@ -36,7 +36,7 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>src/main/assembly</directory>
+            <directory>${project.basedir}/../dist-material</directory>
             <outputDirectory>/config</outputDirectory>
             <includes>
                 <include>log4j2.xml</include>
@@ -87,7 +87,7 @@
         </fileSet>
 
         <fileSet>
-            <directory>${project.basedir}/release-docs</directory>
+            <directory>${project.basedir}/../dist-material/release-docs</directory>
             <outputDirectory>/</outputDirectory>
         </fileSet>
     </fileSets>

apm-dist/src/main/assembly/alarm-settings-sample.yml renamed to dist-material/alarm-settings-sample.yml

@@ -110,6 +110,7 @@
             </activation>
             <modules>
                 <module>apm-dist</module>
+                <module>apm-dist-es7</module>
             </modules>
         </profile>
         <profile>
@@ -123,6 +124,7 @@
                 <module>oap-server</module>
                 <module>apm-webapp</module>
                 <module>apm-dist</module>
+                <module>apm-dist-es7</module>
             </modules>
             <build>
                 <plugins>