You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/10/16 11:37:40 UTC

svn commit: r1843994 - in /jackrabbit/oak/trunk: oak-benchmarks/pom.xml oak-solr-core/pom.xml oak-solr-osgi/pom.xml

Author: reschke
Date: Tue Oct 16 11:37:40 2018
New Revision: 1843994

URL: http://svn.apache.org/viewvc?rev=1843994&view=rev
Log:
OAK-7842: solr: suppress problematic commons-fileupload dependency

Modified:
    jackrabbit/oak/trunk/oak-benchmarks/pom.xml
    jackrabbit/oak/trunk/oak-solr-core/pom.xml
    jackrabbit/oak/trunk/oak-solr-osgi/pom.xml

Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/pom.xml?rev=1843994&r1=1843993&r2=1843994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Tue Oct 16 11:37:40 2018
@@ -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>

Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1843994&r1=1843993&r2=1843994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Tue Oct 16 11:37:40 2018
@@ -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>
@@ -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>

Modified: jackrabbit/oak/trunk/oak-solr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-osgi/pom.xml?rev=1843994&r1=1843993&r2=1843994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-osgi/pom.xml Tue Oct 16 11:37:40 2018
@@ -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>