You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by gs...@apache.org on 2009/10/27 00:03:37 UTC

svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Author: gsingers
Date: Mon Oct 26 23:03:37 2009
New Revision: 830013

URL: http://svn.apache.org/viewvc?rev=830013&view=rev
Log:
specversion, Lucene maven version

Modified:
    lucene/solr/branches/branch-1.4/common-build.xml
    lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template

Modified: lucene/solr/branches/branch-1.4/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/common-build.xml?rev=830013&r1=830012&r2=830013&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/common-build.xml (original)
+++ lucene/solr/branches/branch-1.4/common-build.xml Mon Oct 26 23:03:37 2009
@@ -72,7 +72,7 @@
        By default, this should be set to "X.Y.M.${dateversion}"
        where X.Y.M is the last version released (on this branch).
     -->
-  <property name="specversion" value="1.4.0" />
+  <property name="specversion" value="1.4.0.${dateversion}" />
 
   
     <!-- Type of checksum to compute for distribution files -->

Modified: lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template?rev=830013&r1=830012&r2=830013&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template (original)
+++ lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template Mon Oct 26 23:03:37 2009
@@ -49,37 +49,37 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-highlighter</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queries</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-snowball</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-memory</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-misc</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-spellchecker</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
     </dependency>
 
     <!-- Apache Commons -->



Re: svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Posted by Yonik Seeley <yo...@lucidimagination.com>.
-Yonik
http://www.lucidimagination.com



On Mon, Oct 26, 2009 at 8:46 PM, Grant Ingersoll <gs...@apache.org> wrote:
>
> On Oct 26, 2009, at 8:40 PM, Yonik Seeley wrote:
>
>> On Mon, Oct 26, 2009 at 8:14 PM, Grant Ingersoll <gs...@apache.org>
>> wrote:
>>>
>>> Not following...
>>
>> I just updated the default version to 1.4.1-dev on the branch.
>> I really don't know what maven_version should be set to... I guess we
>> can leave it at 1.4.0 for now.
>
> Yeah, that is fine.  I still don't get your 2.9.1-dev comment.  Was that in
> relation to the Maven stuff or the common-build.xml stuff?

Sorry, I meant 1.4.1-dev... mixing up with the lucene release ;-)

Index: common-build.xml
===================================================================
--- common-build.xml    (revision 830034)
+++ common-build.xml    (working copy)
@@ -62,7 +62,7 @@
        By default, this should be set to "X.Y.N-dev" where X.Y.N is
        "1 greater" then the last version released (on this branch).
     -->
-  <property name="version" value="1.4.0" />
+  <property name="version" value="1.4.1-dev" />

   <!-- Solr Specification Version -->
   <!--


> FWIW, I think we are fine with the Maven stuff.

cool.

-Yonik
http://www.lucidimagination.com

Re: svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Posted by Grant Ingersoll <gs...@apache.org>.
On Oct 26, 2009, at 8:40 PM, Yonik Seeley wrote:

> On Mon, Oct 26, 2009 at 8:14 PM, Grant Ingersoll  
> <gs...@apache.org> wrote:
>> Not following...
>
> I just updated the default version to 1.4.1-dev on the branch.
> I really don't know what maven_version should be set to... I guess we
> can leave it at 1.4.0 for now.

Yeah, that is fine.  I still don't get your 2.9.1-dev comment.  Was  
that in relation to the Maven stuff or the common-build.xml stuff?

FWIW, I think we are fine with the Maven stuff.

>
>>  This gets a little tricky w/ the Maven stuff b/c we want
>> it to point to the value that is actually released, which will be  
>> 2.9.1 in
>> the pom.  So, it won't work until Lucene is actually published,
>> unfortunately.
>
> We're not actually releasing before Lucene though... what doesn't  
> work?
> "ant package" seems to work fine...

I was referring to the Maven stuff that refers to the Lucene 2.9.1  
POM.  Thus, if someone were try to resolve the POMs now, it would  
fail, but they will pass by the time Solr is actually released, thus I  
am not worried, but someone might run into a problem in the meantime  
w/ it.

