Merge branch '1.1.x'

This commit is contained in:
Dave Syer
2015-01-20 17:38:31 +00:00
9 changed files with 304 additions and 16 deletions

View File

@@ -30,6 +30,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<scope>test</scope>
</dependency>
<!-- Used to provide a signed jar -->
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -57,6 +62,7 @@
<addTestClassPath>true</addTestClassPath>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<parallelThreads>4</parallelThreads>
</configuration>
<executions>
<execution>