Skip to content

S
spring-boot
Commit 63b803b5 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.1.x'

parents 37b4ebb7 de11e055
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
View file @ 63b803b5
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId> <artifactId>solr-solrj</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment