home/Martian
2
0
Fork 0
mirror of https://github.com/wahyd4/Martian.git synced 2026-08-09 05:16:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

update version

Browse Source
This commit is contained in:
yuye
2019-11-05 22:13:31 +08:00
parent 313828cf6d
commit 2b0bbf50ba
19 changed files with 30 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mars-aop/pom.xml
-27
View File
@@ -1,27 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
</parent>
<artifactId>mars-aop</artifactId>
<dependencies>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-core</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
</dependencies>
</project>
mars-core/pom.xml
+9 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<artifactId>mars-core</artifactId>
@@ -27,7 +27,14 @@
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
mars-aop/src/main/java/com/mars/aop/base/BaseAop.java → mars-core/src/main/java/com/mars/core/aop/base/BaseAop.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.aop.base;
package com.mars.core.aop.base;
/**
* AOP定义模板
mars-aop/src/main/java/com/mars/aop/constant/AopConstant.java → mars-core/src/main/java/com/mars/core/aop/constant/AopConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.aop.constant;
package com.mars.core.aop.constant;
/**
* AOP常量
mars-aop/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java → mars-core/src/main/java/com/mars/core/aop/proxy/MarsBeanProxy.java
+2 -2
View File
@@ -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;
mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java → mars-core/src/main/java/com/mars/core/ioc/factory/BeanFactory.java
+2 -2
View File
@@ -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;
mars-ioc/src/main/java/com/mars/ioc/load/LoadMarsBean.java → mars-core/src/main/java/com/mars/core/ioc/load/LoadMarsBean.java
+2 -2
View File
@@ -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;
mars-ioc/pom.xml
-18
View File
@@ -1,18 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
</parent>
<artifactId>mars-ioc</artifactId>
<dependencies>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-aop</artifactId>
</dependency>
</dependencies>
</project>
mars-jdbc/mars-jdbc-base/pom.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mars-jdbc</artifactId>
<groupId>com.github.yuyenews</groupId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-aop</artifactId>
<artifactId>mars-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
mars-jdbc/mars-mj/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mars-jdbc</artifactId>
<groupId>com.github.yuyenews</groupId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
mars-jdbc/mars-mybatis/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-jdbc</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<artifactId>mars-mybatis</artifactId>
mars-jdbc/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Mars-java</artifactId>
<groupId>com.github.yuyenews</groupId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
mars-mvc/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<artifactId>mars-mvc</artifactId>
mars-netty/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<artifactId>mars-netty</artifactId>
mars-redis/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Mars-java</artifactId>
<groupId>com.github.yuyenews</groupId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
mars-server/pom.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<artifactId>mars-server</artifactId>
@@ -21,7 +21,7 @@
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-ioc</artifactId>
<artifactId>mars-core</artifactId>
</dependency>
</dependencies>
</project>
mars-timer/pom.xml
+1 -6
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Mars-java</artifactId>
<groupId>com.github.yuyenews</groupId>
<version>3.0.2</version>
<version>3.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,10 +17,5 @@
<artifactId>mars-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-ioc</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>
mars-timer/src/main/java/com/mars/timer/load/LoadMarsTimer.java
+1 -1
View File
@@ -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;
pom.xml
+1 -13
View File
@@ -4,11 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.yuyenews</groupId>
<artifactId>Mars-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
<packaging>pom</packaging>
<modules>
<module>mars-aop</module>
<module>mars-ioc</module>
<module>mars-core</module>
<module>mars-mvc</module>
<module>mars-netty</module>
@@ -24,16 +22,6 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-aop</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-ioc</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.github.yuyenews</groupId>
<artifactId>mars-mvc</artifactId>