Merge branch 'master' of https://git.oschina.net/eh3/useful-code
Conflicts: .gitignore target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code/pom.propertiesdev
commit
f231dd32a4
|
@ -3,5 +3,4 @@
|
|||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.ear
|
||||
/target/
|
||||
*.ear
|
|
@ -1,5 +0,0 @@
|
|||
Manifest-Version: 1.0
|
||||
Build-Jdk: 1.7.0_60-ea
|
||||
Built-By: lixiangrong
|
||||
Created-By: Maven Integration for Eclipse
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<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>osc.git.eh3</groupId>
|
||||
<artifactId>useful-code</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>useful-code Maven Webapp</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.11</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>useful-code</finalName>
|
||||
</build>
|
||||
</project>
|
Loading…
Reference in New Issue