lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1309196 - in /lucene/dev/branches/branch_3x: ./ dev-tools/eclipse/ dev-tools/maven/ dev-tools/maven/solr/contrib/langid/ solr/ solr/contrib/ solr/contrib/langid/ solr/contrib/langid/lib/
Date Wed, 04 Apr 2012 01:04:30 GMT
Author: rmuir
Date: Wed Apr  4 01:04:29 2012
New Revision: 1309196

URL: http://svn.apache.org/viewvc?rev=1309196&view=rev
Log:
SOLR-3310: nuke the solr-langdetect maven packaging

Removed:
    lucene/dev/branches/branch_3x/solr/contrib/langid/lib/langdetect-pom.xml.template
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/langid/pom.xml.template
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
    lucene/dev/branches/branch_3x/solr/contrib/langid/ivy.xml

Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1309196&r1=1309195&r2=1309196&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Wed Apr  4 01:04:29 2012
@@ -145,8 +145,8 @@
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
+	<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-r111-java5.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1309196&r1=1309195&r2=1309196&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Wed Apr  4 01:04:29 2012
@@ -226,9 +226,9 @@
         <version>1.2.7</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-langdetect</artifactId>
-        <version>${project.version}</version>
+        <groupId>com.cybozu.labs</groupId>
+        <artifactId>langdetect</artifactId>
+        <version>1.1-20120112</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
@@ -689,20 +689,6 @@
                   <file>solr/example/lib/jetty-util-${patched.jetty.version}.jar</file>
                 </configuration>
               </execution>
-              <execution>
-                <id>install-langdetect</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>org.apache.solr</groupId>
-                  <artifactId>solr-langdetect</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>solr/contrib/langid/lib/langdetect-r111-java5.jar</file>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1309196&r1=1309195&r2=1309196&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/langid/pom.xml.template Wed
Apr  4 01:04:29 2012
@@ -67,8 +67,8 @@
       <artifactId>jsonic</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-langdetect</artifactId>
+      <groupId>com.cybozu.labs</groupId>
+      <artifactId>langdetect</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>

Modified: lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml?rev=1309196&r1=1309195&r2=1309196&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml Wed Apr  4 01:04:29 2012
@@ -31,12 +31,6 @@
     <path refid="solr.base.classpath"/>   
   </path>
 
-  <dirname file="${ant.file.solr-langid}" property="solr-langid.dir"/>
-  <target name="dist-maven" depends="common-solr.dist-maven">
-    <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/langdetect-pom.xml.template"
-                                 jar.file="${solr-langid.dir}/lib/langdetect-r111-java5.jar"
/>
-  </target>
-
     <!-- we don't actually need to compile this thing, we just want its libs -->
   <target name="resolve-extraction-libs">
     <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">

Modified: lucene/dev/branches/branch_3x/solr/contrib/langid/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/langid/ivy.xml?rev=1309196&r1=1309195&r2=1309196&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/langid/ivy.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/langid/ivy.xml Wed Apr  4 01:04:29 2012
@@ -19,9 +19,7 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.solr" module="langid"/>
     <dependencies>
-      <dependency org="langdetect" name="langdetect" rev="r111-java5">
-        <artifact name="langdetect" type="jar" url="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_5_0/solr/contrib/langid/lib/langdetect-r111-java5.jar"/>
-      </dependency>
+      <dependency org="com.cybozu.labs" name="langdetect" rev="1.1-20120112" transitive="false"/>
       <dependency org="net.arnx" name="jsonic" rev="1.2.7" transitive="false"/>
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
     </dependencies>



Mime
View raw message