Skip to content

Commit

Permalink
pom格式统一
Browse files Browse the repository at this point in the history
  • Loading branch information
javahongxi committed Dec 31, 2018
1 parent b5e555e commit 2868de4
Show file tree
Hide file tree
Showing 62 changed files with 200 additions and 112 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ hs_err_pid*
# Others
activemq-data/*
dump.rdb
pom.xml.versionsBackup

17 changes: 15 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-parent</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
<url>https://github.com/javahongxi/whatsmars</url>

<modules>
<module>whatsmars-common</module>
Expand Down Expand Up @@ -204,7 +205,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -222,6 +223,7 @@
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
Expand All @@ -230,15 +232,26 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<delimiters>
<delimiter>${resource.delimiter}</delimiter>
</delimiters>
<useDefaultDelimiters>false</useDefaultDelimiters>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
<!--mvn versions:set -DoldVersion=1.0-SNAPSHOT -DnewVersion=ByteStack.CN1-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 2 additions & 2 deletions whatsmars-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>whatsmars-parent</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-common</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>Utils公共模块</description>

<dependencies>
<!-- 图片压缩工具 -->
Expand Down
5 changes: 4 additions & 1 deletion whatsmars-dbrouter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<parent>
<artifactId>whatsmars-parent</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dbrouter</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>分库分表实现</description>

<dependencies>
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion whatsmars-dubbo/dubbo-spring-boot-actuator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>dubbo-spring-boot-actuator</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>dubbo health</description>

<dependencies>
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion whatsmars-dubbo/dubbo-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>dubbo autoconfigure</description>

<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions whatsmars-dubbo/dubbo-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>dubbo-spring-boot-starter</artifactId>
<packaging>jar</packaging>
<name>Dubbo Spring Boot Starter</name>
<name>${project.artifactId}</name>
<description>Dubbo Spring Boot Starter</description>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion whatsmars-dubbo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>whatsmars-parent</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions whatsmars-dubbo/whatsmars-dubbo-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The demo module of dubbo project</description>
<description>Dubbo服务接口定义</description>

<dependencies>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion whatsmars-dubbo/whatsmars-dubbo-consumer-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-consumer-boot</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>dubbo starter demo - consumer</description>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion whatsmars-dubbo/whatsmars-dubbo-consumer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-consumer</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion whatsmars-dubbo/whatsmars-dubbo-provider-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-provider-boot</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>dubbo starter demo - provider</description>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion whatsmars-dubbo/whatsmars-dubbo-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-provider</artifactId>
Expand Down
5 changes: 4 additions & 1 deletion whatsmars-dubbo/whatsmars-dubbo-sentinel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-sentinel</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>use sentinel in dubbo</description>

<dependencies>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion whatsmars-dubbo/whatsmars-dubbo-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
<parent>
<artifactId>whatsmars-dubbo</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-dubbo-service</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>普通service</description>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion whatsmars-earth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>whatsmars-parent</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions whatsmars-earth/whatsmars-earth-dao/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-dao</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>DAO - 数据访问层</description>

<build>
<resources>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-domain</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
Expand Down
4 changes: 2 additions & 2 deletions whatsmars-earth/whatsmars-earth-domain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-domain</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>Domain - 领域对象</description>

<dependencies>
<dependency>
Expand Down
7 changes: 5 additions & 2 deletions whatsmars-earth/whatsmars-earth-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-manager</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>Manager - DAO组合或调用第三方接口</description>

<dependencies>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-dao</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
10 changes: 5 additions & 5 deletions whatsmars-earth/whatsmars-earth-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-service</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>Service - 业务层,可调DAO/Manager</description>

<dependencies>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-common</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-dao</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-manager</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>

<dependency>
Expand Down
7 changes: 3 additions & 4 deletions whatsmars-earth/whatsmars-earth-support-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-support-web</artifactId>

<packaging>war</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>Another Controller Module</description>

<dependencies>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-service</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions whatsmars-earth/whatsmars-earth-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
<parent>
<artifactId>whatsmars-earth</artifactId>
<groupId>org.hongxi</groupId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</parent>

<artifactId>whatsmars-earth-web</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<url>http://maven.apache.org</url>
<description>Controller Module</description>

<dependencies>
<dependency>
<groupId>org.hongxi</groupId>
<artifactId>whatsmars-earth-service</artifactId>
<version>1.0-SNAPSHOT</version>
<version>ByteStack.CN1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
Loading

0 comments on commit 2868de4

Please sign in to comment.