master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
1 changed files with 7 additions and 4 deletions
Showing only changes of commit b6f08ce226 - Show all commits

View File

@ -54,15 +54,18 @@
<artifactId>spark-solr</artifactId>
</dependency>
<!-- the solr-test-framework requires the old junit:junit test framework -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>com.carrotsearch</groupId>
<artifactId>*</artifactId>