lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1130718 - in /lucene/dev/trunk: dev-tools/maven/ dev-tools/maven/modules/analysis/icu/ dev-tools/maven/solr/contrib/extraction/ modules/analysis/icu/ modules/analysis/icu/lib/
Date Thu, 02 Jun 2011 18:42:27 GMT
Author: sarowe
Date: Thu Jun  2 18:42:26 2011
New Revision: 1130718

URL: http://svn.apache.org/viewvc?rev=1130718&view=rev
Log:
LUCENE-3149: Switch ICU4J dependency to mavenized version

Removed:
    lucene/dev/trunk/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
Modified:
    lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
    lucene/dev/trunk/modules/analysis/icu/build.xml

Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1130718&r1=1130717&r2=1130718&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template Thu Jun  2 18:42:26
2011
@@ -70,8 +70,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-icu4j</artifactId>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

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=1130718&r1=1130717&r2=1130718&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Jun  2 18:42:26 2011
@@ -121,9 +121,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-icu4j</artifactId>
-        <version>${project.version}</version>
+        <groupId>com.ibm.icu</groupId>
+        <artifactId>icu4j</artifactId>
+        <version>4.8</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -598,20 +598,6 @@
             <artifactId>maven-install-plugin</artifactId>
             <executions>
               <execution>
-                <id>install-icu4j</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>org.apache.lucene</groupId>
-                  <artifactId>lucene-icu4j</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>modules/analysis/icu/lib/icu4j-4_8.jar</file>
-                </configuration>
-              </execution>
-              <execution>
                 <id>install-xercesImpl</id>
                 <phase>install</phase>
                 <goals>

Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1130718&r1=1130717&r2=1130718&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template Thu Jun  2 18:42:26
2011
@@ -68,8 +68,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-icu4j</artifactId>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: lucene/dev/trunk/modules/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/build.xml?rev=1130718&r1=1130717&r2=1130718&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/icu/build.xml Thu Jun  2 18:42:26 2011
@@ -133,11 +133,6 @@ are part of the ICU4C package. See http:
     </compile>
   </target>
   
-  <target name="dist-maven" depends="contrib-build.dist-maven">
-    <m2-deploy-with-pom-template pom.xml="lib/lucene-icu4j-pom.xml.template"
-                                 jar.file="lib/icu4j-4_8.jar" />
-  </target>
-
   <target name="javadocs" depends="compile-core">
    	<sequential>
        <mkdir dir="${javadoc.dir}/contrib-${name}"/>



Mime
View raw message