From c4007fb6797e16a4e24a7073d45db6eff57846dc Mon Sep 17 00:00:00 2001
From: yanyzy <1181862765@qq.com>
Date: Wed, 13 May 2020 16:02:36 +0800
Subject: [PATCH] resolve merge conflicts

---
 shadow-core/shadow-core-common/pom.xml                 | 10 ----------
 .../jdbc/wrapper/JDBCExecutorWrapper.java              |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/shadow-core/shadow-core-common/pom.xml b/shadow-core/shadow-core-common/pom.xml
index 41df15b36c..b5f9a204be 100644
--- a/shadow-core/shadow-core-common/pom.xml
+++ b/shadow-core/shadow-core-common/pom.xml
@@ -30,16 +30,6 @@
     <name>${project.artifactId}</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-core-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-route</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shadow-core-api</artifactId>
diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/JDBCExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/JDBCExecutorWrapper.java
index b39d5eecce..ef5de32b32 100644
--- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/JDBCExecutorWrapper.java
+++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/JDBCExecutorWrapper.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.wrapp
 
 import org.apache.shardingsphere.metrics.enums.MetricsLabelEnum;
 import org.apache.shardingsphere.metrics.facade.MetricsTrackerFacade;
-import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
+import org.apache.shardingsphere.shadow.core.rule.ShadowRule;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.context.ExecutionContext;
 import org.apache.shardingsphere.underlying.executor.sql.group.ExecuteGroupEngine;
-- 
GitLab