manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1809260 - in /manifoldcf/trunk: CHANGES.txt build.xml framework/build.xml framework/buildfiles/connector-build.xml pom.xml
Date Fri, 22 Sep 2017 06:34:17 GMT
Author: kwright
Date: Fri Sep 22 06:34:17 2017
New Revision: 1809260

URL: http://svn.apache.org/viewvc?rev=1809260&view=rev
Log:
Fix for CONNECTORS-1453.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1809260&r1=1809259&r2=1809260&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Sep 22 06:34:17 2017
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 2.9-dev =====================
 
+CONNECTORS-1453: Integrate poi 3.17, which seems to fix the
+classloader issue in 3.15.  Reverted the reassignment of poi and
+dependencies to root-level classpath accordingly.
+(Karl Wright)
+
 CONNECTORS-1456: Tentative fix for API issue exporting jobs in JSON
 format.  Basically, simple valued array elements did not work.
 (Adrian Conlon, Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1809260&r1=1809259&r2=1809260&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Sep 22 06:34:17 2017
@@ -56,7 +56,7 @@
     <property name="commons-cli.version" value="1.2"/>
     <property name="slf4j.version" value="1.7.7"/>
     <property name="xalan.version" value="2.7.1"/>
-    <property name="poi.version" value="3.15"/>
+    <property name="poi.version" value="3.17"/>
     <property name="activation.version" value="1.1.1"/>
     <property name="avalon.version" value="4.3.1"/>
     <property name="ecj.version" value="4.3.1"/>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1809260&r1=1809259&r2=1809260&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Fri Sep 22 06:34:17 2017
@@ -71,10 +71,6 @@
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
             <include name="mail*.jar"/>
-            <include name="poi*.jar"/>
-            <include name="dom4j*.jar"/>
-            <include name="xmlbeans*.jar"/>
-            <include name="curvesapi*.jar"/>
             <include name="commons-exec*.jar"/>
             <include name="gson*.jar"/>
             <include name="guava*.jar"/>
@@ -500,10 +496,6 @@
                 <include name="xml-apis*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -550,10 +542,6 @@
                 <include name="xml-apis*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -606,10 +594,6 @@
                 <include name="xml-apis*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -657,10 +641,6 @@
                 <include name="xml-apis*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -716,10 +696,6 @@
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -779,10 +755,6 @@
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -846,10 +818,6 @@
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -907,10 +875,6 @@
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -1039,10 +1003,6 @@
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="mail*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="curvesapi*.jar"/>
                 <include name="commons-exec*.jar"/>
                 <include name="gson*.jar"/>
                 <include name="guava*.jar"/>
@@ -1294,10 +1254,6 @@
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="mail*.jar"/>
-            <include name="poi*.jar"/>
-            <include name="dom4j*.jar"/>
-            <include name="xmlbeans*.jar"/>
-            <include name="curvesapi*.jar"/>
             <include name="commons-exec*.jar"/>
             <include name="gson*.jar"/>
             <include name="guava*.jar"/>
@@ -1553,6 +1509,10 @@
                 <include name="jackson-databind*.jar"/>
                 <include name="jackson-annotations*.jar"/>
                 <include name="tika-parsers*.jar"/>
+                <include name="poi*.jar"/>
+                <include name="dom4j*.jar"/>
+                <include name="xmlbeans*.jar"/>
+                <include name="curvesapi*.jar"/>
                 <include name="geoapi*.jar"/>
                 <include name="jsr-275*.jar"/>
                 <include name="sis-metadata*.jar"/>

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1809260&r1=1809259&r2=1809260&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Fri Sep 22 06:34:17 2017
@@ -116,10 +116,6 @@
         </fileset>
         <fileset dir="${mcf-dist}/lib">
             <include name="mail*.jar"/>
-            <include name="poi*.jar"/>
-            <include name="dom4j*.jar"/>
-            <include name="xmlbeans*.jar"/>
-            <include name="curvesapi*.jar"/>
             <include name="commons-exec*.jar"/>
             <include name="guava*.jar"/>
             <include name="gson*.jar"/>
@@ -160,6 +156,10 @@
             <include name="jackson-databind*.jar"/>
             <include name="jackson-annotations*.jar"/>
             <include name="tika-parsers*.jar"/>
+            <include name="poi*.jar"/>
+            <include name="dom4j*.jar"/>
+            <include name="xmlbeans*.jar"/>
+            <include name="curvesapi*.jar"/>
             <include name="geoapi*.jar"/>
             <include name="sis-metadata*.jar"/>
             <include name="sis-utility*.jar"/>

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1809260&r1=1809259&r2=1809260&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Fri Sep 22 06:34:17 2017
@@ -83,7 +83,7 @@
     <jaxb.version>2.2.6</jaxb.version>
     <zookeeper.version>3.4.8</zookeeper.version>
     <xmlbeans.version>2.6.0</xmlbeans.version>
-    <poi.version>3.15</poi.version>
+    <poi.version>3.17</poi.version>
     <tika.version>1.14</tika.version>
     <boilerpipe.version>1.1.0</boilerpipe.version>
     <hadoop.version>2.6.0</hadoop.version>



Mime
View raw message