This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 ac86ecf Remove useless snakeyaml import (#16038)
ac86ecf is described below
commit ac86ecffb706919f2b23552810f53524bfc1d93f
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 13 23:29:24 2022 +0800
Remove useless snakeyaml import (#16038)
---
examples/pom.xml | 71 ++++++++++++----------
.../shardingsphere-example-generator/pom.xml | 9 +--
pom.xml | 22 +++----
.../shardingsphere-agent-core/pom.xml | 1 +
.../shardingsphere-sharding-core/pom.xml | 5 +-
.../shardingsphere-rewrite-test/pom.xml | 4 --
6 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index bfd974c..467b456 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -189,10 +189,11 @@
</dependency>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectjweaver.version}</version>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
@@ -219,21 +220,6 @@
<version>${spring-framework.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>${jpa.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
@@ -249,6 +235,27 @@
<version>${spring-boot.version}</version>
</dependency>
<dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectjweaver.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>${jpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
@@ -263,11 +270,7 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot.version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.btm</groupId>
- <artifactId>btm</artifactId>
- <version>${btm.version}</version>
- </dependency>
+
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jta</artifactId>
@@ -289,10 +292,22 @@
<version>${jboss-logging.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.btm</groupId>
+ <artifactId>btm</artifactId>
+ <version>${btm.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
<version>${seata.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -305,16 +320,6 @@
<version>${spring-framework.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
b/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
index bbd191e..7e8bb8e 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
@@ -32,13 +32,14 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-infra-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
+
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index e781546..a7903c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,6 +173,17 @@
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>${antlr4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${bytebuddy.version}</version>
@@ -211,21 +222,10 @@
</dependency>
<dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-runtime</artifactId>
- <version>${antlr4.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/shardingsphere-agent/shardingsphere-agent-core/pom.xml
b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
index ae7176c..b29bffb 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
@@ -35,6 +35,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
index f6ea86d..e5d2569 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
@@ -119,10 +119,7 @@
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
+
<dependency>
<groupId>me.ahoo.cosid</groupId>
<artifactId>cosid-core</artifactId>
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
index fa9a2f3..5b893c4 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
@@ -88,10 +88,6 @@
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
