You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/03/28 02:40:14 UTC

svn commit: r1306082 - in /lucene/dev/branches/lucene3930/lucene: build.xml common-build.xml lib/maven-ant-tasks-2.1.3.jar lib/maven-ant-tasks-LICENSE-ASL.txt lib/maven-ant-tasks-NOTICE.txt

Author: uschindler
Date: Wed Mar 28 00:40:13 2012
New Revision: 1306082

URL: http://svn.apache.org/viewvc?rev=1306082&view=rev
Log:
fix missing dependencies for maven, nuke maven ant tasks

Removed:
    lucene/dev/branches/lucene3930/lucene/lib/maven-ant-tasks-2.1.3.jar
    lucene/dev/branches/lucene3930/lucene/lib/maven-ant-tasks-LICENSE-ASL.txt
    lucene/dev/branches/lucene3930/lucene/lib/maven-ant-tasks-NOTICE.txt
Modified:
    lucene/dev/branches/lucene3930/lucene/build.xml
    lucene/dev/branches/lucene3930/lucene/common-build.xml

Modified: lucene/dev/branches/lucene3930/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/build.xml?rev=1306082&r1=1306081&r2=1306082&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/build.xml Wed Mar 28 00:40:13 2012
@@ -433,7 +433,7 @@
   </target>
 
 
-  <target name="generate-maven-artifacts" depends="package, javadocs">
+  <target name="generate-maven-artifacts" depends="install-maven-tasks, package, javadocs">
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
              uri="antlib:org.apache.maven.artifact.ant" 
              classpathref="maven-ant-tasks.classpath"/>

Modified: lucene/dev/branches/lucene3930/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/common-build.xml?rev=1306082&r1=1306081&r2=1306082&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Wed Mar 28 00:40:13 2012
@@ -805,7 +805,7 @@
   	<fail message="You must redefine the javadocs task to do something!!!!!"/>
   </target>
 
-  <target name="install-maven-tasks" unless="maven-tasks.uptodate">
+  <target name="install-maven-tasks" depends="install-ivy" 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"