From 721043fb488913448874a747a67ad2abc8c23694 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Tue, 5 Jan 2021 12:04:49 +0800 Subject: [PATCH] ! unify/improve pom format - unify pom elements order: groupId, artifactId, version, packaging, name, url, etc - remove redundant version element in submodule - specify jar element explicitly in submodule - fix indentation --- .../cola-archetype-service/pom.xml | 3 +-- .../__rootArtifactId__-app/pom.xml | 22 +++++++++---------- .../__rootArtifactId__-client/pom.xml | 2 +- .../__rootArtifactId__-domain/pom.xml | 22 +++++++++---------- .../__rootArtifactId__-infrastructure/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 3 ++- cola-archetypes/cola-archetype-web/pom.xml | 3 +-- .../__rootArtifactId__-adapter/pom.xml | 2 +- .../__rootArtifactId__-app/pom.xml | 22 +++++++++---------- .../__rootArtifactId__-client/pom.xml | 2 +- .../__rootArtifactId__-domain/pom.xml | 22 +++++++++---------- .../__rootArtifactId__-infrastructure/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 3 ++- cola-archetypes/pom.xml | 2 +- .../cola-normal-component-archetype/pom.xml | 1 - .../cola-starter-component-archetype/pom.xml | 1 - .../cola-component-catchlog-starter/pom.xml | 2 +- .../cola-component-domain-starter/pom.xml | 2 +- cola-components/cola-component-dto/pom.xml | 2 +- .../cola-component-exception/pom.xml | 2 +- .../cola-component-extension-starter/pom.xml | 2 +- .../cola-component-statemachine/pom.xml | 3 +-- .../cola-component-test-container/pom.xml | 2 +- cola-components/pom.xml | 2 +- sample/craftsman/craftsman-app/pom.xml | 22 +++++++++---------- sample/craftsman/craftsman-client/pom.xml | 2 +- sample/craftsman/craftsman-controller/pom.xml | 2 +- sample/craftsman/craftsman-domain/pom.xml | 2 +- .../craftsman-infrastructure/pom.xml | 2 +- 29 files changed, 79 insertions(+), 82 deletions(-) diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml index 9b339e7c2..b9976eca9 100644 --- a/cola-archetypes/cola-archetype-service/pom.xml +++ b/cola-archetypes/cola-archetype-service/pom.xml @@ -7,10 +7,9 @@ cola-framework-archetype-service 4.0.0 jar - cola-archetype-service - https://github.com/alibaba/COLA Cola framework archetype-service + https://github.com/alibaba/COLA diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml index ecc86a0c6..b042659b5 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} @@ -42,15 +42,15 @@ - - - - maven-deploy-plugin - - true - - - - + + + + maven-deploy-plugin + + true + + + + diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml index eb22cbc52..1640616c1 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${parentArtifactId}-client diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml index 9c8721368..cfedcb76e 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} @@ -30,15 +30,15 @@ - - - - maven-deploy-plugin - - true - - - - + + + + maven-deploy-plugin + + true + + + + diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml index 3cf39174d..0e1b135a6 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml index bd2cd776d..cbf2efce2 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml @@ -4,8 +4,8 @@ ${groupId} ${artifactId} - pom ${version} + pom ${artifactId} @@ -13,6 +13,7 @@ 1.8 UTF-8 UTF-8 + 1.3.1 2.1.3.RELEASE 1.0.0 diff --git a/cola-archetypes/cola-archetype-web/pom.xml b/cola-archetypes/cola-archetype-web/pom.xml index 2e80c561e..38512c928 100644 --- a/cola-archetypes/cola-archetype-web/pom.xml +++ b/cola-archetypes/cola-archetype-web/pom.xml @@ -6,10 +6,9 @@ cola-framework-archetype-web 4.0.0 maven-archetype - cola-archetype-web - https://github.com/alibaba/COLA Cola framework archetype-web + https://github.com/alibaba/COLA diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml index 07f9dc3f4..eef37c9e2 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml index ecc86a0c6..b042659b5 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} @@ -42,15 +42,15 @@ - - - - maven-deploy-plugin - - true - - - - + + + + maven-deploy-plugin + + true + + + + diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml index eb22cbc52..1640616c1 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${parentArtifactId}-client diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml index 9c8721368..cfedcb76e 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} @@ -30,15 +30,15 @@ - - - - maven-deploy-plugin - - true - - - - + + + + maven-deploy-plugin + + true + + + + diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml index 3cf39174d..0e1b135a6 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml @@ -9,7 +9,7 @@ ${artifactId} - ${version} + jar ${artifactId} diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml index 6d6f2f4b5..c64df130e 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml @@ -4,8 +4,8 @@ ${groupId} ${artifactId} - pom ${version} + pom ${artifactId} @@ -13,6 +13,7 @@ 1.8 UTF-8 UTF-8 + 1.3.1 2.1.3.RELEASE 1.0.0 diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml index dcb9a6ee4..dc97231e8 100644 --- a/cola-archetypes/pom.xml +++ b/cola-archetypes/pom.xml @@ -4,8 +4,8 @@ com.alibaba.cola cola-archeytpes - pom 1.0.0 + pom cola-archeytpes diff --git a/cola-components/archetypes/cola-normal-component-archetype/pom.xml b/cola-components/archetypes/cola-normal-component-archetype/pom.xml index e14d7c862..e4646398d 100644 --- a/cola-components/archetypes/cola-normal-component-archetype/pom.xml +++ b/cola-components/archetypes/cola-normal-component-archetype/pom.xml @@ -6,7 +6,6 @@ cola-normal-component-archetype 1.0.0 jar - cola-normal-component-archetype COLA normal componet archetype diff --git a/cola-components/archetypes/cola-starter-component-archetype/pom.xml b/cola-components/archetypes/cola-starter-component-archetype/pom.xml index df0cd75ab..78727c4de 100644 --- a/cola-components/archetypes/cola-starter-component-archetype/pom.xml +++ b/cola-components/archetypes/cola-starter-component-archetype/pom.xml @@ -6,7 +6,6 @@ cola-starter-component-archetype 1.0.0 jar - cola-starter-component-archetype diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml index 1b3e70bd6..064068673 100644 --- a/cola-components/cola-component-catchlog-starter/pom.xml +++ b/cola-components/cola-component-catchlog-starter/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-catchlog-starter com.alibaba.cola cola-component-catchlog-starter 1.0.0 jar + cola-component-catchlog-starter 1.8 diff --git a/cola-components/cola-component-domain-starter/pom.xml b/cola-components/cola-component-domain-starter/pom.xml index f76d6291a..7a8584d79 100644 --- a/cola-components/cola-component-domain-starter/pom.xml +++ b/cola-components/cola-component-domain-starter/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-domain-starter com.alibaba.cola cola-component-domain-starter 1.0.0 jar + cola-component-domain-starter 1.8 diff --git a/cola-components/cola-component-dto/pom.xml b/cola-components/cola-component-dto/pom.xml index ca3c3433e..ea3b01519 100644 --- a/cola-components/cola-component-dto/pom.xml +++ b/cola-components/cola-component-dto/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-dto com.alibaba.cola cola-component-dto 1.0.0 jar + cola-component-dto 1.8 diff --git a/cola-components/cola-component-exception/pom.xml b/cola-components/cola-component-exception/pom.xml index 21f32576a..9f3e5c377 100644 --- a/cola-components/cola-component-exception/pom.xml +++ b/cola-components/cola-component-exception/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-exception com.alibaba.cola cola-component-exception 1.0.0 jar + cola-component-exception 1.8 diff --git a/cola-components/cola-component-extension-starter/pom.xml b/cola-components/cola-component-extension-starter/pom.xml index dd9ee90b1..c3d648f27 100644 --- a/cola-components/cola-component-extension-starter/pom.xml +++ b/cola-components/cola-component-extension-starter/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-extension-starter com.alibaba.cola cola-component-extension-starter 1.0.0 jar + cola-component-extension-starter 1.8 diff --git a/cola-components/cola-component-statemachine/pom.xml b/cola-components/cola-component-statemachine/pom.xml index 37a3f3891..49381f6bd 100644 --- a/cola-components/cola-component-statemachine/pom.xml +++ b/cola-components/cola-component-statemachine/pom.xml @@ -6,10 +6,9 @@ cola-component-statemachine jar 1.0.0 - Cola component statemachine - https://github.com/alibaba/COLA Cola component statemachine + https://github.com/alibaba/COLA diff --git a/cola-components/cola-component-test-container/pom.xml b/cola-components/cola-component-test-container/pom.xml index a6f087a98..51fdae34e 100644 --- a/cola-components/cola-component-test-container/pom.xml +++ b/cola-components/cola-component-test-container/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cola-component-test-container com.alibaba.cola cola-component-test-container 1.0.0-SNAPSHOT jar + cola-component-test-container 1.8 diff --git a/cola-components/pom.xml b/cola-components/pom.xml index 7cdda4687..2eabf00db 100644 --- a/cola-components/pom.xml +++ b/cola-components/pom.xml @@ -4,8 +4,8 @@ com.alibaba.cola cola-components - pom 1.0.0 + pom cola-components diff --git a/sample/craftsman/craftsman-app/pom.xml b/sample/craftsman/craftsman-app/pom.xml index 85949a313..eb7cab89e 100644 --- a/sample/craftsman/craftsman-app/pom.xml +++ b/sample/craftsman/craftsman-app/pom.xml @@ -9,7 +9,7 @@ craftsman-app - 1.0.0-SNAPSHOT + jar craftsman-app @@ -38,15 +38,15 @@ - - - - maven-deploy-plugin - - true - - - - + + + + maven-deploy-plugin + + true + + + + diff --git a/sample/craftsman/craftsman-client/pom.xml b/sample/craftsman/craftsman-client/pom.xml index a8ef206b8..82336ead3 100644 --- a/sample/craftsman/craftsman-client/pom.xml +++ b/sample/craftsman/craftsman-client/pom.xml @@ -9,7 +9,7 @@ craftsman-client - 1.0.0-SNAPSHOT + jar craftsman-client diff --git a/sample/craftsman/craftsman-controller/pom.xml b/sample/craftsman/craftsman-controller/pom.xml index fb959abc7..5fcf3a499 100644 --- a/sample/craftsman/craftsman-controller/pom.xml +++ b/sample/craftsman/craftsman-controller/pom.xml @@ -9,7 +9,7 @@ craftsman-controller - 1.0.0-SNAPSHOT + jar craftsman-controller diff --git a/sample/craftsman/craftsman-domain/pom.xml b/sample/craftsman/craftsman-domain/pom.xml index 193866746..1c06ca4a8 100644 --- a/sample/craftsman/craftsman-domain/pom.xml +++ b/sample/craftsman/craftsman-domain/pom.xml @@ -9,7 +9,7 @@ craftsman-domain - 1.0.0-SNAPSHOT + jar craftsman-domain diff --git a/sample/craftsman/craftsman-infrastructure/pom.xml b/sample/craftsman/craftsman-infrastructure/pom.xml index 4ee22ee50..1e08d8914 100644 --- a/sample/craftsman/craftsman-infrastructure/pom.xml +++ b/sample/craftsman/craftsman-infrastructure/pom.xml @@ -9,7 +9,7 @@ craftsman-infrastructure - 1.0.0-SNAPSHOT + jar craftsman-infrastructure