merge with branch issue-558

This commit is contained in:
Sebastian Sdorra
2014-04-15 07:47:05 +02:00

View File

@@ -196,6 +196,14 @@
<version>${guava.version}</version>
</dependency>
<!-- fix version conflict -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.6</version>
</dependency>
<!-- template engine -->
<dependency>