Re: svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Posted by Yonik Seeley <yo...@lucidimagination.com>.
On Mon, Oct 26, 2009 at 8:14 PM, Grant Ingersoll <gs...@apache.org> wrote:
> Not following...

I just updated the default version to 1.4.1-dev on the branch.
I really don't know what maven_version should be set to... I guess we
can leave it at 1.4.0 for now.

> This gets a little tricky w/ the Maven stuff b/c we want
> it to point to the value that is actually released, which will be 2.9.1 in
> the pom.  So, it won't work until Lucene is actually published,
> unfortunately.

We're not actually releasing before Lucene though... what doesn't work?
"ant package" seems to work fine...

> I don't know any other way around this except waiting until 2.9.1 is
> official, but people don't seem interested in that.

AC is next week - that would likely end up delaying things a further 2 weeks.
Maven is not an official requirement  - we can push it out separately
when it's ready.

-Yonik
http://www.lucidimagination.com

> On Oct 26, 2009, at 7:55 PM, Yonik Seeley wrote:
>
>> "version" needs to be 2.9.1-dev.
>> No idea what "maven_version" should be set to.
>>
>> -Yonik
>> http://www.lucidimagination.com
>>
>>
>>
>> On Mon, Oct 26, 2009 at 7:03 PM,  <gs...@apache.org> wrote:
>>>
>>> Author: gsingers
>>> Date: Mon Oct 26 23:03:37 2009
>>> New Revision: 830013
>>>
>>> URL: http://svn.apache.org/viewvc?rev=830013&view=rev
>>> Log:
>>> specversion, Lucene maven version
>>>
>>> Modified:
>>>   lucene/solr/branches/branch-1.4/common-build.xml
>>>   lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
>>>
>>> Modified: lucene/solr/branches/branch-1.4/common-build.xml
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/common-build.xml?rev=830013&r1=830012&r2=830013&view=diff
>>>
>>> ==============================================================================
>>> --- lucene/solr/branches/branch-1.4/common-build.xml (original)
>>> +++ lucene/solr/branches/branch-1.4/common-build.xml Mon Oct 26 23:03:37
>>> 2009
>>> @@ -72,7 +72,7 @@
>>>       By default, this should be set to "X.Y.M.${dateversion}"
>>>       where X.Y.M is the last version released (on this branch).
>>>    -->
>>> -  <property name="specversion" value="1.4.0" />
>>> +  <property name="specversion" value="1.4.0.${dateversion}" />
>>>
>>>
>>>    <!-- Type of checksum to compute for distribution files -->
>>>
>>> Modified:
>>> lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template?rev=830013&r1=830012&r2=830013&view=diff
>>>
>>> ==============================================================================
>>> --- lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
>>> (original)
>>> +++ lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
>>> Mon Oct 26 23:03:37 2009
>>> @@ -49,37 +49,37 @@
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-analyzers</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-highlighter</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-queries</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-snowball</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-memory</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-misc</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.lucene</groupId>
>>>      <artifactId>lucene-spellchecker</artifactId>
>>> -      <version>2.9.0</version>
>>> +      <version>2.9.1</version>
>>>    </dependency>
>>>
>>>    <!-- Apache Commons -->
>>>
>>>
>>>
>
>
>

Re: svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Posted by Grant Ingersoll <gs...@apache.org>.
Not following...  This gets a little tricky w/ the Maven stuff b/c we  
want it to point to the value that is actually released, which will be  
2.9.1 in the pom.  So, it won't work until Lucene is actually  
published, unfortunately.

I don't know any other way around this except waiting until 2.9.1 is  
official, but people don't seem interested in that.


On Oct 26, 2009, at 7:55 PM, Yonik Seeley wrote:

