You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/28 02:16:42 UTC
svn commit: r1306071 - in /lucene/dev/branches/lucene3930:
lucene/common-build.xml modules/analysis/build.xml
Author: rmuir
Date: Wed Mar 28 00:16:42 2012
New Revision: 1306071
URL: http://svn.apache.org/viewvc?rev=1306071&view=rev
Log:
LUCENE-3930: add Uwe's dist-maven patch plus initial OOM protection (TODO: fix analyzers recursion)
Modified:
lucene/dev/branches/lucene3930/lucene/common-build.xml
lucene/dev/branches/lucene3930/modules/analysis/build.xml
Modified: lucene/dev/branches/lucene3930/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/common-build.xml?rev=1306071&r1=1306070&r2=1306071&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Wed Mar 28 00:16:42 2012
@@ -810,11 +810,16 @@
<target name="javadocs">
<fail message="You must redefine the javadocs task to do something!!!!!"/>
</target>
-
- <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
+
+ <target name="install-maven-tasks" unless="maven-tasks.uptodate">
+ <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
+ inline="true" conf="master" pathid="maven-ant-tasks.classpath"/>
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath"/>
+ </target>
+
+ <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs, install-maven-tasks">
<sequential>
<m2-deploy>
<artifact-attachments>
Modified: lucene/dev/branches/lucene3930/modules/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/build.xml?rev=1306071&r1=1306070&r2=1306071&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/build.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/build.xml Wed Mar 28 00:16:42 2012
@@ -65,6 +65,8 @@
<target name="default" depends="compile"/>
<target name="compile" depends="common,icu,kuromoji,morfologik,phonetic,smartcn,stempel,uima" />
+ <!-- FIXME: these should crawl like contrib-crawl/modules-crawl, passing the
+ propset so we dont install maven-ant-tasks over and over -->
<target name="clean">
<ant dir="common" target="clean" />
<ant dir="icu" target="clean" />