Skip to content

Commit

Permalink
Add shade common config in root pom (apache#23245)
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu authored Jan 1, 2023
1 parent 7917780 commit a3217e3
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 114 deletions.
15 changes: 1 addition & 14 deletions agent/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/logging/base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/metrics/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
16 changes: 0 additions & 16 deletions agent/plugins/metrics/type/prometheus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/tracing/type/jaeger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/tracing/type/opentelemetry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/tracing/type/opentracing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions agent/plugins/tracing/type/zipkin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
17 changes: 17 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a3217e3

Please sign in to comment.