modify depdency to depmana
Showing
1 changed file
with
15 additions
and
62 deletions
| @@ -22,17 +22,20 @@ | @@ -22,17 +22,20 @@ | ||
| 22 | </properties> | 22 | </properties> |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | +<dependencyManagement> | ||
| 25 | <dependencies> | 26 | <dependencies> |
| 26 | <dependency> | 27 | <dependency> |
| 27 | <groupId>javax</groupId> | 28 | <groupId>javax</groupId> |
| 28 | <artifactId>javaee-api</artifactId> | 29 | <artifactId>javaee-api</artifactId> |
| 29 | <version>7.0</version> | 30 | <version>7.0</version> |
| 31 | + <scope>provided</scope> | ||
| 30 | </dependency> | 32 | </dependency> |
| 31 | 33 | ||
| 32 | <dependency> | 34 | <dependency> |
| 33 | <groupId>junit</groupId> | 35 | <groupId>junit</groupId> |
| 34 | <artifactId>junit</artifactId> | 36 | <artifactId>junit</artifactId> |
| 35 | <version>4.11</version> | 37 | <version>4.11</version> |
| 38 | + <scope>test</scope> | ||
| 36 | </dependency> | 39 | </dependency> |
| 37 | 40 | ||
| 38 | <!-- spring核心包 --> | 41 | <!-- spring核心包 --> |
| @@ -181,6 +184,7 @@ | @@ -181,6 +184,7 @@ | ||
| 181 | <version>2.2</version> | 184 | <version>2.2</version> |
| 182 | </dependency> | 185 | </dependency> |
| 183 | </dependencies> | 186 | </dependencies> |
| 187 | + </dependencyManagement> | ||
| 184 | 188 | ||
| 185 | <reporting> | 189 | <reporting> |
| 186 | <plugins> | 190 | <plugins> |
| @@ -206,37 +210,9 @@ | @@ -206,37 +210,9 @@ | ||
| 206 | </distributionManagement> | 210 | </distributionManagement> |
| 207 | 211 | ||
| 208 | <build> | 212 | <build> |
| 209 | - <resources> | ||
| 210 | - <resource> | ||
| 211 | - <directory>src/main/resources</directory> | ||
| 212 | - <includes> | ||
| 213 | - <include>**/*.*</include> | ||
| 214 | - </includes> | ||
| 215 | - <filtering>false</filtering> | ||
| 216 | - </resource> | ||
| 217 | - <resource> | ||
| 218 | - <directory>src/main/java</directory> | ||
| 219 | - <includes> | ||
| 220 | - <include>**/*.properties</include> | ||
| 221 | - <include>**/*.xml</include> | ||
| 222 | - <include>**/*.tld</include> | ||
| 223 | - </includes> | ||
| 224 | - <filtering>false</filtering> | ||
| 225 | - </resource> | ||
| 226 | - </resources> | 213 | + |
| 227 | <plugins> | 214 | <plugins> |
| 228 | - <plugin> | ||
| 229 | - <groupId>org.apache.maven.plugins</groupId> | ||
| 230 | - <artifactId>maven-source-plugin</artifactId> | ||
| 231 | - <executions> | ||
| 232 | - <execution> | ||
| 233 | - <id>attach-sources</id> | ||
| 234 | - <goals> | ||
| 235 | - <goal>jar</goal> | ||
| 236 | - </goals> | ||
| 237 | - </execution> | ||
| 238 | - </executions> | ||
| 239 | - </plugin> | 215 | + |
| 240 | <plugin> | 216 | <plugin> |
| 241 | <groupId>org.apache.maven.plugins</groupId> | 217 | <groupId>org.apache.maven.plugins</groupId> |
| 242 | <artifactId>maven-compiler-plugin</artifactId> | 218 | <artifactId>maven-compiler-plugin</artifactId> |
| @@ -246,27 +222,18 @@ | @@ -246,27 +222,18 @@ | ||
| 246 | <encoding>${java.encoding}</encoding> | 222 | <encoding>${java.encoding}</encoding> |
| 247 | </configuration> | 223 | </configuration> |
| 248 | </plugin> | 224 | </plugin> |
| 225 | + | ||
| 226 | + <!-- resource插件, 设定编码 --> | ||
| 249 | <plugin> | 227 | <plugin> |
| 250 | - <artifactId>maven-antrun-plugin</artifactId> | ||
| 251 | - <version>1.3</version> | ||
| 252 | - <executions> | ||
| 253 | - <execution> | ||
| 254 | - <phase>compile</phase> | 228 | + <groupId>org.apache.maven.plugins</groupId> |
| 229 | + <artifactId>maven-resources-plugin</artifactId> | ||
| 230 | + <version>2.6</version> | ||
| 255 | <configuration> | 231 | <configuration> |
| 256 | - <tasks> | ||
| 257 | - <echo message="project home: ${basedir}"/> | ||
| 258 | - <echo message="java home: ${java.home}"/> | ||
| 259 | - <echo message="java source version: ${java.version}"/> | ||
| 260 | - <echo message="java target version: ${java.version}"/> | ||
| 261 | - <echo message="java source charset: ${java.encoding}"/> | ||
| 262 | - </tasks> | 232 | + <encoding>${project.build.sourceEncoding}</encoding> |
| 263 | </configuration> | 233 | </configuration> |
| 264 | - <goals> | ||
| 265 | - <goal>run</goal> | ||
| 266 | - </goals> | ||
| 267 | - </execution> | ||
| 268 | - </executions> | ||
| 269 | </plugin> | 234 | </plugin> |
| 235 | + | ||
| 236 | + | ||
| 270 | <plugin> | 237 | <plugin> |
| 271 | <groupId>org.apache.maven.plugins</groupId> | 238 | <groupId>org.apache.maven.plugins</groupId> |
| 272 | <artifactId>maven-surefire-plugin</artifactId> | 239 | <artifactId>maven-surefire-plugin</artifactId> |
| @@ -277,21 +244,7 @@ | @@ -277,21 +244,7 @@ | ||
| 277 | <argLine>-Xmx256m</argLine> | 244 | <argLine>-Xmx256m</argLine> |
| 278 | </configuration> | 245 | </configuration> |
| 279 | </plugin> | 246 | </plugin> |
| 280 | - <plugin> | ||
| 281 | - <groupId>org.apache.maven.plugins</groupId> | ||
| 282 | - <artifactId>maven-eclipse-plugin</artifactId> | ||
| 283 | - <configuration> | ||
| 284 | - <downloadSources>true</downloadSources> | ||
| 285 | - <additionalConfig> | ||
| 286 | - <file> | ||
| 287 | - <name>.settings/org.eclipse.core.resources.prefs</name> | ||
| 288 | - <content> | ||
| 289 | - <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=UTF-8${line.separator}]]> | ||
| 290 | - </content> | ||
| 291 | - </file> | ||
| 292 | - </additionalConfig> | ||
| 293 | - </configuration> | ||
| 294 | - </plugin> | 247 | + |
| 295 | </plugins> | 248 | </plugins> |
| 296 | 249 | ||
| 297 | <pluginManagement> | 250 | <pluginManagement> |
-
Please register or login to post a comment