You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2010/06/17 04:25:11 UTC
svn commit: r955464 - in /lucene/dev/trunk: ./ solr/
solr/contrib/clustering/ solr/contrib/dataimporthandler/
solr/contrib/extraction/ solr/contrib/velocity/ solr/lib/ solr/src/maven/
Author: ryan
Date: Thu Jun 17 02:25:11 2010
New Revision: 955464
URL: http://svn.apache.org/viewvc?rev=955464&view=rev
Log:
LUCENE-2490 -- ant generate-maven-artifacts will build lucuen and solr
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Thu Jun 17 02:25:11 2010
@@ -44,6 +44,18 @@
</sequential>
</target>
+ <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr">
+ <sequential>
+ <subant target="generate-maven-artifacts" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ </subant>
+
+ <subant target="generate-maven-artifacts" inheritall="false" failonerror="true">
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
+
<target name="clean" description="Clean Lucene and Solr">
<sequential>
<subant target="clean" inheritall="false" failonerror="true">
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Thu Jun 17 02:25:11 2010
@@ -815,8 +815,8 @@
<sign-maven-artifacts artifact.id="solr-velocity" gpg.passphrase="${gpg.passphrase}"/>
<!-- Thes are special since there are no jars, just poms -->
- <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-contrib/${maven_version}/solr-lucene-contrib-${maven_version}.pom" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-contrib/${version}/solr-lucene-contrib-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
</target>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Jun 17 02:25:11 2010
@@ -118,14 +118,6 @@
<property name="maven.dist.prefix" value="${maven.dist.dir}/org/apache/solr"/>
- <!--
- The version suffix of the Lucene artifacts checked into "lib"
- IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
- -->
- <property name="lucene_version" value="${version}"/>
- <!-- The version number to assign to the Maven artifacts. -->
- <property name="maven_version" value="4.0-SNAPSHOT"/>
-
<!-- By default, "deploy" to a temporary directory (as well as installing
into your local repository). If you wish to deploy to a remote
repository, set this property to the URL of that repository. In
@@ -347,7 +339,7 @@
<sequential>
<copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
<filterset begintoken="@" endtoken="@">
- <filter token="maven_version" value="${maven_version}"/>
+ <filter token="version" value="${version}"/>
</filterset>
</copy>
<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
@@ -391,7 +383,7 @@
<macrodef name="sign-maven-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
- <attribute name="maven.version" default="${maven_version}"/>
+ <attribute name="maven.version" default="${version}"/>
<attribute name="gpg.passphrase"/>
<sequential>
<sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
@@ -404,7 +396,7 @@
<macrodef name="sign-maven-dependency-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
- <attribute name="maven.version" default="${maven_version}"/>
+ <attribute name="maven.version" default="${version}"/>
<attribute name="gpg.passphrase"/>
<sequential>
<sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
Modified: lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,25 +26,25 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-clustering</artifactId>
<name>Apache Solr Clustering</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Clustering</description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</dependency>
<!-- Carrot -->
<dependency>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler-extras</artifactId>
<name>Apache Solr DataImportHandler Extras</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr DataImportHandler Extras</description>
<packaging>jar</packaging>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler</artifactId>
<name>Apache Solr DataImportHandler</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr DataImportHandler</description>
<packaging>jar</packaging>
Modified: lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-cell</artifactId>
<name>Apache Solr Content Extraction Library</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Content Extraction Library integrates Apache Tika content extraction framework into Solr</description>
<packaging>jar</packaging>
Modified: lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-velocity</artifactId>
<name>Apache Solr Velocity Extension</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Velocity Extension adds support for integrating Solr and Velocity</description>
<packaging>jar</packaging>
Modified: lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template (original)
+++ lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
<name>Solr Specific Commons CSV</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Solr Specific Commons CSV</description>
<packaging>jar</packaging>
</project>
Modified: lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template (original)
+++ lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<name>Apache Solr Core</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Server</description>
<packaging>jar</packaging>
@@ -42,49 +42,44 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</dependency>
<!-- Lucene -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queries</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-misc</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-spellchecker</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-spatial</artifactId>
- <version>2.9.1</version>
+ <version>@version@</version>
</dependency>
<!-- Apache Commons -->
@@ -104,6 +99,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</dependency>
<!-- Stax : we could exclude this because already dependancy of solrj -->
Modified: lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template (original)
+++ lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -32,7 +32,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<name>Apache Solr Parent POM</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Parent POM</description>
<url>http://lucene.apache.org/solr</url>
<packaging>pom</packaging>
Modified: lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template (original)
+++ lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template Thu Jun 17 02:25:11 2010
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
- <version>@maven_version@</version>
+ <version>@version@</version>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<name>Apache Solr Solrj</name>
- <version>@maven_version@</version>
+ <version>@version@</version>
<description>Apache Solr Solrj</description>
<packaging>jar</packaging>
Re: svn commit: r955464 - in /lucene/dev/trunk: ./ solr/
solr/contrib/clustering/ solr/contrib/dataimporthandler/ solr/contrib/extraction/
solr/contrib/velocity/ solr/lib/ solr/src/maven/
Posted by Ryan McKinley <ry...@gmail.com>.
dooh -- sorry. I only tested on the maven side.
Thanks Erik
On Thu, Jun 17, 2010 at 8:46 AM, Erik Hatcher <er...@gmail.com> wrote:
> I fixed this with r955569. The lucene_version property was removed, but
> still used in the Solr build. I changed it to version to match this
> previous maven-related change. All seems well now on trunk.
>
> Erik
>
> On Jun 17, 2010, at 8:22 AM, Robert Muir wrote:
>
>> fyi: this patch breaks 'ant example' and other things ... in fact the
>> lucene libs now never get copied over / created at all with this patch (so
>> lots of targets break)
>>
>>
>> On Wed, Jun 16, 2010 at 10:25 PM, <ry...@apache.org> wrote:
>> Author: ryan
>> Date: Thu Jun 17 02:25:11 2010
>> New Revision: 955464
>>
>> URL: http://svn.apache.org/viewvc?rev=955464&view=rev
>> Log:
>> LUCENE-2490 -- ant generate-maven-artifacts will build lucuen and solr
>>
>> Modified:
>> lucene/dev/trunk/build.xml
>> lucene/dev/trunk/solr/build.xml
>> lucene/dev/trunk/solr/common-build.xml
>>
>> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
>>
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
>>
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
>> lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
>> lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
>> lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
>> lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
>> lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
>> lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
>>
>> Modified: lucene/dev/trunk/build.xml
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/build.xml (original)
>> +++ lucene/dev/trunk/build.xml Thu Jun 17 02:25:11 2010
>> @@ -44,6 +44,18 @@
>> </sequential>
>> </target>
>>
>> + <target name="generate-maven-artifacts" description="Generate Maven
>> Artifacts for Lucene and Solr">
>> + <sequential>
>> + <subant target="generate-maven-artifacts" inheritall="false"
>> failonerror="true">
>> + <fileset dir="lucene" includes="build.xml" />
>> + </subant>
>> +
>> + <subant target="generate-maven-artifacts" inheritall="false"
>> failonerror="true">
>> + <fileset dir="solr" includes="build.xml" />
>> + </subant>
>> + </sequential>
>> + </target>
>> +
>> <target name="clean" description="Clean Lucene and Solr">
>> <sequential>
>> <subant target="clean" inheritall="false" failonerror="true">
>>
>> Modified: lucene/dev/trunk/solr/build.xml
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/build.xml (original)
>> +++ lucene/dev/trunk/solr/build.xml Thu Jun 17 02:25:11 2010
>> @@ -815,8 +815,8 @@
>> <sign-maven-artifacts artifact.id="solr-velocity"
>> gpg.passphrase="${gpg.passphrase}"/>
>>
>> <!-- Thes are special since there are no jars, just poms -->
>> - <sign-artifact
>> input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom"
>> gpg.passphrase="${gpg.passphrase}"/>
>> - <sign-artifact
>> input.file="${maven.dist.prefix}/solr-lucene-contrib/${maven_version}/solr-lucene-contrib-${maven_version}.pom"
>> gpg.passphrase="${gpg.passphrase}"/>
>> + <sign-artifact
>> input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom"
>> gpg.passphrase="${gpg.passphrase}"/>
>> + <sign-artifact
>> input.file="${maven.dist.prefix}/solr-lucene-contrib/${version}/solr-lucene-contrib-${version}.pom"
>> gpg.passphrase="${gpg.passphrase}"/>
>>
>> </target>
>>
>>
>> Modified: lucene/dev/trunk/solr/common-build.xml
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/common-build.xml (original)
>> +++ lucene/dev/trunk/solr/common-build.xml Thu Jun 17 02:25:11 2010
>> @@ -118,14 +118,6 @@
>>
>> <property name="maven.dist.prefix"
>> value="${maven.dist.dir}/org/apache/solr"/>
>>
>> - <!--
>> - The version suffix of the Lucene artifacts checked into "lib"
>> - IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
>> - -->
>> - <property name="lucene_version" value="${version}"/>
>> - <!-- The version number to assign to the Maven artifacts. -->
>> - <property name="maven_version" value="4.0-SNAPSHOT"/>
>> -
>> <!-- By default, "deploy" to a temporary directory (as well as installing
>> into your local repository). If you wish to deploy to a remote
>> repository, set this property to the URL of that repository. In
>> @@ -347,7 +339,7 @@
>> <sequential>
>> <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
>> <filterset begintoken="@" endtoken="@">
>> - <filter token="maven_version" value="${maven_version}"/>
>> + <filter token="version" value="${version}"/>
>> </filterset>
>> </copy>
>> <artifact:install-provider artifactId="wagon-ssh"
>> version="1.0-beta-2"/>
>> @@ -391,7 +383,7 @@
>> <macrodef name="sign-maven-artifacts" description="Signs maven
>> artifacts">
>> <attribute name="artifact.id"/>
>> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
>> - <attribute name="maven.version" default="${maven_version}"/>
>> + <attribute name="maven.version" default="${version}"/>
>> <attribute name="gpg.passphrase"/>
>> <sequential>
>> <sign-artifact
>> input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar"
>> gpg.passphrase="@{gpg.passphrase}"/>
>> @@ -404,7 +396,7 @@
>> <macrodef name="sign-maven-dependency-artifacts" description="Signs maven
>> artifacts">
>> <attribute name="artifact.id"/>
>> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
>> - <attribute name="maven.version" default="${maven_version}"/>
>> + <attribute name="maven.version" default="${version}"/>
>> <attribute name="gpg.passphrase"/>
>> <sequential>
>> <sign-artifact
>> input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar"
>> gpg.passphrase="@{gpg.passphrase}"/>
>>
>> Modified:
>> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> ---
>> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
>> (original)
>> +++
>> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
>> Thu Jun 17 02:25:11 2010
>> @@ -26,25 +26,25 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-clustering</artifactId>
>> <name>Apache Solr Clustering</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Clustering</description>
>> <packaging>jar</packaging>
>> <dependencies>
>> <dependency>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-solrj</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-core</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </dependency>
>> <!-- Carrot -->
>> <dependency>
>>
>> Modified:
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> ---
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
>> (original)
>> +++
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
>> Thu Jun 17 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-dataimporthandler-extras</artifactId>
>> <name>Apache Solr DataImportHandler Extras</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr DataImportHandler Extras</description>
>> <packaging>jar</packaging>
>>
>>
>> Modified:
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> ---
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
>> (original)
>> +++
>> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
>> Thu Jun 17 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-dataimporthandler</artifactId>
>> <name>Apache Solr DataImportHandler</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr DataImportHandler</description>
>> <packaging>jar</packaging>
>>
>>
>> Modified:
>> lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
>> (original)
>> +++ lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
>> Thu Jun 17 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-cell</artifactId>
>> <name>Apache Solr Content Extraction Library</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Content Extraction Library integrates Apache
>> Tika content extraction framework into Solr</description>
>> <packaging>jar</packaging>
>>
>>
>> Modified:
>> lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
>> (original)
>> +++ lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
>> Thu Jun 17 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-velocity</artifactId>
>> <name>Apache Solr Velocity Extension</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Velocity Extension adds support for integrating
>> Solr and Velocity</description>
>> <packaging>jar</packaging>
>>
>>
>> Modified: lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template (original)
>> +++ lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template Thu Jun 17
>> 02:25:11 2010
>> @@ -24,13 +24,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>> <modelVersion>4.0.0</modelVersion>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-commons-csv</artifactId>
>> <name>Solr Specific Commons CSV</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Solr Specific Commons CSV</description>
>> <packaging>jar</packaging>
>> </project>
>>
>> Modified: lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template (original)
>> +++ lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template Thu Jun 17
>> 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-core</artifactId>
>> <name>Apache Solr Core</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Server</description>
>> <packaging>jar</packaging>
>>
>> @@ -42,49 +42,44 @@
>> <dependency>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-solrj</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </dependency>
>>
>> <!-- Lucene -->
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-analyzers</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-highlighter</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-queries</artifactId>
>> - <version>2.9.1</version>
>> - </dependency>
>> - <dependency>
>> - <groupId>org.apache.lucene</groupId>
>> - <artifactId>lucene-snowball</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-memory</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-misc</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-spellchecker</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>> <dependency>
>> <groupId>org.apache.lucene</groupId>
>> <artifactId>lucene-spatial</artifactId>
>> - <version>2.9.1</version>
>> + <version>@version@</version>
>> </dependency>
>>
>> <!-- Apache Commons -->
>> @@ -104,6 +99,11 @@
>> <version>1.4</version>
>> </dependency>
>> <dependency>
>> + <groupId>commons-codec</groupId>
>> + <artifactId>commons-codec</artifactId>
>> + <version>1.4</version>
>> + </dependency>
>> + <dependency>
>> <groupId>commons-fileupload</groupId>
>> <artifactId>commons-fileupload</artifactId>
>> <version>1.2.1</version>
>> @@ -113,7 +113,7 @@
>> <dependency>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-commons-csv</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </dependency>
>>
>> <!-- Stax : we could exclude this because already dependancy of solrj
>> -->
>>
>> Modified: lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
>> (original)
>> +++ lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template Thu Jun
>> 17 02:25:11 2010
>> @@ -32,7 +32,7 @@
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> <name>Apache Solr Parent POM</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Parent POM</description>
>> <url>http://lucene.apache.org/solr</url>
>> <packaging>pom</packaging>
>>
>> Modified: lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>>
>> ==============================================================================
>> --- lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template (original)
>> +++ lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template Thu Jun 17
>> 02:25:11 2010
>> @@ -26,13 +26,13 @@
>> <parent>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-parent</artifactId>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> </parent>
>>
>> <groupId>org.apache.solr</groupId>
>> <artifactId>solr-solrj</artifactId>
>> <name>Apache Solr Solrj</name>
>> - <version>@maven_version@</version>
>> + <version>@version@</version>
>> <description>Apache Solr Solrj</description>
>> <packaging>jar</packaging>
>>
>>
>>
>>
>>
>>
>> --
>> Robert Muir
>> rcmuir@gmail.com
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r955464 - in /lucene/dev/trunk: ./ solr/ solr/contrib/clustering/ solr/contrib/dataimporthandler/ solr/contrib/extraction/ solr/contrib/velocity/ solr/lib/ solr/src/maven/
Posted by Erik Hatcher <er...@gmail.com>.
I fixed this with r955569. The lucene_version property was removed,
but still used in the Solr build. I changed it to version to match
this previous maven-related change. All seems well now on trunk.
Erik
On Jun 17, 2010, at 8:22 AM, Robert Muir wrote:
> fyi: this patch breaks 'ant example' and other things ... in fact
> the lucene libs now never get copied over / created at all with this
> patch (so lots of targets break)
>
>
> On Wed, Jun 16, 2010 at 10:25 PM, <ry...@apache.org> wrote:
> Author: ryan
> Date: Thu Jun 17 02:25:11 2010
> New Revision: 955464
>
> URL: http://svn.apache.org/viewvc?rev=955464&view=rev
> Log:
> LUCENE-2490 -- ant generate-maven-artifacts will build lucuen and solr
>
> Modified:
> lucene/dev/trunk/build.xml
> lucene/dev/trunk/solr/build.xml
> lucene/dev/trunk/solr/common-build.xml
> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-
> pom.xml.template
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-extras-pom.xml.template
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-pom.xml.template
> lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
> lucene/dev/trunk/solr/contrib/velocity/solr-velocity-
> pom.xml.template
> lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
>
> Modified: lucene/dev/trunk/build.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/build.xml (original)
> +++ lucene/dev/trunk/build.xml Thu Jun 17 02:25:11 2010
> @@ -44,6 +44,18 @@
> </sequential>
> </target>
>
> + <target name="generate-maven-artifacts" description="Generate
> Maven Artifacts for Lucene and Solr">
> + <sequential>
> + <subant target="generate-maven-artifacts" inheritall="false"
> failonerror="true">
> + <fileset dir="lucene" includes="build.xml" />
> + </subant>
> +
> + <subant target="generate-maven-artifacts" inheritall="false"
> failonerror="true">
> + <fileset dir="solr" includes="build.xml" />
> + </subant>
> + </sequential>
> + </target>
> +
> <target name="clean" description="Clean Lucene and Solr">
> <sequential>
> <subant target="clean" inheritall="false" failonerror="true">
>
> Modified: lucene/dev/trunk/solr/build.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/build.xml (original)
> +++ lucene/dev/trunk/solr/build.xml Thu Jun 17 02:25:11 2010
> @@ -815,8 +815,8 @@
> <sign-maven-artifacts artifact.id="solr-velocity"
> gpg.passphrase="${gpg.passphrase}"/>
>
> <!-- Thes are special since there are no jars, just poms -->
> - <sign-artifact input.file="${maven.dist.prefix}/solr-parent/$
> {maven_version}/solr-parent-${maven_version}.pom" gpg.passphrase="$
> {gpg.passphrase}"/>
> - <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-
> contrib/${maven_version}/solr-lucene-contrib-${maven_version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
> + <sign-artifact input.file="${maven.dist.prefix}/solr-parent/$
> {version}/solr-parent-${version}.pom" gpg.passphrase="$
> {gpg.passphrase}"/>
> + <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-
> contrib/${version}/solr-lucene-contrib-${version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
>
> </target>
>
>
> Modified: lucene/dev/trunk/solr/common-build.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/common-build.xml (original)
> +++ lucene/dev/trunk/solr/common-build.xml Thu Jun 17 02:25:11 2010
> @@ -118,14 +118,6 @@
>
> <property name="maven.dist.prefix" value="${maven.dist.dir}/org/
> apache/solr"/>
>
> - <!--
> - The version suffix of the Lucene artifacts checked into "lib"
> - IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
> - -->
> - <property name="lucene_version" value="${version}"/>
> - <!-- The version number to assign to the Maven artifacts. -->
> - <property name="maven_version" value="4.0-SNAPSHOT"/>
> -
> <!-- By default, "deploy" to a temporary directory (as well as
> installing
> into your local repository). If you wish to deploy to a remote
> repository, set this property to the URL of that repository.
> In
> @@ -347,7 +339,7 @@
> <sequential>
> <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
> <filterset begintoken="@" endtoken="@">
> - <filter token="maven_version" value="${maven_version}"/>
> + <filter token="version" value="${version}"/>
> </filterset>
> </copy>
> <artifact:install-provider artifactId="wagon-ssh" version="1.0-
> beta-2"/>
> @@ -391,7 +383,7 @@
> <macrodef name="sign-maven-artifacts" description="Signs maven
> artifacts">
> <attribute name="artifact.id"/>
> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
> - <attribute name="maven.version" default="${maven_version}"/>
> + <attribute name="maven.version" default="${version}"/>
> <attribute name="gpg.passphrase"/>
> <sequential>
> <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/
> @{maven.version}/@{artifact.id}-@{maven.version}.jar"
> gpg.passphrase="@{gpg.passphrase}"/>
> @@ -404,7 +396,7 @@
> <macrodef name="sign-maven-dependency-artifacts"
> description="Signs maven artifacts">
> <attribute name="artifact.id"/>
> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
> - <attribute name="maven.version" default="${maven_version}"/>
> + <attribute name="maven.version" default="${version}"/>
> <attribute name="gpg.passphrase"/>
> <sequential>
> <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/
> @{maven.version}/@{artifact.id}-@{maven.version}.jar"
> gpg.passphrase="@{gpg.passphrase}"/>
>
> Modified: lucene/dev/trunk/solr/contrib/clustering/solr-clustering-
> pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/contrib/clustering/solr-clustering-
> pom.xml.template (original)
> +++ lucene/dev/trunk/solr/contrib/clustering/solr-clustering-
> pom.xml.template Thu Jun 17 02:25:11 2010
> @@ -26,25 +26,25 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-clustering</artifactId>
> <name>Apache Solr Clustering</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Clustering</description>
> <packaging>jar</packaging>
> <dependencies>
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-core</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
> <!-- Carrot -->
> <dependency>
>
> Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-extras-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-extras-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-extras-pom.xml.template Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-dataimporthandler-extras</artifactId>
> <name>Apache Solr DataImportHandler Extras</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr DataImportHandler Extras</description>
> <packaging>jar</packaging>
>
>
> Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/contrib/dataimporthandler/solr-
> dataimporthandler-pom.xml.template Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-dataimporthandler</artifactId>
> <name>Apache Solr DataImportHandler</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr DataImportHandler</description>
> <packaging>jar</packaging>
>
>
> Modified: lucene/dev/trunk/solr/contrib/extraction/solr-cell-
> pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/contrib/extraction/solr-cell-
> pom.xml.template (original)
> +++ lucene/dev/trunk/solr/contrib/extraction/solr-cell-
> pom.xml.template Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-cell</artifactId>
> <name>Apache Solr Content Extraction Library</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Content Extraction Library integrates
> Apache Tika content extraction framework into Solr</description>
> <packaging>jar</packaging>
>
>
> Modified: lucene/dev/trunk/solr/contrib/velocity/solr-velocity-
> pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/contrib/velocity/solr-velocity-
> pom.xml.template (original)
> +++ lucene/dev/trunk/solr/contrib/velocity/solr-velocity-
> pom.xml.template Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-velocity</artifactId>
> <name>Apache Solr Velocity Extension</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Velocity Extension adds support for
> integrating Solr and Velocity</description>
> <packaging>jar</packaging>
>
>
> Modified: lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template Thu
> Jun 17 02:25:11 2010
> @@ -24,13 +24,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
> <modelVersion>4.0.0</modelVersion>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-commons-csv</artifactId>
> <name>Solr Specific Commons CSV</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Solr Specific Commons CSV</description>
> <packaging>jar</packaging>
> </project>
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template Thu
> Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-core</artifactId>
> <name>Apache Solr Core</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Server</description>
> <packaging>jar</packaging>
>
> @@ -42,49 +42,44 @@
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Lucene -->
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-analyzers</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-highlighter</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-queries</artifactId>
> - <version>2.9.1</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.lucene</groupId>
> - <artifactId>lucene-snowball</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-memory</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-misc</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-spellchecker</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-spatial</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Apache Commons -->
> @@ -104,6 +99,11 @@
> <version>1.4</version>
> </dependency>
> <dependency>
> + <groupId>commons-codec</groupId>
> + <artifactId>commons-codec</artifactId>
> + <version>1.4</version>
> + </dependency>
> + <dependency>
> <groupId>commons-fileupload</groupId>
> <artifactId>commons-fileupload</artifactId>
> <version>1.2.1</version>
> @@ -113,7 +113,7 @@
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-commons-csv</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Stax : we could exclude this because already dependancy of
> solrj -->
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template Thu
> Jun 17 02:25:11 2010
> @@ -32,7 +32,7 @@
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> <name>Apache Solr Parent POM</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Parent POM</description>
> <url>http://lucene.apache.org/solr</url>
> <packaging>pom</packaging>
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template Thu
> Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> <name>Apache Solr Solrj</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Solrj</description>
> <packaging>jar</packaging>
>
>
>
>
>
>
> --
> Robert Muir
> rcmuir@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r955464 - in /lucene/dev/trunk: ./ solr/
solr/contrib/clustering/ solr/contrib/dataimporthandler/ solr/contrib/extraction/
solr/contrib/velocity/ solr/lib/ solr/src/maven/
Posted by Robert Muir <rc...@gmail.com>.
fyi: this patch breaks 'ant example' and other things ... in fact the lucene
libs now never get copied over / created at all with this patch (so lots of
targets break)
On Wed, Jun 16, 2010 at 10:25 PM, <ry...@apache.org> wrote:
> Author: ryan
> Date: Thu Jun 17 02:25:11 2010
> New Revision: 955464
>
> URL: http://svn.apache.org/viewvc?rev=955464&view=rev
> Log:
> LUCENE-2490 -- ant generate-maven-artifacts will build lucuen and solr
>
> Modified:
> lucene/dev/trunk/build.xml
> lucene/dev/trunk/solr/build.xml
> lucene/dev/trunk/solr/common-build.xml
>
> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
>
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
>
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
> lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
> lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
> lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
> lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
>
> Modified: lucene/dev/trunk/build.xml
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/build.xml (original)
> +++ lucene/dev/trunk/build.xml Thu Jun 17 02:25:11 2010
> @@ -44,6 +44,18 @@
> </sequential>
> </target>
>
> + <target name="generate-maven-artifacts" description="Generate Maven
> Artifacts for Lucene and Solr">
> + <sequential>
> + <subant target="generate-maven-artifacts" inheritall="false"
> failonerror="true">
> + <fileset dir="lucene" includes="build.xml" />
> + </subant>
> +
> + <subant target="generate-maven-artifacts" inheritall="false"
> failonerror="true">
> + <fileset dir="solr" includes="build.xml" />
> + </subant>
> + </sequential>
> + </target>
> +
> <target name="clean" description="Clean Lucene and Solr">
> <sequential>
> <subant target="clean" inheritall="false" failonerror="true">
>
> Modified: lucene/dev/trunk/solr/build.xml
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/build.xml (original)
> +++ lucene/dev/trunk/solr/build.xml Thu Jun 17 02:25:11 2010
> @@ -815,8 +815,8 @@
> <sign-maven-artifacts artifact.id="solr-velocity"
> gpg.passphrase="${gpg.passphrase}"/>
>
> <!-- Thes are special since there are no jars, just poms -->
> - <sign-artifact
> input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
> - <sign-artifact
> input.file="${maven.dist.prefix}/solr-lucene-contrib/${maven_version}/solr-lucene-contrib-${maven_version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
> + <sign-artifact
> input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
> + <sign-artifact
> input.file="${maven.dist.prefix}/solr-lucene-contrib/${version}/solr-lucene-contrib-${version}.pom"
> gpg.passphrase="${gpg.passphrase}"/>
>
> </target>
>
>
> Modified: lucene/dev/trunk/solr/common-build.xml
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/common-build.xml (original)
> +++ lucene/dev/trunk/solr/common-build.xml Thu Jun 17 02:25:11 2010
> @@ -118,14 +118,6 @@
>
> <property name="maven.dist.prefix"
> value="${maven.dist.dir}/org/apache/solr"/>
>
> - <!--
> - The version suffix of the Lucene artifacts checked into "lib"
> - IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
> - -->
> - <property name="lucene_version" value="${version}"/>
> - <!-- The version number to assign to the Maven artifacts. -->
> - <property name="maven_version" value="4.0-SNAPSHOT"/>
> -
> <!-- By default, "deploy" to a temporary directory (as well as installing
> into your local repository). If you wish to deploy to a remote
> repository, set this property to the URL of that repository. In
> @@ -347,7 +339,7 @@
> <sequential>
> <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
> <filterset begintoken="@" endtoken="@">
> - <filter token="maven_version" value="${maven_version}"/>
> + <filter token="version" value="${version}"/>
> </filterset>
> </copy>
> <artifact:install-provider artifactId="wagon-ssh"
> version="1.0-beta-2"/>
> @@ -391,7 +383,7 @@
> <macrodef name="sign-maven-artifacts" description="Signs maven
> artifacts">
> <attribute name="artifact.id"/>
> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
> - <attribute name="maven.version" default="${maven_version}"/>
> + <attribute name="maven.version" default="${version}"/>
> <attribute name="gpg.passphrase"/>
> <sequential>
> <sign-artifact input.file="@{prefix.dir}/@{artifact.id
> }/@{maven.version}/@{artifact.id}-@{maven.version}.jar"
> gpg.passphrase="@{gpg.passphrase}"/>
> @@ -404,7 +396,7 @@
> <macrodef name="sign-maven-dependency-artifacts" description="Signs maven
> artifacts">
> <attribute name="artifact.id"/>
> <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
> - <attribute name="maven.version" default="${maven_version}"/>
> + <attribute name="maven.version" default="${version}"/>
> <attribute name="gpg.passphrase"/>
> <sequential>
> <sign-artifact input.file="@{prefix.dir}/@{artifact.id
> }/@{maven.version}/@{artifact.id}-@{maven.version}.jar"
> gpg.passphrase="@{gpg.passphrase}"/>
>
> Modified:
> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> ---
> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
> (original)
> +++
> lucene/dev/trunk/solr/contrib/clustering/solr-clustering-pom.xml.template
> Thu Jun 17 02:25:11 2010
> @@ -26,25 +26,25 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-clustering</artifactId>
> <name>Apache Solr Clustering</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Clustering</description>
> <packaging>jar</packaging>
> <dependencies>
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-core</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
> <!-- Carrot -->
> <dependency>
>
> Modified:
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> ---
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
> (original)
> +++
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
> Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-dataimporthandler-extras</artifactId>
> <name>Apache Solr DataImportHandler Extras</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr DataImportHandler Extras</description>
> <packaging>jar</packaging>
>
>
> Modified:
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> ---
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
> (original)
> +++
> lucene/dev/trunk/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
> Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-dataimporthandler</artifactId>
> <name>Apache Solr DataImportHandler</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr DataImportHandler</description>
> <packaging>jar</packaging>
>
>
> Modified:
> lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/contrib/extraction/solr-cell-pom.xml.template Thu
> Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-cell</artifactId>
> <name>Apache Solr Content Extraction Library</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Content Extraction Library integrates Apache
> Tika content extraction framework into Solr</description>
> <packaging>jar</packaging>
>
>
> Modified:
> lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
> (original)
> +++ lucene/dev/trunk/solr/contrib/velocity/solr-velocity-pom.xml.template
> Thu Jun 17 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-velocity</artifactId>
> <name>Apache Solr Velocity Extension</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Velocity Extension adds support for integrating
> Solr and Velocity</description>
> <packaging>jar</packaging>
>
>
> Modified: lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/lib/solr-commons-csv-pom.xml.template Thu Jun 17
> 02:25:11 2010
> @@ -24,13 +24,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
> <modelVersion>4.0.0</modelVersion>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-commons-csv</artifactId>
> <name>Solr Specific Commons CSV</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Solr Specific Commons CSV</description>
> <packaging>jar</packaging>
> </project>
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template Thu Jun 17
> 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-core</artifactId>
> <name>Apache Solr Core</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Server</description>
> <packaging>jar</packaging>
>
> @@ -42,49 +42,44 @@
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Lucene -->
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-analyzers</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-highlighter</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-queries</artifactId>
> - <version>2.9.1</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.lucene</groupId>
> - <artifactId>lucene-snowball</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-memory</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-misc</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-spellchecker</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
> <dependency>
> <groupId>org.apache.lucene</groupId>
> <artifactId>lucene-spatial</artifactId>
> - <version>2.9.1</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Apache Commons -->
> @@ -104,6 +99,11 @@
> <version>1.4</version>
> </dependency>
> <dependency>
> + <groupId>commons-codec</groupId>
> + <artifactId>commons-codec</artifactId>
> + <version>1.4</version>
> + </dependency>
> + <dependency>
> <groupId>commons-fileupload</groupId>
> <artifactId>commons-fileupload</artifactId>
> <version>1.2.1</version>
> @@ -113,7 +113,7 @@
> <dependency>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-commons-csv</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </dependency>
>
> <!-- Stax : we could exclude this because already dependancy of solrj
> -->
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-parent-pom.xml.template Thu Jun 17
> 02:25:11 2010
> @@ -32,7 +32,7 @@
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> <name>Apache Solr Parent POM</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Parent POM</description>
> <url>http://lucene.apache.org/solr</url>
> <packaging>pom</packaging>
>
> Modified: lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template?rev=955464&r1=955463&r2=955464&view=diff
>
> ==============================================================================
> --- lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template (original)
> +++ lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template Thu Jun 17
> 02:25:11 2010
> @@ -26,13 +26,13 @@
> <parent>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-parent</artifactId>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> </parent>
>
> <groupId>org.apache.solr</groupId>
> <artifactId>solr-solrj</artifactId>
> <name>Apache Solr Solrj</name>
> - <version>@maven_version@</version>
> + <version>@version@</version>
> <description>Apache Solr Solrj</description>
> <packaging>jar</packaging>
>
>
>
>
--
Robert Muir
rcmuir@gmail.com