Author: kwright
Date: Sat Dec 29 07:19:26 2012
New Revision: 1426712
URL: http://svn.apache.org/viewvc?rev=1426712&view=rev
Log:
Change the dependencies to be compatible with MCF trunk.
Added:
manifoldcf/branches/CONNECTORS-594/tests/solrcloud/
manifoldcf/branches/CONNECTORS-594/tests/solrcloud/build.xml
Modified:
manifoldcf/branches/CONNECTORS-594/build.xml
manifoldcf/branches/CONNECTORS-594/connectors/solrcloud/build.xml
Modified: manifoldcf/branches/CONNECTORS-594/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/build.xml?rev=1426712&r1=1426711&r2=1426712&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-594/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-594/build.xml Sat Dec 29 07:19:26 2012
@@ -2922,6 +2922,13 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="httpclient"/>
<param name="artifact-type" value="jar"/>
</antcall -->
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/httpcomponents"/>
+ <param name="artifact-version" value="4.2.1"/>
+ <param name="artifact-name" value="httpmime"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-json">
@@ -3142,7 +3149,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="commons-io"/>
- <param name="artifact-version" value="1.3.2"/>
+ <param name="artifact-version" value="2.1"/>
<param name="artifact-name" value="commons-io"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -3162,7 +3169,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-slf4j">
<mkdir dir="lib"/>
- <property name="slf4j-version" value="1.6.4"/>
+ <property name="slf4j-version" value="1.6.6"/>
<property name="slf4j-package" value="org/slf4j"/>
<antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="slf4j-api"/>
@@ -3172,6 +3179,18 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="slf4j-simple"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j-version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jcl-over-slf4j"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <!--antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/slf4j"/>
+ <param name="artifact-version" value="1.6.6"/>
+ <param name="artifact-name" value="log4j-over-slf4j"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall-->
+
</target>
<target name="download-jetty">
@@ -3571,7 +3590,7 @@ Use Apache Forrest version forrest-0.9-d
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/codehaus/woodstox"/>
- <param name="artifact-version" value="3.2.3"/>
+ <param name="artifact-version" value="3.2.9"/>
<param name="artifact-name" value="wstx-asl"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -3638,17 +3657,21 @@ Use Apache Forrest version forrest-0.9-d
</target>
<target name="download-solrj">
- <mkdir dir="lib/solr-4.x"/>
- <mkdir dir="lib/solr-4.x/solrj-lib"/>
- <mkdir dir="build/download"/>
- <get
src="http://www.us.apache.org/dist/lucene/solr/4.0.0/apache-solr-4.0.0.tgz";
dest="build/download/apache-solr-4.0.0.tgz"/>
- <untar src="build/download/apache-solr-4.0.0.tgz"
dest="build/download" compression="gzip"/>
- <copy todir="lib/solr-4.x">
- <fileset
file="build/download/apache-solr-4.0.0/dist/apache-solr-solrj-4.0.0.jar"/>
- </copy>
- <copy todir="lib/solr-4.x/solrj-lib">
- <fileset dir="build/download/apache-solr-4.0.0/dist/solrj-lib"/>
- </copy>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/solr"/>
+ <param name="artifact-version" value="4.0.0-BETA"/>
+ <param name="artifact-name" value="solr-solrj"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/zookeeper"/>
+ <param name="artifact-version" value="3.3.6"/>
+ <param name="artifact-name" value="zookeeper"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="make-core-deps"
depends="download-solrj,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
Modified: manifoldcf/branches/CONNECTORS-594/connectors/solrcloud/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/connectors/solrcloud/build.xml?rev=1426712&r1=1426711&r2=1426712&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-594/connectors/solrcloud/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-594/connectors/solrcloud/build.xml Sat Dec
29 07:19:26 2012
@@ -21,11 +21,12 @@
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
- <fileset dir="../../lib/solr-4.x">
- <include name="apache-solr-solrj-*.jar"/>
- </fileset>
- <fileset dir="../../lib/solr-4.x/solrj-lib">
- <include name="*.jar"/>
+ <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>
</path>
@@ -33,16 +34,12 @@
<target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
- <fileset dir="../../lib/solr-4.x">
- <include name="apache-solr-solrj-*.jar"/>
- </fileset>
- </copy>
- <copy todir="dist/lib">
- <fileset dir="../../lib/solr-4.x/solrj-lib">
- <include name="httpclient-*.jar"/>
- <include name="httpcore-*.jar"/>
- <include name="httpmime-*.jar"/>
- <include name="zookeeper-*.jar"/>
+ <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>
</copy>
</target>
Added: manifoldcf/branches/CONNECTORS-594/tests/solrcloud/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/tests/solrcloud/build.xml?rev=1426712&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-594/tests/solrcloud/build.xml (added)
+++ manifoldcf/branches/CONNECTORS-594/tests/solrcloud/build.xml Sat Dec 29
07:19:26 2012
@@ -0,0 +1,22 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="solrcloud" default="all">
+
+ <import file="../ifs-test-build.xml"/>
+
+</project>
