manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1418591 - in /manifoldcf/trunk: CHANGES.txt build.xml connectors/connector-build.xml framework/build.xml mvn-bootstrap.bat mvn-bootstrap.sh tests/test-build.xml
Date Sat, 08 Dec 2012 01:51:04 GMT
Author: kwright
Date: Sat Dec  8 01:51:02 2012
New Revision: 1418591

URL: http://svn.apache.org/viewvc?rev=1418591&view=rev
Log:
Fix for CONNECTORS-580.  Remove all references to commons-httpclient-mcf.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/connector-build.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/mvn-bootstrap.bat
    manifoldcf/trunk/mvn-bootstrap.sh
    manifoldcf/trunk/tests/test-build.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Dec  8 01:51:02 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.1-dev =====================
 
+CONNECTORS-580: Remove build of commons-httpclient-mcf, and all
+ant and maven dependencies.
+(Karl Wright)
+
 CONNECTORS-579: Add untrusted, unverified https support to the RSS
 connector.
 (David Morana, Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Dec  8 01:51:02 2012
@@ -3051,33 +3051,6 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="commons-logging"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- Download and build patched version of commons-httpclient 3.1 -->
-        <mkdir dir="build/download"/>
-        <delete dir="build/download/commons-httpclient"/>
-        <antcall target="checkout-source-via-svn">
-            <param name="root-dir" value="build/download"/>
-            <param name="svn-url" value="http://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/tags/HTTPCLIENT_3_1"/>
-            <param name="dir-name" value="commons-httpclient"/>
-        </antcall>
-        <!-- Apply cumulative post-3.1 fixes patch -->
-        <antcall target="patch-source">
-            <param name="root-dir" value="build/download"/>
-            <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.cumulative.patch"/>
-            <param name="dir-name" value="commons-httpclient"/>
-        </antcall>
-        <!-- Apply mcf-specific features and fixes patch -->
-        <antcall target="patch-source">
-            <param name="root-dir" value="build/download"/>
-            <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.mcf.patch"/>
-            <param name="dir-name" value="commons-httpclient"/>
-        </antcall>
-        <!-- Supply dependencies -->
-        <mkdir dir="build/download/commons-httpclient/lib"/>
-        <copy todir="build/download/commons-httpclient/lib" file="lib/commons-logging.jar"/>
-        <copy todir="build/download/commons-httpclient/lib" file="lib/commons-codec.jar"/>
-        <!-- Build it -->
-        <ant dir="build/download/commons-httpclient" target="dist"/>
-        <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
   
     <target name="download-slf4j">

Modified: manifoldcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Sat Dec  8 01:51:02 2012
@@ -36,7 +36,6 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat Dec  8 01:51:02 2012
@@ -37,7 +37,6 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>
@@ -314,7 +313,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -352,7 +350,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -395,7 +392,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -434,7 +430,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -479,7 +474,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -526,7 +520,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -580,7 +573,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -629,7 +621,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -746,7 +737,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -786,7 +776,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -909,7 +898,6 @@
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -939,7 +927,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -994,8 +981,7 @@
         <property name="manifest-cp-3" value="${manifest-cp-2} lib/commons-collections.jar"/>
         <property name="manifest-cp-4" value="${manifest-cp-3} lib/commons-el.jar"/>
         <property name="manifest-cp-5" value="${manifest-cp-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-6" value="${manifest-cp-5} lib/commons-httpclient.jar"/>
-        <property name="manifest-cp-7" value="${manifest-cp-6} lib/commons-io.jar"/>
+        <property name="manifest-cp-7" value="${manifest-cp-5} lib/commons-io.jar"/>
         <property name="manifest-cp-8" value="${manifest-cp-7} lib/commons-logging.jar"/>
         <property name="manifest-cp-9" value="${manifest-cp-8} lib/hsqldb.jar"/>
         <property name="manifest-cp-10" value="${manifest-cp-9} lib/derbyclient.jar"/>
@@ -1068,7 +1054,6 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -1128,8 +1113,7 @@
         <property name="manifest-cp-proprietary-3" value="${manifest-cp-proprietary-2}
lib/commons-collections.jar"/>
         <property name="manifest-cp-proprietary-4" value="${manifest-cp-proprietary-3}
lib/commons-el.jar"/>
         <property name="manifest-cp-proprietary-5" value="${manifest-cp-proprietary-4}
lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-proprietary-6" value="${manifest-cp-proprietary-5}
lib/commons-httpclient.jar"/>
-        <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-6}
lib/commons-io.jar"/>
+        <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-5}
lib/commons-io.jar"/>
         <property name="manifest-cp-proprietary-8" value="${manifest-cp-proprietary-7}
lib/commons-logging.jar"/>
         <property name="manifest-cp-proprietary-9" value="${manifest-cp-proprietary-8}
lib/hsqldb.jar"/>
         <property name="manifest-cp-proprietary-10" value="${manifest-cp-proprietary-9}
lib/derbyclient.jar"/>

Modified: manifoldcf/trunk/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.bat?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.bat (original)
+++ manifoldcf/trunk/mvn-bootstrap.bat Sat Dec  8 01:51:02 2012
@@ -18,7 +18,6 @@ cmd /c ant make-deps
 
 cmd /c mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool
-Dversion=0.99 -Dpackaging=jar
 
-cmd /c mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient
-DartifactId=commons-httpclient -Dversion=3.1-mcf-1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl
-Dversion=2.9.1-mcf-1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs
-DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 

Modified: manifoldcf/trunk/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.sh?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.sh (original)
+++ manifoldcf/trunk/mvn-bootstrap.sh Sat Dec  8 01:51:02 2012
@@ -25,7 +25,6 @@ ant make-deps
 
 mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool
-Dversion=0.99 -Dpackaging=jar
 
-mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient
-Dversion=3.1-mcf-1  -Dpackaging=jar
 mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl
-Dversion=2.9.1-mcf-1  -Dpackaging=jar
 mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs
-DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 

Modified: manifoldcf/trunk/tests/test-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/test-build.xml?rev=1418591&r1=1418590&r2=1418591&view=diff
==============================================================================
--- manifoldcf/trunk/tests/test-build.xml (original)
+++ manifoldcf/trunk/tests/test-build.xml Sat Dec  8 01:51:02 2012
@@ -35,7 +35,6 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>



Mime
View raw message