Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-08 14:17:56 +01:00
commit 63b803b5ef

View File

@ -25,6 +25,12 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>