From 029a6d487c4aec265e68dd22c492b31b7568afa3 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Tue, 29 Sep 2009 06:12:04 +0000
Subject: [PATCH] SOLR-1472 -- upgrade maven poms to reference lucene 2.9
 artifacts rather than solr-lucene artifacts

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@819835 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     | 23 ---------
 lib/solr-lucene-analyzers-pom.xml.template    | 35 --------------
 lib/solr-lucene-contrib-pom.xml.template      | 48 -------------------
 lib/solr-lucene-core-pom.xml.template         | 36 --------------
 lib/solr-lucene-highlighter-pom.xml.template  | 38 ---------------
 lib/solr-lucene-queries-pom.xml.template      | 38 ---------------
 lib/solr-lucene-snowball-pom.xml.template     | 36 --------------
 lib/solr-lucene-spellchecker-pom.xml.template | 36 --------------
 src/maven/solr-core-pom.xml.template          | 37 +++++++-------
 9 files changed, 21 insertions(+), 306 deletions(-)
 delete mode 100644 lib/solr-lucene-analyzers-pom.xml.template
 delete mode 100644 lib/solr-lucene-contrib-pom.xml.template
 delete mode 100644 lib/solr-lucene-core-pom.xml.template
 delete mode 100644 lib/solr-lucene-highlighter-pom.xml.template
 delete mode 100644 lib/solr-lucene-queries-pom.xml.template
 delete mode 100644 lib/solr-lucene-snowball-pom.xml.template
 delete mode 100644 lib/solr-lucene-spellchecker-pom.xml.template

diff --git a/build.xml b/build.xml
index b8a3967fb65..8e5e8a2ec6f 100644
--- a/build.xml
+++ b/build.xml
@@ -778,35 +778,12 @@
 
       <m2-deploy pom.xml="src/maven/solr-parent-pom.xml.template"/>
 
-      <!-- ========== SOLR SPECIFIC LUCENE ARTIFACTS ========== -->
-
-      <m2-deploy pom.xml="lib/solr-lucene-core-pom.xml.template"
-                 jar.file="lib/lucene-core-${lucene_version}.jar" />
-
-      <m2-deploy pom.xml="lib/solr-lucene-contrib-pom.xml.template"/>
-
-      <m2-deploy pom.xml="lib/solr-lucene-analyzers-pom.xml.template"
-                 jar.file="lib/lucene-analyzers-${lucene_version}.jar" />
-
-      <m2-deploy pom.xml="lib/solr-lucene-highlighter-pom.xml.template"
-                 jar.file="lib/lucene-highlighter-${lucene_version}.jar" />
-
-      <m2-deploy pom.xml="lib/solr-lucene-queries-pom.xml.template"
-                 jar.file="lib/lucene-queries-${lucene_version}.jar" />
-
-      <m2-deploy pom.xml="lib/solr-lucene-snowball-pom.xml.template"
-                 jar.file="lib/lucene-snowball-${lucene_version}.jar" />
-
-      <m2-deploy  pom.xml="lib/solr-lucene-spellchecker-pom.xml.template"
-                  jar.file="lib/lucene-spellchecker-${lucene_version}.jar" />
-
       <!-- ========== SOLR SPECIFIC COMMONS CSV ========== -->
       <m2-deploy  pom.xml="lib/solr-commons-csv-pom.xml.template"
                   jar.file="lib/commons-csv-1.0-SNAPSHOT-r609327.jar" />
 
       <!-- ========== SOLR ARTIFACTS ========== -->
 
-
       <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template"
                  jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
         <artifact-attachments>
