From d2cc7f1330779c70cb1d3183a3f0158d1a4adad8 Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Thu, 2 Jun 2011 18:42:26 +0000
Subject: [PATCH] LUCENE-3149: Switch ICU4J dependency to mavenized version

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130718 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/analysis/icu/pom.xml.template     |  4 +--
 dev-tools/maven/pom.xml.template              | 20 ++---------
 .../solr/contrib/extraction/pom.xml.template  |  4 +--
 modules/analysis/icu/build.xml                |  5 ---
 .../icu/lib/lucene-icu4j-pom.xml.template     | 36 -------------------
 5 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 modules/analysis/icu/lib/lucene-icu4j-pom.xml.template

diff --git a/dev-tools/maven/modules/analysis/icu/pom.xml.template b/dev-tools/maven/modules/analysis/icu/pom.xml.template
index 56c2796f912..42f1cc41659 100644
--- a/dev-tools/maven/modules/analysis/icu/pom.xml.template
+++ b/dev-tools/maven/modules/analysis/icu/pom.xml.template
@@ -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>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 3b5bc65e04f..3a5d970c564 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -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>
@@ -597,20 +597,6 @@
             <groupId>org.apache.maven.plugins</groupId>
             <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>
diff --git a/dev-tools/maven/solr/contrib/extraction/pom.xml.template b/dev-tools/maven/solr/contrib/extraction/pom.xml.template
index da012e5c8cd..4d931a3e7ad 100644
--- a/dev-tools/maven/solr/contrib/extraction/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/extraction/pom.xml.template
@@ -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>
diff --git a/modules/analysis/icu/build.xml b/modules/analysis/icu/build.xml
index b0914e69f57..483be1e4706 100644
--- a/modules/analysis/icu/build.xml
+++ b/modules/analysis/icu/build.xml
@@ -133,11 +133,6 @@ are part of the ICU4C package. See http://site.icu-project.org/ </echo>
     </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}"/>
diff --git a/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template b/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
deleted file mode 100644
index 2b481863de8..00000000000
--- a/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
+++ /dev/null
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-
-  <parent>
-    <groupId>org.apache.lucene</groupId>
-    <artifactId>lucene-parent</artifactId>
-    <version>@version@</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-icu4j</artifactId>
-  <name>Lucene Specific ICU4J</name>
-  <version>@version@</version>
-  <description>Lucene Specific ICU4J v4.6</description>
-  <packaging>jar</packaging>
-</project>