Tag MCF 1.5 RC0
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/tags/release-1.5-RC0@1559078 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 2195338..36ac4d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,16 @@
======================= Release 1.5 =====================
+CONNECTORS-861: Reduce the example worker thread count so that we
+don't run out of zookeeper resources on Windows.
+(Karl Wright)
+
+CONNECTORS-860: Remove zookeeper.jar from a number of contexts
+where it should not be. This will reduce the binary footprint by some
+amount and also prevent more than one zookeeper.jar from being in
+the classpath at a time.
+(Karl Wright)
+
CONNECTORS-858: HDFS repository and output connectors need to be
fully compatible with multiple Hadoop 2.2.0 file system protocols.
(Minoru Osuka, Karl Wright)
diff --git a/connectors/solr/build.xml b/connectors/solr/build.xml
index ababb3d..40b590b 100644
--- a/connectors/solr/build.xml
+++ b/connectors/solr/build.xml
@@ -24,7 +24,6 @@
<fileset dir="../../lib">
<include name="solr-solrj*.jar"/>
<include name="httpmime*.jar"/>
- <include name="zookeeper*.jar"/>
<include name="wstx-asl*.jar"/>
<include name="jcl-over-slf4j*.jar"/>
</fileset>
@@ -36,7 +35,6 @@
<fileset dir="../../lib">
<include name="solr-solrj*.jar"/>
<include name="httpmime*.jar"/>
- <include name="zookeeper*.jar"/>
<include name="wstx-asl*.jar"/>
<include name="jcl-over-slf4j*.jar"/>
</fileset>
diff --git a/framework/build.xml b/framework/build.xml
index 262d99c..f8ecd42 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -866,6 +866,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -907,6 +908,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -1260,7 +1262,8 @@
<property name="manifest-cp-60" value="${manifest-cp-59} lib/httpcore.jar"/>
<property name="manifest-cp-61" value="${manifest-cp-60} lib/httpclient.jar"/>
<property name="manifest-cp-62" value="${manifest-cp-61} lib/mail.jar"/>
- <property name="manifest-cp" value="${manifest-cp-62}"/>
+ <property name="manifest-cp-63" value="${manifest-cp-62} lib/zookeeper.jar"/>
+ <property name="manifest-cp" value="${manifest-cp-63}"/>
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1398,7 +1401,8 @@
<property name="manifest-cp-proprietary-62" value="${manifest-cp-proprietary-61} lib/httpcore.jar"/>
<property name="manifest-cp-proprietary-63" value="${manifest-cp-proprietary-62} lib/httpclient.jar"/>
<property name="manifest-cp-proprietary-64" value="${manifest-cp-proprietary-63} lib/mail.jar"/>
- <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-64}"/>
+ <property name="manifest-cp-proprietary-65" value="${manifest-cp-proprietary-63} lib/zookeeper.jar"/>
+ <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-65}"/>
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
diff --git a/framework/example-multiprocess-zk-common/properties-global.xml b/framework/example-multiprocess-zk-common/properties-global.xml
index dfddb35..0401a1d 100644
--- a/framework/example-multiprocess-zk-common/properties-global.xml
+++ b/framework/example-multiprocess-zk-common/properties-global.xml
@@ -27,6 +27,6 @@
<property name="org.apache.manifoldcf.dbsuperusername" value="sa"/>
<property name="org.apache.manifoldcf.dbsuperuserpassword" value=""/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
- <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
+ <property name="org.apache.manifoldcf.crawler.threads" value="20"/>
<!-- Any additional global properties go here -->
</configuration>
