You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/12/24 01:01:27 UTC
[skywalking] branch es7-storage created (now 8e75175)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch es7-storage
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 8e75175 Fix es7 dist not uploaded in the release process.
This branch includes the following new commits:
new 8e75175 Fix es7 dist not uploaded in the release process.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Fix es7 dist not uploaded in the release
process.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch es7-storage
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8e751754c072b81a9fcd73940a1640654f299c31
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Dec 24 09:00:58 2019 +0800
Fix es7 dist not uploaded in the release process.
---
{apm-dist => apm-dist-es7}/pom.xml | 34 ++++------------------
.../src/main/assembly/binary-es7.xml | 6 ++--
apm-dist/pom.xml | 26 -----------------
apm-dist/src/main/assembly/binary.xml | 6 ++--
.../alarm-settings-sample.yml | 0
.../assembly => dist-material}/alarm-settings.yml | 0
.../assembly => dist-material}/application.yml | 0
{apm-dist => dist-material}/bin/oapService.bat | 0
{apm-dist => dist-material}/bin/oapService.sh | 0
{apm-dist => dist-material}/bin/oapServiceInit.bat | 0
{apm-dist => dist-material}/bin/oapServiceInit.sh | 0
.../bin/oapServiceNoInit.bat | 0
.../bin/oapServiceNoInit.sh | 0
{apm-dist => dist-material}/bin/startup.bat | 0
{apm-dist => dist-material}/bin/startup.sh | 0
{apm-dist => dist-material}/bin/webappService.bat | 0
{apm-dist => dist-material}/bin/webappService.sh | 0
.../src/main/assembly => dist-material}/log4j2.xml | 0
{apm-dist => dist-material}/release-docs/LICENSE | 0
{apm-dist => dist-material}/release-docs/NOTICE | 0
.../release-docs/README.txt | 0
.../release-docs/licenses/LICENSE-H2.txt | 0
.../licenses/LICENSE-antlr4-runtime.txt | 0
.../release-docs/licenses/LICENSE-asm.txt | 0
.../licenses/LICENSE-aspectjweaver.txt | 0
.../licenses/LICENSE-bcpkix-jdk15on.txt | 0
.../licenses/LICENSE-bcprov-jdk15on.txt | 0
.../release-docs/licenses/LICENSE-compiler.txt | 0
.../licenses/LICENSE-consul-client.txt | 0
.../licenses/LICENSE-error_prone_annotations.txt | 0
.../release-docs/licenses/LICENSE-fastjson.txt | 0
.../licenses/LICENSE-gogo-protobuf.txt | 0
.../licenses/LICENSE-graphql-java-tools.txt | 0
.../release-docs/licenses/LICENSE-graphql-java.txt | 0
.../release-docs/licenses/LICENSE-groovy.txt | 0
.../release-docs/licenses/LICENSE-grpc-gateway.txt | 0
.../release-docs/licenses/LICENSE-hppc.txt | 0
.../licenses/LICENSE-httpcomponents.txt | 0
.../licenses/LICENSE-instrumentation-api.txt | 0
.../release-docs/licenses/LICENSE-jedis.txt | 0
.../release-docs/licenses/LICENSE-jersey.txt | 0
.../release-docs/licenses/LICENSE-jline.txt | 0
.../release-docs/licenses/LICENSE-jopt-simple.txt | 0
.../release-docs/licenses/LICENSE-logback.txt | 0
.../release-docs/licenses/LICENSE-minimal-json.txt | 0
.../release-docs/licenses/LICENSE-okhttp.txt | 0
.../licenses/LICENSE-percolator-client.txt | 0
.../LICENSE-proto-google-common-protos.txt | 0
.../licenses/LICENSE-protobuf-java-util.txt | 0
.../licenses/LICENSE-protobuf-java.txt | 0
.../licenses/LICENSE-reactive-streams.txt | 0
.../release-docs/licenses/LICENSE-reflectasm.txt | 0
.../licenses/LICENSE-reindex-client.txt | 0
.../release-docs/licenses/LICENSE-slf4j.txt | 0
.../licenses/ui-licenses/LICENSE-axios | 0
.../release-docs/licenses/ui-licenses/LICENSE-d3 | 0
.../licenses/ui-licenses/LICENSE-d3-array | 0
.../licenses/ui-licenses/LICENSE-d3-axis | 0
.../licenses/ui-licenses/LICENSE-d3-brush | 0
.../licenses/ui-licenses/LICENSE-d3-chord | 0
.../licenses/ui-licenses/LICENSE-d3-collection | 0
.../licenses/ui-licenses/LICENSE-d3-color | 0
.../licenses/ui-licenses/LICENSE-d3-contour | 0
.../licenses/ui-licenses/LICENSE-d3-dispatch | 0
.../licenses/ui-licenses/LICENSE-d3-drag | 0
.../licenses/ui-licenses/LICENSE-d3-dsv | 0
.../licenses/ui-licenses/LICENSE-d3-ease | 0
.../licenses/ui-licenses/LICENSE-d3-force | 0
.../licenses/ui-licenses/LICENSE-d3-format | 0
.../licenses/ui-licenses/LICENSE-d3-geo | 0
.../licenses/ui-licenses/LICENSE-d3-hierarchy | 0
.../licenses/ui-licenses/LICENSE-d3-interpolate | 0
.../licenses/ui-licenses/LICENSE-d3-path | 0
.../licenses/ui-licenses/LICENSE-d3-polygon | 0
.../licenses/ui-licenses/LICENSE-d3-quadtree | 0
.../licenses/ui-licenses/LICENSE-d3-queue | 0
.../licenses/ui-licenses/LICENSE-d3-random | 0
.../licenses/ui-licenses/LICENSE-d3-request | 0
.../licenses/ui-licenses/LICENSE-d3-scale | 0
.../ui-licenses/LICENSE-d3-scale-chromatic | 0
.../licenses/ui-licenses/LICENSE-d3-selection | 0
.../licenses/ui-licenses/LICENSE-d3-shape | 0
.../licenses/ui-licenses/LICENSE-d3-time | 0
.../licenses/ui-licenses/LICENSE-d3-time-format | 0
.../licenses/ui-licenses/LICENSE-d3-timer | 0
.../licenses/ui-licenses/LICENSE-d3-tip | 0
.../licenses/ui-licenses/LICENSE-d3-transition | 0
.../licenses/ui-licenses/LICENSE-d3-voronoi | 0
.../licenses/ui-licenses/LICENSE-d3-zoom | 0
.../licenses/ui-licenses/LICENSE-dayjs | 0
.../licenses/ui-licenses/LICENSE-echarts | 0
.../licenses/ui-licenses/LICENSE-elementui | 0
.../licenses/ui-licenses/LICENSE-lodash | 0
.../licenses/ui-licenses/LICENSE-popperjs | 0
.../release-docs/licenses/ui-licenses/LICENSE-vue | 0
.../ui-licenses/LICENSE-vue-class-component | 0
.../ui-licenses/LICENSE-vue-datepicker-local | 0
.../licenses/ui-licenses/LICENSE-vue-i18n | 0
.../licenses/ui-licenses/LICENSE-vue-js-modal | 0
.../ui-licenses/LICENSE-vue-property-decorator | 0
.../licenses/ui-licenses/LICENSE-vue-router | 0
.../release-docs/licenses/ui-licenses/LICENSE-vuex | 0
.../licenses/ui-licenses/LICENSE-vuex-class | 0
.../licenses/ui-licenses/LICENSE-zrender | 0
pom.xml | 2 ++
105 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/apm-dist/pom.xml b/apm-dist-es7/pom.xml
similarity index 72%
copy from apm-dist/pom.xml
copy to apm-dist-es7/pom.xml
index bf2422d..6ed8630 100644
--- a/apm-dist/pom.xml
+++ b/apm-dist-es7/pom.xml
@@ -17,7 +17,9 @@
~
-->
-<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">
+<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>
@@ -25,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apache-skywalking-apm</artifactId>
+ <artifactId>apache-skywalking-apm-es7</artifactId>
<packaging>pom</packaging>
<profiles>
@@ -50,7 +52,7 @@
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
- <artifactId>server-starter</artifactId>
+ <artifactId>server-starter-es7</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -76,19 +78,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>dist</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>apache-skywalking-apm-bin</finalName>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/binary.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
@@ -113,19 +102,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>dist</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${project.build.directory}/apache-skywalking-apm-bin.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz" overwrite="true" />
- <copy file="${project.build.directory}/apache-skywalking-apm-bin.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.zip" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
diff --git a/apm-dist/src/main/assembly/binary-es7.xml b/apm-dist-es7/src/main/assembly/binary-es7.xml
similarity index 94%
rename from apm-dist/src/main/assembly/binary-es7.xml
rename to apm-dist-es7/src/main/assembly/binary-es7.xml
index 519ed01..68328f5 100644
--- a/apm-dist/src/main/assembly/binary-es7.xml
+++ b/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>
diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml
index bf2422d..24584a8 100644
--- a/apm-dist/pom.xml
+++ b/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>
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index 44fd732..6cc8416 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/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>
diff --git a/apm-dist/src/main/assembly/alarm-settings-sample.yml b/dist-material/alarm-settings-sample.yml
similarity index 100%
rename from apm-dist/src/main/assembly/alarm-settings-sample.yml
rename to dist-material/alarm-settings-sample.yml
diff --git a/apm-dist/src/main/assembly/alarm-settings.yml b/dist-material/alarm-settings.yml
similarity index 100%
rename from apm-dist/src/main/assembly/alarm-settings.yml
rename to dist-material/alarm-settings.yml
diff --git a/apm-dist/src/main/assembly/application.yml b/dist-material/application.yml
similarity index 100%
rename from apm-dist/src/main/assembly/application.yml
rename to dist-material/application.yml
diff --git a/apm-dist/bin/oapService.bat b/dist-material/bin/oapService.bat
similarity index 100%
rename from apm-dist/bin/oapService.bat
rename to dist-material/bin/oapService.bat
diff --git a/apm-dist/bin/oapService.sh b/dist-material/bin/oapService.sh
similarity index 100%
rename from apm-dist/bin/oapService.sh
rename to dist-material/bin/oapService.sh
diff --git a/apm-dist/bin/oapServiceInit.bat b/dist-material/bin/oapServiceInit.bat
similarity index 100%
rename from apm-dist/bin/oapServiceInit.bat
rename to dist-material/bin/oapServiceInit.bat
diff --git a/apm-dist/bin/oapServiceInit.sh b/dist-material/bin/oapServiceInit.sh
similarity index 100%
rename from apm-dist/bin/oapServiceInit.sh
rename to dist-material/bin/oapServiceInit.sh
diff --git a/apm-dist/bin/oapServiceNoInit.bat b/dist-material/bin/oapServiceNoInit.bat
similarity index 100%
rename from apm-dist/bin/oapServiceNoInit.bat
rename to dist-material/bin/oapServiceNoInit.bat
diff --git a/apm-dist/bin/oapServiceNoInit.sh b/dist-material/bin/oapServiceNoInit.sh
similarity index 100%
rename from apm-dist/bin/oapServiceNoInit.sh
rename to dist-material/bin/oapServiceNoInit.sh
diff --git a/apm-dist/bin/startup.bat b/dist-material/bin/startup.bat
similarity index 100%
rename from apm-dist/bin/startup.bat
rename to dist-material/bin/startup.bat
diff --git a/apm-dist/bin/startup.sh b/dist-material/bin/startup.sh
similarity index 100%
rename from apm-dist/bin/startup.sh
rename to dist-material/bin/startup.sh
diff --git a/apm-dist/bin/webappService.bat b/dist-material/bin/webappService.bat
similarity index 100%
rename from apm-dist/bin/webappService.bat
rename to dist-material/bin/webappService.bat
diff --git a/apm-dist/bin/webappService.sh b/dist-material/bin/webappService.sh
similarity index 100%
rename from apm-dist/bin/webappService.sh
rename to dist-material/bin/webappService.sh
diff --git a/apm-dist/src/main/assembly/log4j2.xml b/dist-material/log4j2.xml
similarity index 100%
rename from apm-dist/src/main/assembly/log4j2.xml
rename to dist-material/log4j2.xml
diff --git a/apm-dist/release-docs/LICENSE b/dist-material/release-docs/LICENSE
similarity index 100%
rename from apm-dist/release-docs/LICENSE
rename to dist-material/release-docs/LICENSE
diff --git a/apm-dist/release-docs/NOTICE b/dist-material/release-docs/NOTICE
similarity index 100%
rename from apm-dist/release-docs/NOTICE
rename to dist-material/release-docs/NOTICE
diff --git a/apm-dist/release-docs/README.txt b/dist-material/release-docs/README.txt
similarity index 100%
rename from apm-dist/release-docs/README.txt
rename to dist-material/release-docs/README.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-H2.txt b/dist-material/release-docs/licenses/LICENSE-H2.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-H2.txt
rename to dist-material/release-docs/licenses/LICENSE-H2.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-antlr4-runtime.txt b/dist-material/release-docs/licenses/LICENSE-antlr4-runtime.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-antlr4-runtime.txt
rename to dist-material/release-docs/licenses/LICENSE-antlr4-runtime.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-asm.txt b/dist-material/release-docs/licenses/LICENSE-asm.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-asm.txt
rename to dist-material/release-docs/licenses/LICENSE-asm.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-aspectjweaver.txt b/dist-material/release-docs/licenses/LICENSE-aspectjweaver.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-aspectjweaver.txt
rename to dist-material/release-docs/licenses/LICENSE-aspectjweaver.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-bcpkix-jdk15on.txt b/dist-material/release-docs/licenses/LICENSE-bcpkix-jdk15on.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-bcpkix-jdk15on.txt
rename to dist-material/release-docs/licenses/LICENSE-bcpkix-jdk15on.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-bcprov-jdk15on.txt b/dist-material/release-docs/licenses/LICENSE-bcprov-jdk15on.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-bcprov-jdk15on.txt
rename to dist-material/release-docs/licenses/LICENSE-bcprov-jdk15on.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-compiler.txt b/dist-material/release-docs/licenses/LICENSE-compiler.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-compiler.txt
rename to dist-material/release-docs/licenses/LICENSE-compiler.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-consul-client.txt b/dist-material/release-docs/licenses/LICENSE-consul-client.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-consul-client.txt
rename to dist-material/release-docs/licenses/LICENSE-consul-client.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-error_prone_annotations.txt b/dist-material/release-docs/licenses/LICENSE-error_prone_annotations.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-error_prone_annotations.txt
rename to dist-material/release-docs/licenses/LICENSE-error_prone_annotations.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-fastjson.txt b/dist-material/release-docs/licenses/LICENSE-fastjson.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-fastjson.txt
rename to dist-material/release-docs/licenses/LICENSE-fastjson.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-gogo-protobuf.txt b/dist-material/release-docs/licenses/LICENSE-gogo-protobuf.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-gogo-protobuf.txt
rename to dist-material/release-docs/licenses/LICENSE-gogo-protobuf.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-graphql-java-tools.txt b/dist-material/release-docs/licenses/LICENSE-graphql-java-tools.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-graphql-java-tools.txt
rename to dist-material/release-docs/licenses/LICENSE-graphql-java-tools.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-graphql-java.txt b/dist-material/release-docs/licenses/LICENSE-graphql-java.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-graphql-java.txt
rename to dist-material/release-docs/licenses/LICENSE-graphql-java.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-groovy.txt b/dist-material/release-docs/licenses/LICENSE-groovy.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-groovy.txt
rename to dist-material/release-docs/licenses/LICENSE-groovy.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-grpc-gateway.txt b/dist-material/release-docs/licenses/LICENSE-grpc-gateway.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-grpc-gateway.txt
rename to dist-material/release-docs/licenses/LICENSE-grpc-gateway.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-hppc.txt b/dist-material/release-docs/licenses/LICENSE-hppc.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-hppc.txt
rename to dist-material/release-docs/licenses/LICENSE-hppc.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-httpcomponents.txt b/dist-material/release-docs/licenses/LICENSE-httpcomponents.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-httpcomponents.txt
rename to dist-material/release-docs/licenses/LICENSE-httpcomponents.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-instrumentation-api.txt b/dist-material/release-docs/licenses/LICENSE-instrumentation-api.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-instrumentation-api.txt
rename to dist-material/release-docs/licenses/LICENSE-instrumentation-api.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-jedis.txt b/dist-material/release-docs/licenses/LICENSE-jedis.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-jedis.txt
rename to dist-material/release-docs/licenses/LICENSE-jedis.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-jersey.txt b/dist-material/release-docs/licenses/LICENSE-jersey.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-jersey.txt
rename to dist-material/release-docs/licenses/LICENSE-jersey.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-jline.txt b/dist-material/release-docs/licenses/LICENSE-jline.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-jline.txt
rename to dist-material/release-docs/licenses/LICENSE-jline.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-jopt-simple.txt b/dist-material/release-docs/licenses/LICENSE-jopt-simple.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-jopt-simple.txt
rename to dist-material/release-docs/licenses/LICENSE-jopt-simple.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-logback.txt b/dist-material/release-docs/licenses/LICENSE-logback.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-logback.txt
rename to dist-material/release-docs/licenses/LICENSE-logback.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-minimal-json.txt b/dist-material/release-docs/licenses/LICENSE-minimal-json.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-minimal-json.txt
rename to dist-material/release-docs/licenses/LICENSE-minimal-json.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-okhttp.txt b/dist-material/release-docs/licenses/LICENSE-okhttp.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-okhttp.txt
rename to dist-material/release-docs/licenses/LICENSE-okhttp.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-percolator-client.txt b/dist-material/release-docs/licenses/LICENSE-percolator-client.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-percolator-client.txt
rename to dist-material/release-docs/licenses/LICENSE-percolator-client.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-proto-google-common-protos.txt b/dist-material/release-docs/licenses/LICENSE-proto-google-common-protos.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-proto-google-common-protos.txt
rename to dist-material/release-docs/licenses/LICENSE-proto-google-common-protos.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-protobuf-java-util.txt b/dist-material/release-docs/licenses/LICENSE-protobuf-java-util.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-protobuf-java-util.txt
rename to dist-material/release-docs/licenses/LICENSE-protobuf-java-util.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-protobuf-java.txt b/dist-material/release-docs/licenses/LICENSE-protobuf-java.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-protobuf-java.txt
rename to dist-material/release-docs/licenses/LICENSE-protobuf-java.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-reactive-streams.txt b/dist-material/release-docs/licenses/LICENSE-reactive-streams.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-reactive-streams.txt
rename to dist-material/release-docs/licenses/LICENSE-reactive-streams.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-reflectasm.txt b/dist-material/release-docs/licenses/LICENSE-reflectasm.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-reflectasm.txt
rename to dist-material/release-docs/licenses/LICENSE-reflectasm.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-reindex-client.txt b/dist-material/release-docs/licenses/LICENSE-reindex-client.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-reindex-client.txt
rename to dist-material/release-docs/licenses/LICENSE-reindex-client.txt
diff --git a/apm-dist/release-docs/licenses/LICENSE-slf4j.txt b/dist-material/release-docs/licenses/LICENSE-slf4j.txt
similarity index 100%
rename from apm-dist/release-docs/licenses/LICENSE-slf4j.txt
rename to dist-material/release-docs/licenses/LICENSE-slf4j.txt
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-axios b/dist-material/release-docs/licenses/ui-licenses/LICENSE-axios
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-axios
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-axios
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3 b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-array b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-array
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-array
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-array
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-axis b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-axis
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-axis
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-axis
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-brush b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-brush
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-brush
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-brush
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-chord b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-chord
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-chord
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-chord
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-collection b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-collection
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-collection
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-collection
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-color b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-color
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-color
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-color
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-contour b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-contour
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-contour
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-contour
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-dispatch b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-dispatch
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-dispatch
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-dispatch
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-drag b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-drag
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-drag
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-drag
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-dsv b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-dsv
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-dsv
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-dsv
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-ease b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-ease
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-ease
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-ease
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-force b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-force
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-force
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-force
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-format b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-format
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-format
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-format
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-geo b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-geo
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-geo
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-geo
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-hierarchy b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-hierarchy
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-hierarchy
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-hierarchy
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-interpolate b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-interpolate
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-interpolate
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-interpolate
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-path b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-path
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-path
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-path
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-polygon b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-polygon
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-polygon
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-polygon
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-quadtree b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-quadtree
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-quadtree
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-quadtree
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-queue b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-queue
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-queue
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-queue
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-random b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-random
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-random
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-random
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-request b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-request
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-request
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-request
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-scale b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-scale
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-scale
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-scale
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-scale-chromatic b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-scale-chromatic
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-scale-chromatic
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-scale-chromatic
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-selection b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-selection
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-selection
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-selection
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-shape b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-shape
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-shape
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-shape
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-time b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-time
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-time
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-time
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-time-format b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-time-format
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-time-format
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-time-format
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-timer b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-timer
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-timer
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-timer
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-tip b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-tip
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-tip
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-tip
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-transition b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-transition
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-transition
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-transition
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-voronoi b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-voronoi
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-voronoi
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-voronoi
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-zoom b/dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-zoom
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-d3-zoom
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-d3-zoom
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-dayjs b/dist-material/release-docs/licenses/ui-licenses/LICENSE-dayjs
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-dayjs
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-dayjs
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-echarts b/dist-material/release-docs/licenses/ui-licenses/LICENSE-echarts
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-echarts
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-echarts
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-elementui b/dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-elementui
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-lodash b/dist-material/release-docs/licenses/ui-licenses/LICENSE-lodash
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-lodash
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-lodash
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-popperjs b/dist-material/release-docs/licenses/ui-licenses/LICENSE-popperjs
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-popperjs
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-popperjs
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-class-component b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-class-component
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-class-component
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-class-component
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-datepicker-local b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-datepicker-local
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-datepicker-local
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-datepicker-local
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-i18n b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-i18n
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-i18n
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-i18n
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-js-modal b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-js-modal
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-js-modal
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-js-modal
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-property-decorator b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-property-decorator
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-property-decorator
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-property-decorator
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-router b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-router
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vue-router
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vue-router
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vuex b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vuex
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vuex
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vuex
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-vuex-class b/dist-material/release-docs/licenses/ui-licenses/LICENSE-vuex-class
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-vuex-class
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-vuex-class
diff --git a/apm-dist/release-docs/licenses/ui-licenses/LICENSE-zrender b/dist-material/release-docs/licenses/ui-licenses/LICENSE-zrender
similarity index 100%
rename from apm-dist/release-docs/licenses/ui-licenses/LICENSE-zrender
rename to dist-material/release-docs/licenses/ui-licenses/LICENSE-zrender
diff --git a/pom.xml b/pom.xml
index 1ef740c..30a61d6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>