diff --git a/lib/solr-lucene-analyzers-pom.xml.template b/lib/solr-lucene-analyzers-pom.xml.template
deleted file mode 100644
index 757a2caf2f5..00000000000
--- a/lib/solr-lucene-analyzers-pom.xml.template
+++ /dev/null
@@ -1,35 +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.
-  -->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-lucene-contrib</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-analyzers</artifactId>
-  <name>Solr Specific Lucene Analyzers</name>
-  <version>@maven_version@</version>
-  <description>Solr Specific Additional Analyzers</description>
-  <packaging>jar</packaging>
-</project>
diff --git a/lib/solr-lucene-contrib-pom.xml.template b/lib/solr-lucene-contrib-pom.xml.template
deleted file mode 100644
index bba6d506149..00000000000
--- a/lib/solr-lucene-contrib-pom.xml.template
+++ /dev/null
@@ -1,48 +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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <artifactId>solr-lucene-contrib</artifactId>
-  <name>Solr Specific Lucene Contrib POM</name>
-  <version>@maven_version@</version>
-  <packaging>pom</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-core</artifactId>
-      <version>@maven_version@</version>
-    </dependency>
-  </dependencies>
-  <properties>
-    <commons-logging-version>1.0.4</commons-logging-version>
-    <commons-digester-version>1.7</commons-digester-version>
-    <commons-collections-version>3.1</commons-collections-version>
-    <commons-beanutils-version>1.7.0</commons-beanutils-version>
-    <jakarta-regexp-version>1.4</jakarta-regexp-version>
-  </properties>
-</project>
diff --git a/lib/solr-lucene-core-pom.xml.template b/lib/solr-lucene-core-pom.xml.template
deleted file mode 100644
index 9e0a3c4e419..00000000000
--- a/lib/solr-lucene-core-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.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-core</artifactId>
-  <name>Solr Specific Lucene Core</name>
-  <version>@maven_version@</version>
-  <description>Solr Specific Lucene Core</description>
-  <packaging>jar</packaging>
-</project>
diff --git a/lib/solr-lucene-highlighter-pom.xml.template b/lib/solr-lucene-highlighter-pom.xml.template
deleted file mode 100644
index 1c3eab70770..00000000000
--- a/lib/solr-lucene-highlighter-pom.xml.template
+++ /dev/null
@@ -1,38 +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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-lucene-contrib</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-highlighter</artifactId>
-  <name>Solr Specific Lucene Highlighter</name>
-  <version>@maven_version@</version>
-  <description>
-    This is the highlighter for apache lucene java
-  </description>
-  <packaging>jar</packaging>
-</project>
diff --git a/lib/solr-lucene-queries-pom.xml.template b/lib/solr-lucene-queries-pom.xml.template
deleted file mode 100644
index 858803a48ab..00000000000
--- a/lib/solr-lucene-queries-pom.xml.template
+++ /dev/null
@@ -1,38 +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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-lucene-contrib</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-queries</artifactId>
-  <name>Solr Specific Lucene Queries</name>
-  <version>@maven_version@</version>
-  <description>
-    Queries - various query object exotica not in core
-  </description>
-  <packaging>jar</packaging>
-</project>
diff --git a/lib/solr-lucene-snowball-pom.xml.template b/lib/solr-lucene-snowball-pom.xml.template
deleted file mode 100644
index b40e8cd263e..00000000000
--- a/lib/solr-lucene-snowball-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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-lucene-contrib</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-snowball</artifactId>
-  <name>Solr Specific Lucene Snowball</name>
-  <version>@maven_version@</version>
-  <description>Snowball Analyzers</description>
-  <packaging>jar</packaging>
-</project>
diff --git a/lib/solr-lucene-spellchecker-pom.xml.template b/lib/solr-lucene-spellchecker-pom.xml.template
deleted file mode 100644
index b4a1435e68c..00000000000
--- a/lib/solr-lucene-spellchecker-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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-lucene-contrib</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-lucene-spellchecker</artifactId>
-  <name>Solr Specific Lucene Spellchecker</name>
-  <version>@maven_version@</version>
-  <description>Spell Checker</description>
-  <packaging>jar</packaging>
-</project>
diff --git a/src/maven/solr-core-pom.xml.template b/src/maven/solr-core-pom.xml.template
index 20764bb96e9..6b7ca175ff8 100644
--- a/src/maven/solr-core-pom.xml.template
+++ b/src/maven/solr-core-pom.xml.template
@@ -45,31 +45,36 @@
       <version>@maven_version@</version>
     </dependency>
 
-    <!-- Solr Specific Lucene -->
+    <!-- Lucene -->
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-analyzers</artifactId>
-      <version>@maven_version@</version>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers</artifactId>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-highlighter</artifactId>
-      <version>@maven_version@</version>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-highlighter</artifactId>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-queries</artifactId>
-      <version>@maven_version@</version>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queries</artifactId>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-snowball</artifactId>
-      <version>@maven_version@</version>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-snowball</artifactId>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-lucene-spellchecker</artifactId>
-      <version>@maven_version@</version>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-memory</artifactId>
+      <version>2.9.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-spellchecker</artifactId>
+      <version>2.9.0</version>
     </dependency>
 
     <!-- Apache Commons -->