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 03:44:15 UTC

svn commit: r1306108 - in /lucene/dev/branches/lucene3930/modules/spatial: build.xml ivy.xml lib/spatial4j-0.2.jar

Author: rmuir
Date: Wed Mar 28 01:44:14 2012
New Revision: 1306108

URL: http://svn.apache.org/viewvc?rev=1306108&view=rev
Log:
LUCENE-3930: nuke spatial jar

Removed:
    lucene/dev/branches/lucene3930/modules/spatial/lib/spatial4j-0.2.jar
Modified:
    lucene/dev/branches/lucene3930/modules/spatial/build.xml
    lucene/dev/branches/lucene3930/modules/spatial/ivy.xml

Modified: lucene/dev/branches/lucene3930/modules/spatial/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/spatial/build.xml?rev=1306108&r1=1306107&r2=1306108&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/spatial/build.xml (original)
+++ lucene/dev/branches/lucene3930/modules/spatial/build.xml Wed Mar 28 01:44:14 2012
@@ -8,24 +8,21 @@
   <property name="dist.dir" location="dist/" />
   <property name="maven.dist.dir" location="../dist/maven" />
 
-  <path id="additional.dependencies">
-    <fileset dir="lib" includes="*.jar"/>
-  </path>
-
-  <pathconvert property="project.classpath"
-               targetos="unix"
-               refid="additional.dependencies"
-  />
-  
   <import file="../../lucene/contrib/contrib-build.xml"/>
 
+  <path id="spatialjar">
+     <pathelement path="lib/spatial4j-0.2.jar"/>
+  </path>
+
   <path id="classpath">
     <path refid="base.classpath"/>
+    <path refid="spatialjar"/>
     <pathelement path="${queries.jar}" />
   </path>
 
   <path id="test.classpath">
     <path refid="test.base.classpath" />
+    <path refid="spatialjar"/>
     <pathelement path="src/test-files" />
   </path>
 

Modified: lucene/dev/branches/lucene3930/modules/spatial/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/spatial/ivy.xml?rev=1306108&r1=1306107&r2=1306108&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/spatial/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/spatial/ivy.xml Wed Mar 28 01:44:14 2012
@@ -18,5 +18,7 @@
 -->
 <ivy-module version="2.0">
     <info organisation="org.apache.lucene" module="spatial"/>
-    <!-- TODO: spatial lib -->
+    <dependencies>
+      <dependency org="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
+    </dependencies>
 </ivy-module>