Skip to content

Commit

Permalink
OAK-7842: solr: suppress problematic commons-fileupload dependency
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1843994 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
reschke committed Oct 16, 2018
1 parent ca33fd3 commit c6e4311
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
4 changes: 4 additions & 0 deletions oak-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
<artifactId>concurrentlinkedhashmap-lru</artifactId>
</exclusion>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
10 changes: 10 additions & 0 deletions oak-solr-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,12 @@
<artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
<scope>provided</scope>
</dependency>

<!-- Solr -->
<dependency>
Expand All @@ -270,6 +276,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
Expand Down
4 changes: 4 additions & 0 deletions oak-solr-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>
Expand Down

0 comments on commit c6e4311

Please sign in to comment.