This is an automated email from the ASF dual-hosted git repository.
yx9o 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 a3217e3fddf Add shade common config in root pom (#23245)
a3217e3fddf is described below
commit a3217e3fddf48688d0d65d2f8b2c9a611217143d
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 1 16:49:31 2023 +0800
Add shade common config in root pom (#23245)
---
agent/core/pom.xml | 15 +--------------
agent/plugins/core/pom.xml | 12 ------------
agent/plugins/logging/base/pom.xml | 12 ------------
agent/plugins/metrics/core/pom.xml | 12 ------------
agent/plugins/metrics/type/prometheus/pom.xml | 16 ----------------
agent/plugins/tracing/type/jaeger/pom.xml | 12 ------------
agent/plugins/tracing/type/opentelemetry/pom.xml | 12 ------------
agent/plugins/tracing/type/opentracing/pom.xml | 12 ------------
agent/plugins/tracing/type/zipkin/pom.xml | 12 ------------
pom.xml | 17 +++++++++++++++++
10 files changed, 18 insertions(+), 114 deletions(-)
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index 0203ceacbdd..339769ebb94 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -65,10 +65,7 @@
</goals>
<phase>package</phase>
<configuration>
-
<shadedArtifactAttached>false</shadedArtifactAttached>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
- <createSourcesJar>true</createSourcesJar>
- <shadeSourcesContent>true</shadeSourcesContent>
+ <minimizeJar>false</minimizeJar>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
@@ -104,16 +101,6 @@
<shadedPattern>${shade.package}.ch.qos.logback</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/core/pom.xml b/agent/plugins/core/pom.xml
index 06f3f82d471..63958c70590 100644
--- a/agent/plugins/core/pom.xml
+++ b/agent/plugins/core/pom.xml
@@ -36,8 +36,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -53,16 +51,6 @@
<shadedPattern>${shade.package}.com.google.common</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/logging/base/pom.xml
b/agent/plugins/logging/base/pom.xml
index 720404746a9..20f3fcf904b 100644
--- a/agent/plugins/logging/base/pom.xml
+++ b/agent/plugins/logging/base/pom.xml
@@ -36,8 +36,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -53,16 +51,6 @@
<shadedPattern>${shade.package}.org.slf4j</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/metrics/core/pom.xml
b/agent/plugins/metrics/core/pom.xml
index 9192f1d36a6..6cfe0ac4b87 100644
--- a/agent/plugins/metrics/core/pom.xml
+++ b/agent/plugins/metrics/core/pom.xml
@@ -57,8 +57,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -78,16 +76,6 @@
<shadedPattern>${shade.package}.net.bytebuddy</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/metrics/type/prometheus/pom.xml
b/agent/plugins/metrics/type/prometheus/pom.xml
index 72acfc59945..a5a64d2adf3 100644
--- a/agent/plugins/metrics/type/prometheus/pom.xml
+++ b/agent/plugins/metrics/type/prometheus/pom.xml
@@ -92,8 +92,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -124,25 +122,11 @@
<pattern>org.checkerframework</pattern>
<shadedPattern>${shade.package}.org.checkerframework</shadedPattern>
</relocation>
- <relocation>
- <pattern>org.slf4j</pattern>
-
<shadedPattern>${shade.package}.org.slf4j</shadedPattern>
- </relocation>
<relocation>
<pattern>com.google.errorprone.annotations</pattern>
<shadedPattern>${shade.package}.com.google.errorprone.annotations</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/tracing/type/jaeger/pom.xml
b/agent/plugins/tracing/type/jaeger/pom.xml
index 994cfcd3bb6..5030b490788 100644
--- a/agent/plugins/tracing/type/jaeger/pom.xml
+++ b/agent/plugins/tracing/type/jaeger/pom.xml
@@ -57,8 +57,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -110,16 +108,6 @@
<shadedPattern>${shade.package}.com.twitter.zipkin.thriftjava</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml
b/agent/plugins/tracing/type/opentelemetry/pom.xml
index 7110831f615..fae1a879906 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -77,8 +77,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -134,16 +132,6 @@
<shadedPattern>${shade.package}.org.checkerframework</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/tracing/type/opentracing/pom.xml
b/agent/plugins/tracing/type/opentracing/pom.xml
index e7fb3f9c8ca..225822d66d0 100644
--- a/agent/plugins/tracing/type/opentracing/pom.xml
+++ b/agent/plugins/tracing/type/opentracing/pom.xml
@@ -47,8 +47,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -76,16 +74,6 @@
<shadedPattern>${shade.package}.org.checkerframework</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/agent/plugins/tracing/type/zipkin/pom.xml
b/agent/plugins/tracing/type/zipkin/pom.xml
index ac1e4aad7a2..4eb51ce6f6d 100644
--- a/agent/plugins/tracing/type/zipkin/pom.xml
+++ b/agent/plugins/tracing/type/zipkin/pom.xml
@@ -61,8 +61,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <minimizeJar>true</minimizeJar>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>${target.directory}/${project.build.finalName}.jar</outputFile>
</configuration>
<executions>
@@ -98,16 +96,6 @@
<shadedPattern>${shade.package}.brave</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 3446fa78d8d..60d8059b051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,6 +682,23 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <shadeSourcesContent>true</shadeSourcesContent>
+
<createDependencyReducedPom>false</createDependencyReducedPom>
+ <createSourcesJar>false</createSourcesJar>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
