diff --git a/mars-aop/pom.xml b/mars-aop/pom.xml deleted file mode 100644 index e7b3141..0000000 --- a/mars-aop/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - com.github.yuyenews - Mars-java - 3.0.2 - - mars-aop - - - - com.github.yuyenews - mars-core - - - - org.ow2.asm - asm - - - cglib - cglib - - - \ No newline at end of file diff --git a/mars-core/pom.xml b/mars-core/pom.xml index 7e50a4d..670a696 100644 --- a/mars-core/pom.xml +++ b/mars-core/pom.xml @@ -5,7 +5,7 @@ com.github.yuyenews Mars-java - 3.0.2 + 3.0.3 mars-core @@ -27,7 +27,14 @@ snakeyaml - + + org.ow2.asm + asm + + + cglib + cglib + com.squareup.okhttp3 okhttp diff --git a/mars-aop/src/main/java/com/mars/aop/base/BaseAop.java b/mars-core/src/main/java/com/mars/core/aop/base/BaseAop.java similarity index 92% rename from mars-aop/src/main/java/com/mars/aop/base/BaseAop.java rename to mars-core/src/main/java/com/mars/core/aop/base/BaseAop.java index b771fd5..bb7b281 100644 --- a/mars-aop/src/main/java/com/mars/aop/base/BaseAop.java +++ b/mars-core/src/main/java/com/mars/core/aop/base/BaseAop.java @@ -1,4 +1,4 @@ -package com.mars.aop.base; +package com.mars.core.aop.base; /** * AOP定义模板 diff --git a/mars-aop/src/main/java/com/mars/aop/constant/AopConstant.java b/mars-core/src/main/java/com/mars/core/aop/constant/AopConstant.java similarity index 89% rename from mars-aop/src/main/java/com/mars/aop/constant/AopConstant.java rename to mars-core/src/main/java/com/mars/core/aop/constant/AopConstant.java index 2dfecc6..26e6150 100644 --- a/mars-aop/src/main/java/com/mars/aop/constant/AopConstant.java +++ b/mars-core/src/main/java/com/mars/core/aop/constant/AopConstant.java @@ -1,4 +1,4 @@ -package com.mars.aop.constant; +package com.mars.core.aop.constant; /** * AOP常量 diff --git a/mars-aop/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java b/mars-core/src/main/java/com/mars/core/aop/proxy/MarsBeanProxy.java similarity index 98% rename from mars-aop/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java rename to mars-core/src/main/java/com/mars/core/aop/proxy/MarsBeanProxy.java index 3e61b48..719afd4 100644 --- a/mars-aop/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java +++ b/mars-core/src/main/java/com/mars/core/aop/proxy/MarsBeanProxy.java @@ -1,10 +1,10 @@ -package com.mars.aop.proxy; +package com.mars.core.aop.proxy; import java.lang.reflect.Method; -import com.mars.aop.constant.AopConstant; import com.mars.core.annotation.MarsAop; import com.mars.core.annotation.Traction; +import com.mars.core.aop.constant.AopConstant; import com.mars.core.model.AopModel; import com.mars.core.ncfg.traction.TractionClass; import net.sf.cglib.proxy.Enhancer; diff --git a/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java b/mars-core/src/main/java/com/mars/core/ioc/factory/BeanFactory.java similarity index 94% rename from mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java rename to mars-core/src/main/java/com/mars/core/ioc/factory/BeanFactory.java index 7beadd5..297e2eb 100644 --- a/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java +++ b/mars-core/src/main/java/com/mars/core/ioc/factory/BeanFactory.java @@ -1,6 +1,6 @@ -package com.mars.ioc.factory; +package com.mars.core.ioc.factory; -import com.mars.aop.proxy.MarsBeanProxy; +import com.mars.core.aop.proxy.MarsBeanProxy; import com.mars.core.constant.MarsConstant; import com.mars.core.constant.MarsSpace; import com.mars.core.model.MarsBeanModel; diff --git a/mars-ioc/src/main/java/com/mars/ioc/load/LoadMarsBean.java b/mars-core/src/main/java/com/mars/core/ioc/load/LoadMarsBean.java similarity index 93% rename from mars-ioc/src/main/java/com/mars/ioc/load/LoadMarsBean.java rename to mars-core/src/main/java/com/mars/core/ioc/load/LoadMarsBean.java index eaaf548..5a57401 100644 --- a/mars-ioc/src/main/java/com/mars/ioc/load/LoadMarsBean.java +++ b/mars-core/src/main/java/com/mars/core/ioc/load/LoadMarsBean.java @@ -1,4 +1,4 @@ -package com.mars.ioc.load; +package com.mars.core.ioc.load; import com.mars.core.constant.MarsConstant; import com.mars.core.constant.MarsSpace; @@ -6,7 +6,7 @@ import com.mars.core.load.WriteFields; import com.mars.core.model.MarsBeanClassModel; import com.mars.core.model.MarsBeanModel; import com.mars.core.load.LoadHelper; -import com.mars.ioc.factory.BeanFactory; +import com.mars.core.ioc.factory.BeanFactory; import java.util.List; import java.util.Map; diff --git a/mars-ioc/pom.xml b/mars-ioc/pom.xml deleted file mode 100644 index 3795104..0000000 --- a/mars-ioc/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - - com.github.yuyenews - Mars-java - 3.0.2 - - mars-ioc - - - - com.github.yuyenews - mars-aop - - - \ No newline at end of file diff --git a/mars-jdbc/mars-jdbc-base/pom.xml b/mars-jdbc/mars-jdbc-base/pom.xml index 124d308..b247cd7 100644 --- a/mars-jdbc/mars-jdbc-base/pom.xml +++ b/mars-jdbc/mars-jdbc-base/pom.xml @@ -5,7 +5,7 @@ mars-jdbc com.github.yuyenews - 3.0.2 + 3.0.3 4.0.0 @@ -14,7 +14,7 @@ com.github.yuyenews - mars-aop + mars-core ${project.parent.version} diff --git a/mars-jdbc/mars-mj/pom.xml b/mars-jdbc/mars-mj/pom.xml index bfcdfb4..6c23c6c 100644 --- a/mars-jdbc/mars-mj/pom.xml +++ b/mars-jdbc/mars-mj/pom.xml @@ -5,7 +5,7 @@ mars-jdbc com.github.yuyenews - 3.0.2 + 3.0.3 4.0.0 diff --git a/mars-jdbc/mars-mybatis/pom.xml b/mars-jdbc/mars-mybatis/pom.xml index 867cddf..69382fb 100644 --- a/mars-jdbc/mars-mybatis/pom.xml +++ b/mars-jdbc/mars-mybatis/pom.xml @@ -5,7 +5,7 @@ com.github.yuyenews mars-jdbc - 3.0.2 + 3.0.3 mars-mybatis diff --git a/mars-jdbc/pom.xml b/mars-jdbc/pom.xml index 7848ac3..5667e1d 100644 --- a/mars-jdbc/pom.xml +++ b/mars-jdbc/pom.xml @@ -5,7 +5,7 @@ Mars-java com.github.yuyenews - 3.0.2 + 3.0.3 4.0.0 pom diff --git a/mars-mvc/pom.xml b/mars-mvc/pom.xml index 3e828e2..a9c52f8 100644 --- a/mars-mvc/pom.xml +++ b/mars-mvc/pom.xml @@ -5,7 +5,7 @@ com.github.yuyenews Mars-java - 3.0.2 + 3.0.3 mars-mvc diff --git a/mars-netty/pom.xml b/mars-netty/pom.xml index 77daf38..8d6f5c2 100644 --- a/mars-netty/pom.xml +++ b/mars-netty/pom.xml @@ -5,7 +5,7 @@ com.github.yuyenews Mars-java - 3.0.2 + 3.0.3 mars-netty diff --git a/mars-redis/pom.xml b/mars-redis/pom.xml index 93c0d7f..faa227d 100644 --- a/mars-redis/pom.xml +++ b/mars-redis/pom.xml @@ -5,7 +5,7 @@ Mars-java com.github.yuyenews - 3.0.2 + 3.0.3 4.0.0 diff --git a/mars-server/pom.xml b/mars-server/pom.xml index 3b675a9..270d912 100644 --- a/mars-server/pom.xml +++ b/mars-server/pom.xml @@ -5,7 +5,7 @@ com.github.yuyenews Mars-java - 3.0.2 + 3.0.3 mars-server @@ -21,7 +21,7 @@ com.github.yuyenews - mars-ioc + mars-core \ No newline at end of file diff --git a/mars-timer/pom.xml b/mars-timer/pom.xml index df572b0..5d783be 100644 --- a/mars-timer/pom.xml +++ b/mars-timer/pom.xml @@ -5,7 +5,7 @@ Mars-java com.github.yuyenews - 3.0.2 + 3.0.3 4.0.0 @@ -17,10 +17,5 @@ mars-core true - - com.github.yuyenews - mars-ioc - true - \ No newline at end of file diff --git a/mars-timer/src/main/java/com/mars/timer/load/LoadMarsTimer.java b/mars-timer/src/main/java/com/mars/timer/load/LoadMarsTimer.java index f826e4b..01bebbb 100644 --- a/mars-timer/src/main/java/com/mars/timer/load/LoadMarsTimer.java +++ b/mars-timer/src/main/java/com/mars/timer/load/LoadMarsTimer.java @@ -6,7 +6,7 @@ import com.mars.core.constant.MarsSpace; import com.mars.core.model.MarsBeanClassModel; import com.mars.core.model.MarsTimerModel; import com.mars.core.load.LoadHelper; -import com.mars.ioc.factory.BeanFactory; +import com.mars.core.ioc.factory.BeanFactory; import java.lang.reflect.Method; import java.util.List; diff --git a/pom.xml b/pom.xml index e9fe715..c2febcf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,9 @@ 4.0.0 com.github.yuyenews Mars-java - 3.0.2 + 3.0.3 pom - mars-aop - mars-ioc mars-core mars-mvc mars-netty @@ -24,16 +22,6 @@ - - com.github.yuyenews - mars-aop - ${project.parent.version} - - - com.github.yuyenews - mars-ioc - ${project.parent.version} - com.github.yuyenews mars-mvc