diff --git a/shardingsphere-proxy/pom.xml b/shardingsphere-proxy/pom.xml index 1735c58cbeac5d4f5c42d22c68ec638e2b3ae444..5e4aca6553b5ad184f3397e80340696ac279fbae 100644 --- a/shardingsphere-proxy/pom.xml +++ b/shardingsphere-proxy/pom.xml @@ -37,6 +37,5 @@ shardingsphere-proxy-frontend shardingsphere-proxy-backend shardingsphere-proxy-bootstrap - shardingsphere-proxy-governance diff --git a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/HikariJDBCParameterDecorator.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/datasource/HikariJDBCParameterDecorator.java similarity index 97% rename from shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/HikariJDBCParameterDecorator.java rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/datasource/HikariJDBCParameterDecorator.java index c6af5ff1695f5706e01e41d33ae56dff6eac91d8..95e42012ed171bc6ca75b49770f3758906234e9f 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/HikariJDBCParameterDecorator.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/datasource/HikariJDBCParameterDecorator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.proxy.governance.schema; +package org.apache.shardingsphere.proxy.backend.datasource; import com.zaxxer.hikari.HikariDataSource; import org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator; diff --git a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator similarity index 90% rename from shardingsphere-proxy/shardingsphere-proxy-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator index bb4db5294f5b323d14a9c029011a508dd992b6e6..dcca2d283b5f46b42bdd14c90bdc60ba51816910 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.JDBCParameterDecorator @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.proxy.governance.schema.HikariJDBCParameterDecorator +org.apache.shardingsphere.proxy.backend.datasource.HikariJDBCParameterDecorator diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml index 2163852e3b24ceac9a22c16b03c034c9dab71c08..3a8f726d0040c9702309cf725ab6042236d22530 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml +++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml @@ -69,14 +69,26 @@ org.apache.shardingsphere - shardingsphere-proxy-governance + shardingsphere-governance-core-facade ${project.version} + + org.apache.shardingsphere + shardingsphere-governance-repository-zookeeper-curator + ${project.version} + + + org.apache.shardingsphere + shardingsphere-governance-core-schema + ${project.parent.version} + + org.apache.shardingsphere shardingsphere-tracing-opentracing ${project.version} + com.zaxxer HikariCP diff --git a/shardingsphere-proxy/shardingsphere-proxy-governance/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-governance/pom.xml deleted file mode 100644 index 9927316a05bff87e59032aee09a40e371e75fe53..0000000000000000000000000000000000000000 --- a/shardingsphere-proxy/shardingsphere-proxy-governance/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - org.apache.shardingsphere - shardingsphere-proxy - 5.0.0-RC1-SNAPSHOT - - 4.0.0 - - shardingsphere-proxy-governance - - - - org.apache.shardingsphere - shardingsphere-proxy-common - ${project.version} - - - org.apache.shardingsphere - shardingsphere-proxy-backend - ${project.version} - - - org.apache.shardingsphere - shardingsphere-governance-core-facade - ${project.version} - - - org.apache.shardingsphere - shardingsphere-governance-repository-zookeeper-curator - ${project.version} - - - org.apache.shardingsphere - shardingsphere-governance-core-schema - ${project.parent.version} - - - - com.zaxxer - HikariCP - compile - - -