Author: billbarker
Date: Sun Apr 1 00:18:18 2012
New Revision: 1307952
URL: http://svn.apache.org/viewvc?rev=1307952&view=rev
Log:
lucence is using ivy, so assuming it is using it for all projects. It is ant so extra jars
on the classpath are harmless. Will look to fixing guava depend after the next build
Modified:
gump/metadata/project/lucene-java.xml
gump/metadata/project/ws-axis.xml
Modified: gump/metadata/project/lucene-java.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/lucene-java.xml?rev=1307952&r1=1307951&r2=1307952&view=diff
==============================================================================
--- gump/metadata/project/lucene-java.xml (original)
+++ gump/metadata/project/lucene-java.xml Sun Apr 1 00:18:18 2012
@@ -36,6 +36,7 @@
<depend project="javacc"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<home nested="lucene/build"/>
<jar name="core/lucene-core-@@DATE@@.jar" id="lucene-core"/>
@@ -61,6 +62,7 @@
<depend project="lucene-java"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<home nested="lucene/build"/>
<jar name="test-framework/lucene-test-framework-@@DATE@@.jar"/>
@@ -84,6 +86,7 @@
<depend project="lucene-java"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<license name="lucene/LICENSE.txt"/>
@@ -109,6 +112,7 @@
<depend project="lucene-java-tools"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<!--
<work nested="lucene/build/classes/test"/>
<work nested="lucene/build/classes/tools"/>
@@ -134,6 +138,7 @@
<depend project="lucene-java-test-framework"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="modules/analysis/build/common/classes/java"/>
<work nested="modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar"/>
<work nested="modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar"/>
@@ -171,6 +176,7 @@
<depend project="lucene-java-tools"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="lucene/build/classes/test"/>
<work nested="lucene/build/classes/tools"/>
<work nested="modules/analysis/build/icu/classes/test"/>
@@ -209,6 +215,7 @@
<depend project="nekohtml"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="lucene/build/classes/test"/>
<work nested="lucene/build/classes/tools"/>
@@ -273,6 +280,7 @@
<depend project="xalan"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="lucene/build/classes/tools"/>
<work nested="lucene/build/classes/test"/>
@@ -316,6 +324,7 @@
<depend project="velocity-tools-generic"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="lucene/build/classes/test"/>
<work nested="solr/build/solr"/>
@@ -378,6 +387,7 @@
<depend project="velocity-tools-generic"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
+ <depend project="ivy" inherit="runtime" />
<work nested="lucene/build/classes/test"/>
<work nested="solr/build/tests"/>
Modified: gump/metadata/project/ws-axis.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ws-axis.xml?rev=1307952&r1=1307951&r2=1307952&view=diff
==============================================================================
--- gump/metadata/project/ws-axis.xml (original)
+++ gump/metadata/project/ws-axis.xml Sun Apr 1 00:18:18 2012
@@ -35,19 +35,23 @@
<project name="ws-axis">
<package>org.apache.axis</package>
+<!--
<ant target="dist">
<property name="axis.lib.dir" value="lib"/>
<property name="env.ANT_HOME" reference="home" project="ant"/>
<depend name="wsdl4j.jar" project="wsdl4j" id="wsdl4j"/>
<depend name="log4j-core.jar" project="logging-log4j-12" id="log4j"/>
+-->
<!--
<property name="xalan.jar" project="xalan" id="xalan-unbundled"/>
<property name="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
<property name="xml-apis.jar" project="xml-apis" id="xml-apis"/>
--->
+
+<!--
<sysproperty name="ant.build.clonevm" value="true"/>
</ant>
-
+-->
+ <mvn2 separateLocalRepository="true" />
<depend project="jaxp-12"/>
<depend project="xml-xerces" inherit="runtime" runtime="true"/>
<depend project="oro"/>
@@ -66,13 +70,18 @@
<work nested="build/lib/axis-ant.jar"/>
<work nested="build/classes"/>
<work nested="build/work"/>
-
+<!--
<home nested="build"/>
<jar name="lib/axis.jar" id="axis"/>
<jar name="lib/axis-ant.jar" id="axis-ant"/>
<jar name="lib/jaxrpc.jar" id="axis-jaxrpc"/>
<jar name="lib/saaj.jar" id="axis-saaj"/>
-
+-->
+ <home nested="target" />
+ <jar name="axis.jar" id="axis"/>
+ <jar name="axis-ant.jar" id="axis-ant"/>
+ <jar name="jaxrpc.jar" id="axis-jaxrpc"/>
+ <jar name="saaj.jar" id="axis-saaj"/>
<license name="LICENSE"/>
<nag from="Davanum Srinivas <davanum@gmail.com>"
|