Conflicts:

README.md
	config/database/mysql/apopulate-schemas.sql
	wise-webapp/pom.xml
This commit is contained in:
Paulo Gustavo Veiga
2014-01-24 20:17:21 -03:00
8 changed files with 98 additions and 86 deletions

View File

@@ -283,16 +283,16 @@
<version>2.2.8</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>com.mangofactory</groupId>
<artifactId>swagger-springmvc</artifactId>
<version>0.6.6</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.12.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>