Author: ryan
Date: Tue Sep 29 06:12:04 2009
New Revision: 819835
URL: http://svn.apache.org/viewvc?rev=819835&view=rev
Log:
SOLR-1472 -- upgrade maven poms to reference lucene 2.9 artifacts rather than
solr-lucene artifacts
Removed:
lucene/solr/trunk/lib/solr-lucene-analyzers-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-contrib-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-core-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-highlighter-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-queries-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-snowball-pom.xml.template
lucene/solr/trunk/lib/solr-lucene-spellchecker-pom.xml.template
Modified:
lucene/solr/trunk/build.xml
lucene/solr/trunk/src/maven/solr-core-pom.xml.template
Modified: lucene/solr/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/build.xml?rev=819835&r1=819834&r2=819835&view=diff
==============================================================================
--- lucene/solr/trunk/build.xml (original)
+++ lucene/solr/trunk/build.xml Tue Sep 29 06:12:04 2009
@@ -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>
Modified: lucene/solr/trunk/src/maven/solr-core-pom.xml.template
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/maven/solr-core-pom.xml.template?rev=819835&r1=819834&r2=819835&view=diff
==============================================================================
--- lucene/solr/trunk/src/maven/solr-core-pom.xml.template (original)
+++ lucene/solr/trunk/src/maven/solr-core-pom.xml.template Tue Sep 29 06:12:04
2009
@@ -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 -->