> "version" needs to be 2.9.1-dev.
> No idea what "maven_version" should be set to.
>
> -Yonik
> http://www.lucidimagination.com
>
>
>
> On Mon, Oct 26, 2009 at 7:03 PM,  <gs...@apache.org> wrote:
>> Author: gsingers
>> Date: Mon Oct 26 23:03:37 2009
>> New Revision: 830013
>>
>> URL: http://svn.apache.org/viewvc?rev=830013&view=rev
>> Log:
>> specversion, Lucene maven version
>>
>> Modified:
>>    lucene/solr/branches/branch-1.4/common-build.xml
>>    lucene/solr/branches/branch-1.4/src/maven/solr-core- 
>> pom.xml.template
>>
>> Modified: lucene/solr/branches/branch-1.4/common-build.xml
>> URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/common-build.xml?rev=830013&r1=830012&r2=830013&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- lucene/solr/branches/branch-1.4/common-build.xml (original)
>> +++ lucene/solr/branches/branch-1.4/common-build.xml Mon Oct 26  
>> 23:03:37 2009
>> @@ -72,7 +72,7 @@
>>        By default, this should be set to "X.Y.M.${dateversion}"
>>        where X.Y.M is the last version released (on this branch).
>>     -->
>> -  <property name="specversion" value="1.4.0" />
>> +  <property name="specversion" value="1.4.0.${dateversion}" />
>>
>>
>>     <!-- Type of checksum to compute for distribution files -->
>>
>> Modified: lucene/solr/branches/branch-1.4/src/maven/solr-core- 
>> pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template?rev=830013&r1=830012&r2=830013&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- lucene/solr/branches/branch-1.4/src/maven/solr-core- 
>> pom.xml.template (original)
>> +++ lucene/solr/branches/branch-1.4/src/maven/solr-core- 
>> pom.xml.template Mon Oct 26 23:03:37 2009
>> @@ -49,37 +49,37 @@
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-analyzers</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-highlighter</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-queries</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-snowball</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-memory</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-misc</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>     <dependency>
>>       <groupId>org.apache.lucene</groupId>
>>       <artifactId>lucene-spellchecker</artifactId>
>> -      <version>2.9.0</version>
>> +      <version>2.9.1</version>
>>     </dependency>
>>
>>     <!-- Apache Commons -->
>>
>>
>>



Re: svn commit: r830013 - in /lucene/solr/branches/branch-1.4: common-build.xml src/maven/solr-core-pom.xml.template

Posted by Yonik Seeley <ys...@gmail.com>.
"version" needs to be 2.9.1-dev.
No idea what "maven_version" should be set to.

-Yonik
http://www.lucidimagination.com



On Mon, Oct 26, 2009 at 7:03 PM,  <gs...@apache.org> wrote:
> Author: gsingers
> Date: Mon Oct 26 23:03:37 2009
> New Revision: 830013
>
> URL: http://svn.apache.org/viewvc?rev=830013&view=rev
> Log:
> specversion, Lucene maven version
>
> Modified:
>    lucene/solr/branches/branch-1.4/common-build.xml
>    lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
>
> Modified: lucene/solr/branches/branch-1.4/common-build.xml
> URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/common-build.xml?rev=830013&r1=830012&r2=830013&view=diff
> ==============================================================================
> --- lucene/solr/branches/branch-1.4/common-build.xml (original)
> +++ lucene/solr/branches/branch-1.4/common-build.xml Mon Oct 26 23:03:37 2009
> @@ -72,7 +72,7 @@
>        By default, this should be set to "X.Y.M.${dateversion}"
>        where X.Y.M is the last version released (on this branch).
>     -->
> -  <property name="specversion" value="1.4.0" />
> +  <property name="specversion" value="1.4.0.${dateversion}" />
>
>
>     <!-- Type of checksum to compute for distribution files -->
>
> Modified: lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template?rev=830013&r1=830012&r2=830013&view=diff
> ==============================================================================
> --- lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template (original)
> +++ lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template Mon Oct 26 23:03:37 2009
> @@ -49,37 +49,37 @@
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-analyzers</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-highlighter</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-queries</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-snowball</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-memory</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-misc</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.lucene</groupId>
>       <artifactId>lucene-spellchecker</artifactId>
> -      <version>2.9.0</version>
> +      <version>2.9.1</version>
>     </dependency>
>
>     <!-- Apache Commons -->
>
>
>