Commit b88f213e6ac201767158d8f50918193bd839fb0b
1 parent
621518e8
优化打包参数
Showing
1 changed file
with
4 additions
and
3 deletions
pom.xml
| @@ -163,6 +163,7 @@ | @@ -163,6 +163,7 @@ | ||
| 163 | 163 | ||
| 164 | <build> | 164 | <build> |
| 165 | <plugins> | 165 | <plugins> |
| 166 | + | ||
| 166 | <plugin> | 167 | <plugin> |
| 167 | <groupId>org.springframework.boot</groupId> | 168 | <groupId>org.springframework.boot</groupId> |
| 168 | <artifactId>spring-boot-maven-plugin</artifactId> | 169 | <artifactId>spring-boot-maven-plugin</artifactId> |
| @@ -176,7 +177,7 @@ | @@ -176,7 +177,7 @@ | ||
| 176 | <configuration> | 177 | <configuration> |
| 177 | <source>1.8</source> | 178 | <source>1.8</source> |
| 178 | <target>1.8</target> | 179 | <target>1.8</target> |
| 179 | -<<<<<<< HEAD | 180 | + <!-- |
| 180 | <webResources> | 181 | <webResources> |
| 181 | <resource> | 182 | <resource> |
| 182 | <directory>${project.basedir}/libs</directory> | 183 | <directory>${project.basedir}/libs</directory> |
| @@ -187,8 +188,7 @@ | @@ -187,8 +188,7 @@ | ||
| 187 | </includes> | 188 | </includes> |
| 188 | </resource> | 189 | </resource> |
| 189 | </webResources> | 190 | </webResources> |
| 190 | -======= | ||
| 191 | ->>>>>>> upstream/master | 191 | + --> |
| 192 | </configuration> | 192 | </configuration> |
| 193 | </plugin> | 193 | </plugin> |
| 194 | 194 | ||
| @@ -196,6 +196,7 @@ | @@ -196,6 +196,7 @@ | ||
| 196 | <groupId>org.apache.maven.plugins</groupId> | 196 | <groupId>org.apache.maven.plugins</groupId> |
| 197 | <artifactId>maven-surefire-plugin</artifactId> | 197 | <artifactId>maven-surefire-plugin</artifactId> |
| 198 | </plugin> | 198 | </plugin> |
| 199 | + | ||
| 199 | </plugins> | 200 | </plugins> |
| 200 | </build> | 201 | </build> |
| 201 | </project> | 202 | </project> |