This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch 5.1.0-release
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/5.1.0-release by this push:
new fd6bf00 refactor agent distribution
new 6ad4de8 Merge remote-tracking branch 'origin/5.1.0-release' into
5.1.0-release
fd6bf00 is described below
commit fd6bf00af31b3258a836e4ae1e9453aa7c19a975
Author: menghaoran <[email protected]>
AuthorDate: Sun Jan 2 22:36:46 2022 +0800
refactor agent distribution
---
.github/workflows/it.yml | 2 +-
.../shardingsphere-agent-binary-distribution.xml | 10 ++++-----
.../licenses/LICENSE-bvprov-jdk15on.txt | 24 ----------------------
.../shardingsphere-proxy-agent-jaeger-assembly.xml | 2 +-
...ngsphere-proxy-agent-opentelemetry-assembly.xml | 2 +-
.../shardingsphere-proxy-agent-zipkin-assembly.xml | 2 +-
6 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index e33ef85..af42425 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -108,6 +108,6 @@ jobs:
with:
java-version: 8
- name: Build Project
- run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs -DskipTests -Prelease
+ run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs -DskipTests
- name: Run Integration Test
run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
-Pit.env.opentelemetry
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 d86c661..151d894 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
@@ -20,10 +20,10 @@
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>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
<baseDirectory>${project.build.finalName}-shardingsphere-agent-bin</baseDirectory>
<fileSets>
<fileSet>
@@ -41,7 +41,7 @@
</fileSet>
<fileSet>
-
<directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/target/plugins</directory>
+
<directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
@@ -49,14 +49,14 @@
</fileSet>
<fileSet>
-
<directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
+
<directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
<fileSet>
-
<directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/target/plugins</directory>
+
<directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-bvprov-jdk15on.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-bvprov-jdk15on.txt
deleted file mode 100644
index d14347e..0000000
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-bvprov-jdk15on.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Bcprov-jdk15on License
----------------
-
-Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
-
-MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
index b46dde2..9f7d386 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
-
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/target</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-jaeger-*.jar</include>
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
index 4a414ff..145250f 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
-
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-opentelemetry-*.jar</include>
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
index fe91026..20086a1 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
-
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+
<directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-zipkin-*.jar</include>
