diff --git a/examples/seata-example/pom.xml b/examples/seata-example/pom.xml index 9668844..4baaa0c 100644 --- a/examples/seata-example/pom.xml +++ b/examples/seata-example/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.chinaunicom.ebtp @@ -28,6 +30,10 @@ com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter + + com.chinaunicom.ebtp + mall-ebtp-cloud-seata-starter + com.chinaunicom.ebtp mall-ebtp-cloud-feign-starter @@ -36,24 +42,10 @@ mysql mysql-connector-java - - com.alibaba.cloud - spring-cloud-alibaba-seata - - - seata-all - io.seata - - - - - io.seata - seata-all - - - storage-service - order-service - account-service - + + storage-service + order-service + account-service + \ No newline at end of file diff --git a/mall-ebtp-cloud-jpa-starter/pom.xml b/mall-ebtp-cloud-jpa-starter/pom.xml index e1378f6..8bdecda 100644 --- a/mall-ebtp-cloud-jpa-starter/pom.xml +++ b/mall-ebtp-cloud-jpa-starter/pom.xml @@ -8,13 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter 0.0.1 mall-ebtp-cloud-jpa-starter - + com.baomidou diff --git a/mall-ebtp-cloud-parent/pom.xml b/mall-ebtp-cloud-parent/pom.xml index 19ed992..ccafdf7 100644 --- a/mall-ebtp-cloud-parent/pom.xml +++ b/mall-ebtp-cloud-parent/pom.xml @@ -25,7 +25,6 @@ 1.1.14 2.0.3 5.4.1 - 1.3.0 @@ -60,32 +59,6 @@ commons-fileupload 1.3.2 - - com.alibaba.cloud - spring-cloud-starter-alibaba-seata - - - io.seata - seata-spring-boot-starter - - - - - io.seata - seata-spring-boot-starter - 1.2.0 - - - io.seata - seata-all - - - - - io.seata - seata-all - 1.2.0 - com.baomidou mybatis-plus-boot-starter @@ -194,17 +167,6 @@ apm-toolkit-trace 8.1.0 - - - com.alibaba.cloud - spring-cloud-alibaba-seata - 2.1.0.RELEASE - - - io.seata - seata-all - ${seata.version} - diff --git a/mall-ebtp-cloud-seata-starter/pom.xml b/mall-ebtp-cloud-seata-starter/pom.xml new file mode 100644 index 0000000..ba75842 --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.chinaunicom.ebtp + mall-ebtp-cloud-parent + 0.0.1 + + + com.chinaunicom.ebtp + mall-ebtp-cloud-seata-starter + 0.0.1 + mall-ebtp-cloud-seata-starter + + 1.3.0 + + + + com.chinaunicom.ebtp + mall-ebtp-cloud-jpa-starter + + + com.alibaba.cloud + spring-cloud-alibaba-seata + 2.1.0.RELEASE + + + seata-all + io.seata + + + + + io.seata + seata-all + ${seata.version} + + + diff --git a/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java b/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java new file mode 100644 index 0000000..6fb641b --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.cloud.seata.starter; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/mall-ebtp-cloud-seata-starter/src/test/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/AppTest.java b/mall-ebtp-cloud-seata-starter/src/test/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/AppTest.java new file mode 100644 index 0000000..dc68a76 --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/src/test/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/AppTest.java @@ -0,0 +1,38 @@ +package com.chinaunicom.mall.ebtp.cloud.seata.starter; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/pom.xml b/pom.xml index 491ff75..e941c7c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -13,7 +15,8 @@ pom mall-ebtp-cloud - Parent pom providing dependency and plugin management for applications built with Maven + Parent pom providing dependency and plugin management for + applications built with Maven 1.8 @@ -100,6 +103,11 @@ mall-ebtp-cloud-common 0.0.1 + + com.chinaunicom.ebtp + mall-ebtp-cloud-seata-starter + 0.0.1 + @@ -253,17 +261,22 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -289,6 +302,7 @@ mall-ebtp-cloud-redis-starter mall-ebtp-cloud-kafka-starter mall-ebtp-cloud-feign-starter - mall-ebtp-cloud-log-starter - + mall-ebtp-cloud-log-starter + mall-ebtp-cloud-seata-starter + \ No newline at end of file