diff --git a/ecosystem/error-handler/spi/pom.xml b/ecosystem/error-handler/spi/pom.xml
index 42dff33886..62c701735b 100644
--- a/ecosystem/error-handler/spi/pom.xml
+++ b/ecosystem/error-handler/spi/pom.xml
@@ -28,7 +28,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/ecosystem/error-handler/type/general/pom.xml b/ecosystem/error-handler/type/general/pom.xml
index f3cf22792d..df581f134f 100644
--- a/ecosystem/error-handler/type/general/pom.xml
+++ b/ecosystem/error-handler/type/general/pom.xml
@@ -33,7 +33,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/ecosystem/executor/kernel/pom.xml b/ecosystem/executor/kernel/pom.xml
index 07c9570179..77b8c2a6a3 100644
--- a/ecosystem/executor/kernel/pom.xml
+++ b/ecosystem/executor/kernel/pom.xml
@@ -34,7 +34,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/ecosystem/tracing/api/pom.xml b/ecosystem/tracing/api/pom.xml
index 287846d289..2a4caf1904 100644
--- a/ecosystem/tracing/api/pom.xml
+++ b/ecosystem/tracing/api/pom.xml
@@ -34,7 +34,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/engine/core/pom.xml b/engine/core/pom.xml
index 26d0432ba6..6f598522f7 100644
--- a/engine/core/pom.xml
+++ b/engine/core/pom.xml
@@ -34,7 +34,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
deleted file mode 100644
index 518a2556bf..0000000000
--- a/infra/common/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- 4.0.0
-
- org.apache.shardingsphere.elasticjob
- elasticjob-infra
- 3.1.0-SNAPSHOT
-
- elasticjob-infra-common
- ${project.artifactId}
-
-
-
- org.apache.shardingsphere.elasticjob
- elasticjob-api
- ${project.parent.version}
-
-
-
- org.apache.commons
- commons-lang3
-
-
- org.yaml
- snakeyaml
-
-
- com.google.code.gson
- gson
-
-
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
-
-
- org.slf4j
- jcl-over-slf4j
- test
-
-
- org.slf4j
- log4j-over-slf4j
- test
-
-
- ch.qos.logback
- logback-classic
- test
-
-
- org.awaitility
- awaitility
- test
-
-
-
diff --git a/infra/pom.xml b/infra/pom.xml
index 94b1426be6..bc8f70d631 100644
--- a/infra/pom.xml
+++ b/infra/pom.xml
@@ -24,12 +24,52 @@
3.1.0-SNAPSHOT
elasticjob-infra
- pom
${project.artifactId}
-
- common
- registry-center
- restful
-
+
+
+ org.apache.shardingsphere.elasticjob
+ elasticjob-api
+ ${project.parent.version}
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.yaml
+ snakeyaml
+
+
+ com.google.code.gson
+ gson
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ test
+
+
+ org.slf4j
+ log4j-over-slf4j
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ test
+
+
+ org.awaitility
+ awaitility
+ test
+
+
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorService.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorService.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorService.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorService.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadable.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadable.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadable.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadable.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/Reloadable.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/Reloadable.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/Reloadable.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/Reloadable.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ReloadablePostProcessor.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ReloadablePostProcessor.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ReloadablePostProcessor.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ReloadablePostProcessor.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParameters.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParameters.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParameters.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParameters.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/TimeService.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/TimeService.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/TimeService.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/TimeService.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstance.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstance.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstance.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstance.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategy.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategy.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategy.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategy.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactory.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactory.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactory.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactory.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategy.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategy.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategy.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategy.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategy.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategy.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategy.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategy.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RoundRobinByNameJobShardingStrategy.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RoundRobinByNameJobShardingStrategy.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RoundRobinByNameJobShardingStrategy.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RoundRobinByNameJobShardingStrategy.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandler.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandler.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandler.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandler.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactory.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactory.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactory.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactory.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/AbstractJobExecutorServiceHandler.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/AbstractJobExecutorServiceHandler.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/AbstractJobExecutorServiceHandler.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/AbstractJobExecutorServiceHandler.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandler.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandler.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandler.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandler.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandler.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandler.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandler.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandler.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactory.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactory.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactory.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactory.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJO.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJO.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJO.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJO.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/SPIPostProcessor.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/SPIPostProcessor.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/SPIPostProcessor.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/SPIPostProcessor.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/TypedSPI.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/TypedSPI.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/TypedSPI.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/TypedSPI.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/exception/ServiceLoaderInstantiationException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/exception/ServiceLoaderInstantiationException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/exception/ServiceLoaderInstantiationException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/exception/ServiceLoaderInstantiationException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRule.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRule.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRule.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRule.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidator.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidator.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidator.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidator.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactory.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactory.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactory.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactory.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/exception/YamlConfigurationConverterNotFoundException.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/exception/YamlConfigurationConverterNotFoundException.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/exception/YamlConfigurationConverterNotFoundException.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/exception/YamlConfigurationConverterNotFoundException.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java b/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java
similarity index 100%
rename from infra/common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java
rename to infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java
diff --git a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.context.Reloadable b/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.context.Reloadable
similarity index 100%
rename from infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.context.Reloadable
rename to infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.context.Reloadable
diff --git a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy b/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy
similarity index 100%
rename from infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy
rename to infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy
diff --git a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandler b/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandler
similarity index 100%
rename from infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandler
rename to infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandler
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/TypedFooService.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/TypedFooService.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/TypedFooService.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/TypedFooService.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/UnRegisteredTypedFooService.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/UnRegisteredTypedFooService.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/UnRegisteredTypedFooService.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/UnRegisteredTypedFooService.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/TypedFooServiceImpl.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/TypedFooServiceImpl.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/TypedFooServiceImpl.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/TypedFooServiceImpl.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/UnRegisteredTypedFooServiceImpl.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/UnRegisteredTypedFooServiceImpl.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/UnRegisteredTypedFooServiceImpl.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/fixture/impl/UnRegisteredTypedFooServiceImpl.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java b/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java
similarity index 100%
rename from infra/common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java
rename to infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java
diff --git a/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
similarity index 100%
rename from infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
rename to infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
diff --git a/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.TypedFooService b/infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.TypedFooService
similarity index 100%
rename from infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.TypedFooService
rename to infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.TypedFooService
diff --git a/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.UnRegisteredTypedFooService b/infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.UnRegisteredTypedFooService
similarity index 100%
rename from infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.UnRegisteredTypedFooService
rename to infra/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.spi.fixture.UnRegisteredTypedFooService
diff --git a/infra/common/src/test/resources/logback-test.xml b/infra/src/test/resources/logback-test.xml
similarity index 100%
rename from infra/common/src/test/resources/logback-test.xml
rename to infra/src/test/resources/logback-test.xml
diff --git a/pom.xml b/pom.xml
index 9d391c39dd..ee1e73e550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,8 @@
api
infra
engine
+ registry-center
+ restful
ecosystem
distribution
diff --git a/infra/registry-center/api/pom.xml b/registry-center/api/pom.xml
similarity index 100%
rename from infra/registry-center/api/pom.xml
rename to registry-center/api/pom.xml
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/CoordinatorRegistryCenter.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/ElectionCandidate.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/LeaderExecutionCallback.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/RegistryCenter.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperation.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/IgnoredExceptionProvider.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegException.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandler.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/ConnectionStateChangedEventListener.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEvent.java
diff --git a/infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java b/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
similarity index 100%
rename from infra/registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
rename to registry-center/api/src/main/java/org/apache/shardingsphere/elasticjob/reg/listener/DataChangedEventListener.java
diff --git a/infra/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java b/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java
similarity index 100%
rename from infra/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java
rename to registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java
diff --git a/infra/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java b/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
similarity index 100%
rename from infra/registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
rename to registry-center/api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java
diff --git a/infra/registry-center/pom.xml b/registry-center/pom.xml
similarity index 96%
rename from infra/registry-center/pom.xml
rename to registry-center/pom.xml
index 10f70dfb0f..bac7be6a3f 100644
--- a/infra/registry-center/pom.xml
+++ b/registry-center/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.apache.shardingsphere.elasticjob
- elasticjob-infra
+ elasticjob
3.1.0-SNAPSHOT
elasticjob-registry-center
diff --git a/infra/registry-center/provider/pom.xml b/registry-center/provider/pom.xml
similarity index 100%
rename from infra/registry-center/provider/pom.xml
rename to registry-center/provider/pom.xml
diff --git a/infra/registry-center/provider/zookeeper-curator/pom.xml b/registry-center/provider/zookeeper-curator/pom.xml
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/pom.xml
rename to registry-center/provider/zookeeper-curator/pom.xml
diff --git a/infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java b/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
rename to registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfiguration.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java b/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
rename to registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionService.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java b/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
rename to registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenter.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java b/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
rename to registry-center/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProvider.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider b/registry-center/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
rename to registry-center/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.reg.exception.IgnoredExceptionProvider
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/fixture/EmbedTestingServer.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java b/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
rename to registry-center/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/util/ZookeeperRegistryCenterTestUtil.java
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local.properties b/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local.properties
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local.properties
rename to registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local.properties
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties b/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties
rename to registry-center/provider/zookeeper-curator/src/test/resources/conf/reg/local_overwrite.properties
diff --git a/infra/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml b/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
similarity index 100%
rename from infra/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
rename to registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
diff --git a/infra/restful/README.md b/restful/README.md
similarity index 100%
rename from infra/restful/README.md
rename to restful/README.md
diff --git a/infra/restful/pom.xml b/restful/pom.xml
similarity index 95%
rename from infra/restful/pom.xml
rename to restful/pom.xml
index 3a15d0ddc3..8d7e85f378 100644
--- a/infra/restful/pom.xml
+++ b/restful/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.apache.shardingsphere.elasticjob
- elasticjob-infra
+ elasticjob
3.1.0-SNAPSHOT
elasticjob-restful
@@ -29,7 +29,7 @@
org.apache.shardingsphere.elasticjob
- elasticjob-infra-common
+ elasticjob-infra
${project.parent.version}
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Filter.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Filter.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Filter.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Filter.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Http.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Http.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Http.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/Http.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulService.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulService.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulService.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulService.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulServiceConfiguration.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulServiceConfiguration.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulServiceConfiguration.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/NettyRestfulServiceConfiguration.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ContextPath.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ContextPath.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ContextPath.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ContextPath.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Mapping.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Mapping.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Mapping.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Mapping.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Param.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Param.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Param.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Param.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ParamSource.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ParamSource.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ParamSource.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/ParamSource.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/RequestBody.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/RequestBody.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/RequestBody.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/RequestBody.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Returning.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Returning.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Returning.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/annotation/Returning.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/DeserializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/DeserializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/DeserializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/DeserializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultJsonRequestBodyDeserializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultJsonRequestBodyDeserializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultJsonRequestBodyDeserializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultJsonRequestBodyDeserializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultTextPlainRequestBodyDeserializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultTextPlainRequestBodyDeserializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultTextPlainRequestBodyDeserializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/factory/impl/DefaultTextPlainRequestBodyDeserializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultJsonRequestBodyDeserializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultTextPlainRequestBodyDeserializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultTextPlainRequestBodyDeserializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultTextPlainRequestBodyDeserializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/impl/DefaultTextPlainRequestBodyDeserializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChain.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChain.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChain.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChain.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/FilterChain.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/FilterChain.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/FilterChain.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/filter/FilterChain.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandleContext.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandleContext.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandleContext.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandleContext.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/Handler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/Handler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/Handler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/Handler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerParameter.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerParameter.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerParameter.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerParameter.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultExceptionHandler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultExceptionHandler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultExceptionHandler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultExceptionHandler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultHandlerNotFoundExceptionHandler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultHandlerNotFoundExceptionHandler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultHandlerNotFoundExceptionHandler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/impl/DefaultHandlerNotFoundExceptionHandler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/DefaultMappingContext.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/DefaultMappingContext.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/DefaultMappingContext.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/DefaultMappingContext.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexUrlPatternMap.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexUrlPatternMap.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexUrlPatternMap.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexUrlPatternMap.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ContextInitializationInboundHandler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ContextInitializationInboundHandler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ContextInitializationInboundHandler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ContextInitializationInboundHandler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandler.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandler.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandler.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandler.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandleMethodExecutor.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandleMethodExecutor.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandleMethodExecutor.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandleMethodExecutor.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/RestfulServiceChannelInitializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/RestfulServiceChannelInitializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/RestfulServiceChannelInitializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/RestfulServiceChannelInitializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/impl/DefaultJsonResponseBodySerializerFactory.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/impl/DefaultJsonResponseBodySerializerFactory.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/impl/DefaultJsonResponseBodySerializerFactory.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/impl/DefaultJsonResponseBodySerializerFactory.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/impl/DefaultJsonResponseBodySerializer.java
diff --git a/infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java b/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
similarity index 100%
rename from infra/restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
rename to restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
diff --git a/infra/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.deserializer.factory.DeserializerFactory b/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.deserializer.factory.DeserializerFactory
similarity index 100%
rename from infra/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.deserializer.factory.DeserializerFactory
rename to restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.deserializer.factory.DeserializerFactory
diff --git a/infra/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.factory.SerializerFactory b/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.factory.SerializerFactory
similarity index 100%
rename from infra/restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.factory.SerializerFactory
rename to restful/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.factory.SerializerFactory
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/IndexController.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/IndexController.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/IndexController.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/IndexController.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/TrailingSlashTestController.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/TrailingSlashTestController.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/TrailingSlashTestController.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/TrailingSlashTestController.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/handler/CustomIllegalStateExceptionHandler.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/handler/CustomIllegalStateExceptionHandler.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/handler/CustomIllegalStateExceptionHandler.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/handler/CustomIllegalStateExceptionHandler.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/JobPojo.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/JobPojo.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/JobPojo.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/JobPojo.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/ResultDto.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/ResultDto.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/ResultDto.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pojo/ResultDto.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/CustomTextPlainResponseBodySerializer.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/CustomTextPlainResponseBodySerializer.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/CustomTextPlainResponseBodySerializer.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/CustomTextPlainResponseBodySerializer.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java
diff --git a/infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java b/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java
similarity index 100%
rename from infra/restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java
rename to restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java
diff --git a/infra/restful/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.ResponseBodySerializer b/restful/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.ResponseBodySerializer
similarity index 100%
rename from infra/restful/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.ResponseBodySerializer
rename to restful/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.restful.serializer.ResponseBodySerializer