Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve maven build stability and unify pom format #151

Merged
merged 2 commits into from
Jan 4, 2021
Merged

improve maven build stability and unify pom format #151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8fc2e
improve maven build stability
oldratlee Jan 3, 2021
5d5b313
unify pom format
oldratlee Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
unify pom format 
- unify modelVersion element to order first
- add a blank line between artifactId element and parent/modelVersion
- add a blank line before dependencies element
  • Loading branch information
@oldratlee
oldratlee committed Jan 3, 2021
commit 5d5b313e51bb210d4384ad93e76dee3a687f6807
1 change: 1 addition & 0 deletions cola-archetypes/cola-archetype-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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>

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-framework-archetype-service</artifactId>
<version>4.0.0</version>
Expand Down
2 changes: 2 additions & 0 deletions ...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
Expand Down
2 changes: 2 additions & 0 deletions ...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${parentArtifactId}-client</name>

<dependencies>
<dependency>
<groupId>com.alibaba.cola</groupId>
Expand Down
2 changes: 2 additions & 0 deletions ...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<!-- COLA components -->
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions ...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<packaging>pom</packaging>
Expand Down
3 changes: 1 addition & 2 deletions cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}</artifactId>
<packaging>jar</packaging>
<name>${artifactId}</name>
Expand Down
1 change: 1 addition & 0 deletions cola-archetypes/cola-archetype-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-framework-archetype-web</artifactId>
<version>4.0.0</version>
Expand Down
2 changes: 2 additions & 0 deletions ...a-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
Expand Down
2 changes: 2 additions & 0 deletions .../cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
Expand Down
2 changes: 2 additions & 0 deletions ...la-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${parentArtifactId}-client</name>

<dependencies>
<dependency>
<groupId>com.alibaba.cola</groupId>
Expand Down
2 changes: 2 additions & 0 deletions ...la-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<!-- COLA components -->
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions ...type-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId}</name>

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<packaging>pom</packaging>
Expand Down
3 changes: 1 addition & 2 deletions cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/start/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}</artifactId>
<packaging>jar</packaging>
<name>${artifactId}</name>
Expand Down
5 changes: 2 additions & 3 deletions cola-archetypes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-archeytpes</artifactId>
<packaging>pom</packaging>
Expand Down
3 changes: 1 addition & 2 deletions cola-components/archetypes/cola-normal-component-archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.cola</groupId>
Expand Down
5 changes: 2 additions & 3 deletions cola-components/cola-component-statemachine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-component-statemachine</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion cola-components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-components</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 2 additions & 0 deletions sample/craftsman/craftsman-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>craftsman-app</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>craftsman-app</name>

<dependencies>
<dependency>
<groupId>com.alibaba.craftsman</groupId>
Expand Down
2 changes: 2 additions & 0 deletions sample/craftsman/craftsman-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>craftsman-client</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>craftsman-client</name>

<dependencies>
<dependency>
<groupId>com.aliyun</groupId>
Expand Down
2 changes: 2 additions & 0 deletions sample/craftsman/craftsman-controller/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>craftsman-controller</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>craftsman-controller</name>

<dependencies>
<dependency>
<groupId>com.alibaba.craftsman</groupId>
Expand Down
2 changes: 2 additions & 0 deletions sample/craftsman/craftsman-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>craftsman-domain</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>craftsman-domain</name>

<dependencies>
<!-- COLA Framework -->
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions sample/craftsman/craftsman-infrastructure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>craftsman-infrastructure</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>craftsman-infrastructure</name>

<dependencies>
<!--DIP here, Infrastructure depends on Domain-->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sample/craftsman/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.craftsman</groupId>
<artifactId>craftsman.all</artifactId>
<packaging>pom</packaging>
Expand Down
3 changes: 1 addition & 2 deletions sample/craftsman/start/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.alibaba.craftsman</groupId>
<artifactId>craftsman.all</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>start</artifactId>
<packaging>jar</packaging>
<name>start</name>
Expand Down