From 368a13339fadb408aa4bedba41c3cd2dc5b5f9b1 Mon Sep 17 00:00:00 2001 From: "sam@tpad-win10" Date: Sat, 4 Jan 2020 17:58:27 +0800 Subject: [PATCH] pom x9 +1 up2 fix pom ok # Conflicts: # order/order-application/pom.xml # product/product-application/pom.xml # promotion/promotion-application/pom.xml # search/search-application/pom.xml --- demo/demo-application/pom.xml | 20 +++++-- ops/pom.xml | 18 ++++++- order/order-application/pom.xml | 14 +++++ package.bat | 3 ++ pay/pay-application/pom.xml | 20 +++++-- pom.xml | 71 +++++++++++++++++++++---- product/product-application/pom.xml | 14 +++++ promotion/promotion-application/pom.xml | 18 ++++++- search/search-application/pom.xml | 13 +++++ system/system-application/pom.xml | 16 ++++++ user/user-application/pom.xml | 14 +++++ 11 files changed, 202 insertions(+), 19 deletions(-) create mode 100644 package.bat diff --git a/demo/demo-application/pom.xml b/demo/demo-application/pom.xml index e6e3d67fe..8f4476b9d 100644 --- a/demo/demo-application/pom.xml +++ b/demo/demo-application/pom.xml @@ -11,6 +11,12 @@ demo-application + + false + true + true + + @@ -112,21 +118,29 @@ - + + <!– 提供给 mapstruct 使用 –> org.apache.maven.plugins maven-compiler-plugin - + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/ops/pom.xml b/ops/pom.xml index 4ea6e71bb..7f9b77c02 100644 --- a/ops/pom.xml +++ b/ops/pom.xml @@ -11,6 +11,12 @@ ops + + false + true + true + + @@ -32,10 +38,10 @@ - + + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin @@ -45,6 +51,14 @@ + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index 2f80d4ffb..fe0758635 100644 --- a/order/order-application/pom.xml +++ b/order/order-application/pom.xml @@ -11,6 +11,13 @@ order-application + + false + true + true + + + @@ -26,5 +33,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + diff --git a/package.bat b/package.bat new file mode 100644 index 000000000..badffdb66 --- /dev/null +++ b/package.bat @@ -0,0 +1,3 @@ +call mvn package -Pjenkins + +pause \ No newline at end of file diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index f7b70d7b4..7604451fa 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -11,6 +11,12 @@ pay-application + + false + true + true + + @@ -85,21 +91,29 @@ - + + <!– 提供给 mapstruct 使用 –> org.apache.maven.plugins maven-compiler-plugin - + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/pom.xml b/pom.xml index bb39a0a29..3d8d913ac 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,16 @@ 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"> 4.0.0 - + + <!– lookup parent from repository –> + --> + + com.demo1.pom + pom-rpc + 1.1.0-SNAPSHOT cn.iocoder.mall @@ -63,6 +68,25 @@ + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + + pom + import + + + + + + org.springframework.boot @@ -197,12 +221,12 @@ - - - - - - + @@ -231,15 +255,42 @@ - + + + maven-resources-plugin + maven-source-plugin + + + + + nexus-devcn + http://nexus.ali.devcn.fun:81/nexus/content/groups/public + + true + + + true + always + + + + + + aliyun + http://maven.aliyun.com/nexus/content/groups/public + + diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 3dec4c1e0..0df67a76c 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -11,6 +11,12 @@ product-application + + false + true + true + + @@ -26,4 +32,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index bec1721a7..c92e50db9 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -11,6 +11,12 @@ promotion-application + + false + true + true + + cn.iocoder.mall @@ -23,4 +29,14 @@ 1.0-SNAPSHOT - \ No newline at end of file + + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + + diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 0e839c136..760b45d57 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -10,6 +10,11 @@ 4.0.0 search-application + + false + true + true + @@ -26,4 +31,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index f46f0ed7d..9903024f9 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -11,6 +11,12 @@ system-application + + false + true + true + + @@ -26,4 +32,14 @@ + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + + diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 2ad3fbe84..6bb51d23d 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -11,6 +11,11 @@ user-application + + false + true + true + @@ -27,4 +32,13 @@ + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + +