You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/10/20 15:46:54 UTC

svn commit: r1186804 - in /lucene/dev/trunk/dev-tools/maven: pom.xml.template solr/contrib/langid/pom.xml.template

Author: sarowe
Date: Thu Oct 20 13:46:53 2011
New Revision: 1186804

URL: http://svn.apache.org/viewvc?rev=1186804&view=rev
Log:
SOLR-2839: Maven configuration: added support for new langdetect implementation

Modified:
    lucene/dev/trunk/dev-tools/maven/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template

Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1186804&r1=1186803&r2=1186804&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Oct 20 13:46:53 2011
@@ -222,6 +222,16 @@
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
+        <artifactId>solr-jsonic</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>solr-langdetect</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
         <artifactId>solr-noggit</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -677,6 +687,35 @@
                   <file>solr/example/lib/jetty-util-${patched.jetty.version}.jar</file>
                 </configuration>
               </execution>
+              <execution>
+                <id>install-jsonic</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>install-file</goal>
+                </goals>
+                <configuration>
+                  <!-- jsonic v1.2.7 is in the central maven repo - remove this once upgraded. -->
+                  <groupId>org.apache.solr</groupId>
+                  <artifactId>solr-jsonic</artifactId>
+                  <version>${project.version}</version>
+                  <packaging>jar</packaging>
+                  <file>solr/contrib/langid/lib/jsonic-1.2.0.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.jar</file>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>

Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1186804&r1=1186803&r2=1186804&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template Thu Oct 20 13:46:53 2011
@@ -63,6 +63,14 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>solr-jsonic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>solr-langdetect</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-parsers</artifactId>
     </dependency>
@@ -78,6 +86,11 @@
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
     <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
     <testResources>
       <testResource>
         <directory>src/test-files</directory>