manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1744887 - in /manifoldcf/trunk: CHANGES.txt build.xml dist-license/LICENSE.txt lib-license/LICENSE.txt
Date Sat, 21 May 2016 10:14:23 GMT
Author: kwright
Date: Sat May 21 10:14:23 2016
New Revision: 1744887

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

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/lib-license/LICENSE.txt

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1744887&r1=1744886&r2=1744887&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat May 21 10:14:23 2016
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.5-dev =====================
 
+CONNECTORS-1317: Missing JDOM2 dependency for Tika.
+(Karl Wright)
+
 CONNECTORS-1309: SharePoint connector would blow up looking for
 lists when SharePoint returned non-list entities.
 (Phil Reithmuller, Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1744887&r1=1744886&r2=1744887&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat May 21 10:14:23 2016
@@ -128,8 +128,8 @@
     <property name="dom4j.version" value="1.6.1"/>
     <property name="asm.version" value="5.1"/>
     <property name="xmpcore.version" value="5.1.2"/>
-    <property name="jdom.version" value="1.0"/>
     <property name="rome.version" value="1.6.0"/>
+    <property name="jdom2.version" value="2.0.6"/>
     <property name="mp4parser.version" value="1.1.18"/>
     <property name="jmatio.version" value="1.0"/>
     <property name="java-libpst.version" value="0.8.1"/>
@@ -2280,18 +2280,24 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="jdom"/>
-            <param name="artifact-name" value="jdom"/>
-            <param name="artifact-version" value="${jdom.version}"/>
+            <param name="project-path" value="com/rometools"/>
+            <param name="artifact-name" value="rome"/>
+            <param name="artifact-version" value="${rome.version}"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/rometools"/>
-            <param name="artifact-name" value="rome"/>
+            <param name="artifact-name" value="rome-utils"/>
             <param name="artifact-version" value="${rome.version}"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/jdom"/>
+            <param name="artifact-name" value="jdom2"/>
+            <param name="artifact-version" value="${jdom2.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/googlecode/mp4parser"/>
             <param name="artifact-name" value="isoparser"/>
             <param name="artifact-version" value="${mp4parser.version}"/>

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1744887&r1=1744886&r2=1744887&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Sat May 21 10:14:23 2016
@@ -373,8 +373,8 @@ License: BSD license.
 This product includes an xmpcore.jar.
 License: BSD license (http://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
 
-This product includes a jdom.jar.
-License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt), without attribution requirement.
+This product includes a jdom2.jar.
+License: Apache 2, without attribution requirement. (https://raw.githubusercontent.com/hunterhacker/jdom/master/LICENSE.txt)
 
 This product includes a rome.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1744887&r1=1744886&r2=1744887&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Sat May 21 10:14:23 2016
@@ -376,8 +376,8 @@ License: BSD license.
 This product includes an xmpcore.jar.
 License: BSD license (http://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
 
-This product includes a jdom.jar.
-License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt), without attribution requirement.
+This product includes a jdom2.jar.
+License: Apache 2, without attribution requirement. (https://raw.githubusercontent.com/hunterhacker/jdom/master/LICENSE.txt)
 
 This product includes a rome.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)



Mime
View raw message