You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/17 09:32:32 UTC
[shardingsphere] branch master updated: Refactor shade (#22931)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 87b8afa9b1b Refactor shade (#22931)
87b8afa9b1b is described below
commit 87b8afa9b1b713b2109aaee4c8f0d5d740b38cd2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 17 17:32:25 2022 +0800
Refactor shade (#22931)
* Add plugin-core module
* Split agent-core to agent-core and plugin-core
* Split agent-core to agent-core and plugin-core
* Update javadoc
* debug shade
* Remove core shade
* Adjust assembly
* Update pom
* Refactor shade
* Refactor shade
* Refactor shade
* Refactor shade
* Refactor shade
* Refactor shade
* Refactor shade
---
agent/bootstrap/pom.xml | 20 ++++--
agent/core/pom.xml | 72 ++++------------------
.../yaml/entity/YamlPointcutConfiguration.java | 2 +-
.../swapper/YamlAdvisorsConfigurationSwapper.java | 2 +-
.../ConstructorYamlAdvisorConfigurationTest.java | 2 +-
...ceMethodAroundYamlAdvisorConfigurationTest.java | 2 +-
...icMethodAroundYamlAdvisorConfigurationTest.java | 2 +-
agent/plugins/pom.xml | 8 +--
.../adviser/impl/CommandExecutorTaskAdviser.java | 2 +-
.../adviser/impl/JDBCExecutorCallbackAdviser.java | 2 +-
.../adviser/impl/SQLParserEngineAdviser.java | 2 +-
11 files changed, 38 insertions(+), 78 deletions(-)
diff --git a/agent/bootstrap/pom.xml b/agent/bootstrap/pom.xml
index 46877b2f1c6..fdd0433619f 100644
--- a/agent/bootstrap/pom.xml
+++ b/agent/bootstrap/pom.xml
@@ -66,12 +66,12 @@
</transformers>
<artifactSet>
<excludes>
- <exclude>com.google.*:*</exclude>
- <exclude>com.google.guava:guava:*</exclude>
- <exclude>org.checkerframework:checker-qual:*</exclude>
- <exclude>org.slf4j:*</exclude>
- <exclude>org.yaml:snakeyaml:*</exclude>
- <exclude>org.apache.commons:logging:*</exclude>
+ <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
+ <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
+ <exclude>com.google.guava:listenablefuture:jar:*</exclude>
+ <exclude>com.google.j2objc:j2objc-annotations:jar:*</exclude>
+ <exclude>org.checkerframework:checker-qual:jar:</exclude>
+ <exclude>com.h2database:h2:jar:</exclude>
</excludes>
</artifactSet>
<relocations>
@@ -79,10 +79,18 @@
<pattern>net.bytebuddy</pattern>
<shadedPattern>${shade.package}.net.bytebuddy</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.yaml</pattern>
+ <shadedPattern>${shade.package}.org.yaml</shadedPattern>
+ </relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${shade.package}.com.google</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>${shade.package}.org.apache.commons</shadedPattern>
+ </relocation>
</relocations>
<filters>
<filter>
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index 467680d2e51..eafcfbb9b0b 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -44,70 +44,22 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>shade</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>net.bytebuddy:*</exclude>
- <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
- <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
- <exclude>org.checkerframework:checker-qual:jar:</exclude>
- <exclude>com.google.guava:listenablefuture:jar:*</exclude>
- <exclude>com.google.j2objc:j2objc-annotations:jar:*</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.yaml</pattern>
- <shadedPattern>${shade.package}.org.yaml</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>${shade.package}.com.google</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>${shade.package}.org.apache.commons</shadedPattern>
- </relocation>
- <relocation>
- <pattern>ch.qos.logback</pattern>
- <shadedPattern>${shade.package}.ch.qos.logback</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.slf4j</pattern>
- <shadedPattern>${shade.package}.org.slf4j</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>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
index 3df25da936f..4373da6d8d4 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
/**
- * Yaml pointcut configuration.
+ * YAML pointcut configuration.
*/
@Getter
@Setter
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index de8f73a73c1..560f00ab5cc 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
public final class YamlAdvisorsConfigurationSwapper {
/**
- * unmarshal advisors configuration.
+ * Unmarshal advisors configuration.
*
* @param inputStream input stream
* @return unmarshalled advisors configuration
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
index 8c6568abee9..7986e4c5ce9 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
@@ -42,8 +42,8 @@ import java.util.LinkedList;
import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertArrayEquals;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertArrayEquals;
public final class ConstructorYamlAdvisorConfigurationTest {
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
index 27e496bf917..c31d96c01b9 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
@@ -46,8 +46,8 @@ import java.util.LinkedList;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertArrayEquals;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
index 76cf15ba36e..b0178daae90 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
@@ -46,8 +46,8 @@ import java.util.LinkedList;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertArrayEquals;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
diff --git a/agent/plugins/pom.xml b/agent/plugins/pom.xml
index 0ffd212d305..f599da4248f 100644
--- a/agent/plugins/pom.xml
+++ b/agent/plugins/pom.xml
@@ -59,13 +59,13 @@
<shadeSourcesContent>true</shadeSourcesContent>
<artifactSet>
<excludes>
- <exclude>net.bytebuddy:byte-buddy:jar:</exclude>
+ <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
+ <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
+ <exclude>com.google.guava:listenablefuture:jar:*</exclude>
+ <exclude>com.google.j2objc:j2objc-annotations:jar:*</exclude>
<exclude>org.checkerframework:checker-qual:jar:</exclude>
<exclude>com.h2database:h2:jar:</exclude>
- <exclude>com.google.*:*</exclude>
- <exclude>com.google.guava:guava:*</exclude>
<exclude>org.slf4j:*</exclude>
- <exclude>org.yaml:snakeyaml:*</exclude>
<exclude>org.apache.commons:logging:*</exclude>
</excludes>
</artifactSet>
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
index 704c0a90922..5c6cb5c37be 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
+import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
index f813878bc1c..3c4fab233f8 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
+import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
index c4c09b51fb4..a253857b7f8 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
+import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;