manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1806980 - in /manifoldcf/branches/release-2.8-branch: ./ CHANGES.txt build.xml framework/build.xml
Date Fri, 01 Sep 2017 15:20:43 GMT
Author: kwright
Date: Fri Sep  1 15:20:43 2017
New Revision: 1806980

URL: http://svn.apache.org/viewvc?rev=1806980&view=rev
Log:
Pull up fix for CONNECTORS-1452 from trunk.

Modified:
    manifoldcf/branches/release-2.8-branch/   (props changed)
    manifoldcf/branches/release-2.8-branch/CHANGES.txt
    manifoldcf/branches/release-2.8-branch/build.xml
    manifoldcf/branches/release-2.8-branch/framework/build.xml

Propchange: manifoldcf/branches/release-2.8-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  1 15:20:43 2017
@@ -149,4 +149,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1806824,1806908
+/manifoldcf/trunk:1806824,1806908,1806979

Modified: manifoldcf/branches/release-2.8-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/CHANGES.txt?rev=1806980&r1=1806979&r2=1806980&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.8-branch/CHANGES.txt Fri Sep  1 15:20:43 2017
@@ -3,6 +3,13 @@ $Id$
 
 ======================= Release 2.8.1 =====================
 
+CONNECTORS-1452: The runzookeeper.bat/runzookeeper.sh scripts
+were not properly starting zookeeper, because the zookeeper "main
+process" uses log4j 1.2.x methods not compatible with the log4j-1.2-api
+shim.  We have to include a 1.2.x jar and use that when starting the
+zookeeper process.
+(Karl Wright)
+
 CONNECTORS-1451: Tika extractor was causing some out-of-memory
 events to occur for simple crawls, so I increased the default memory
 allocated in the examples to 512M.

Modified: manifoldcf/branches/release-2.8-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/build.xml?rev=1806980&r1=1806979&r2=1806980&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/build.xml Fri Sep  1 15:20:43 2017
@@ -71,6 +71,7 @@
     <property name="junit.version" value="4.12"/>
     <property name="selenium.version" value="3.3.1"/>
     <property name="hamcrest.version" value="1.3"/>
+    <property name="log4j12.version" value="1.2.17"/>
     <property name="log4j.version" value="2.4.1"/>
     <property name="mail.version" value="1.4.5"/>
     <property name="mimepull.version" value="1.3"/>
@@ -1697,6 +1698,13 @@ Use Apache Forrest version forrest-0.9-d
 
     <target name="download-log4j">
         <mkdir dir="lib"/>
+        <!-- For zookeeper -->
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="log4j"/>
+            <param name="artifact-version" value="${log4j12.version}"/>
+            <param name="artifact-name" value="log4j"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/logging/log4j"/>
             <param name="artifact-version" value="${log4j.version}"/>

Modified: manifoldcf/branches/release-2.8-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/framework/build.xml?rev=1806980&r1=1806979&r2=1806980&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/framework/build.xml Fri Sep  1 15:20:43 2017
@@ -60,7 +60,9 @@
             <include name="slf4j*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
-            <include name="log4j*.jar"/>
+            <include name="log4j-api-*.jar"/>
+            <include name="log4j-core-*.jar"/>
+            <include name="log4j-1.2-api-*.jar"/>
             <include name="serializer*.jar"/>
             <include name="javax.servlet-api*.jar"/>
             <include name="juli*.jar"/>
@@ -489,7 +491,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -537,7 +541,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -591,7 +597,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -640,7 +648,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -696,7 +706,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -757,7 +769,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -822,7 +836,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -881,7 +897,9 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
@@ -1009,7 +1027,10 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="log4j*.jar"/>
+                <include name="log4j-1.2.*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
+                <include name="log4j-1.2-api-*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="javax.servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
@@ -1239,7 +1260,7 @@
             <include name="zookeeper*.jar"/>
             <include name="slf4j-api*.jar"/>
             <include name="slf4j-simple*.jar"/>
-            <include name="log4j*.jar"/>
+            <include name="log4j-1.2.*.jar"/>
         </fileset>
     </path>
     
@@ -1257,7 +1278,9 @@
             <include name="jasper*.jar"/>
             <include name="jsp-api-2.1-glassfish*.jar"/>
             <include name="json-simple*.jar"/>
-            <include name="log4j*.jar"/>
+            <include name="log4j-api-*.jar"/>
+            <include name="log4j-core-*.jar"/>
+            <include name="log4j-1.2-api-*.jar"/>
             <include name="serializer*.jar"/>
             <include name="javax.servlet-api*.jar"/>
             <include name="juli*.jar"/>



Mime
View raw message