You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jmeter.apache.org by sebb <se...@gmail.com> on 2013/12/31 16:58:47 UTC
Re: svn commit: r1554518 - in /jmeter/trunk: build.xml src/core/org/apache/jmeter/util/JMeterVersion.java
On 31 December 2013 14:27, <mi...@apache.org> wrote:
> Author: milamber
> Date: Tue Dec 31 14:27:33 2013
> New Revision: 1554518
>
> URL: http://svn.apache.org/r1554518
> Log:
> Update version number and add -SNAPSHOT suffix (prepare next release)
>
> Modified:
> jmeter/trunk/build.xml
> jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>
> Modified: jmeter/trunk/build.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1554518&r1=1554517&r2=1554518&view=diff
> ==============================================================================
> --- jmeter/trunk/build.xml (original)
> +++ jmeter/trunk/build.xml Tue Dec 31 14:27:33 2013
> @@ -503,7 +503,7 @@
> JMeter version
> This is overridden for formal releases.
> -->
> - <property name="jmeter.version" value="2.10-SNAPSHOT"/>
> + <property name="jmeter.version" value="2.11-SNAPSHOT"/>
Not sure this is supposed to be done yet.
I thought the version was supposed to be bumped once the release has been made.
> <!-- Remember to change "docversion" below if necessary -->
> <condition property="implementation.version"
> value="${jmeter.version} r${svn.revision}" else="${jmeter.version}.${DSTAMP}">
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1554518&r1=1554517&r2=1554518&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Tue Dec 31 14:27:33 2013
> @@ -49,7 +49,7 @@ public final class JMeterVersion {
> * This ensures that JMeterUtils always gets the correct
> * version, even if JMeterUtils is not re-compiled during the build.
> */
> - private static final String VERSION = "2.10";
> + private static final String VERSION = "2.11-SNAPSHOT";
That looks wrong.
The version in the previous tag did not have the -SNAPSHOT suffix.
> private static final String IMPLEMENTATION;
>
>
>
Re: svn commit: r1554518 - in /jmeter/trunk: build.xml src/core/org/apache/jmeter/util/JMeterVersion.java
Posted by sebb <se...@gmail.com>.
On 31 December 2013 16:15, Milamber <mi...@apache.org> wrote:
>
> Le 31/12/2013 16:58, sebb a ecrit :
>
>> On 31 December 2013 14:27, <mi...@apache.org> wrote:
>>>
>>> Author: milamber
>>> Date: Tue Dec 31 14:27:33 2013
>>> New Revision: 1554518
>>>
>>> URL: http://svn.apache.org/r1554518
>>> Log:
>>> Update version number and add -SNAPSHOT suffix (prepare next release)
>>>
>>> Modified:
>>> jmeter/trunk/build.xml
>>> jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>>>
>>> Modified: jmeter/trunk/build.xml
>>> URL:
>>> http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1554518&r1=1554517&r2=1554518&view=diff
>>>
>>> ==============================================================================
>>> --- jmeter/trunk/build.xml (original)
>>> +++ jmeter/trunk/build.xml Tue Dec 31 14:27:33 2013
>>> @@ -503,7 +503,7 @@
>>> JMeter version
>>> This is overridden for formal releases.
>>> -->
>>> - <property name="jmeter.version" value="2.10-SNAPSHOT"/>
>>> + <property name="jmeter.version" value="2.11-SNAPSHOT"/>
>>
>> Not sure this is supposed to be done yet.
>>
>> I thought the version was supposed to be bumped once the release has been
>> made.
>
>
> Yes; it's not the good timing to do this.
> 2.11-SNAPSHOT (or 2.10.1-SNAPSHOT) are usually set just after the release.
> This has not been done, because (I guess) we were focused on creating a
> bugfix version 2.10.1.
Agreed.
We need to update to 2.12-SNAPSHOT once 2.11 is out.
> Unfortunately, I forgot to remove the suffix in the release process for RC1!
>
>
>
>>
>>> <!-- Remember to change "docversion" below if necessary -->
>>> <condition property="implementation.version"
>>> value="${jmeter.version} r${svn.revision}"
>>> else="${jmeter.version}.${DSTAMP}">
>>>
>>> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>>> URL:
>>> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1554518&r1=1554517&r2=1554518&view=diff
>>>
>>> ==============================================================================
>>> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>>> (original)
>>> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Tue
>>> Dec 31 14:27:33 2013
>>> @@ -49,7 +49,7 @@ public final class JMeterVersion {
>>> * This ensures that JMeterUtils always gets the correct
>>> * version, even if JMeterUtils is not re-compiled during the
>>> build.
>>> */
>>> - private static final String VERSION = "2.10";
>>> + private static final String VERSION = "2.11-SNAPSHOT";
>>
>> That looks wrong.
>> The version in the previous tag did not have the -SNAPSHOT suffix.
>
>
> Yes, you are right. Fixed with the release process.
>
>
>
>>
>>> private static final String IMPLEMENTATION;
>>>
>>>
>>>
>
Re: svn commit: r1554518 - in /jmeter/trunk: build.xml src/core/org/apache/jmeter/util/JMeterVersion.java
Posted by Milamber <mi...@apache.org>.
Le 31/12/2013 16:58, sebb a ecrit :
> On 31 December 2013 14:27, <mi...@apache.org> wrote:
>> Author: milamber
>> Date: Tue Dec 31 14:27:33 2013
>> New Revision: 1554518
>>
>> URL: http://svn.apache.org/r1554518
>> Log:
>> Update version number and add -SNAPSHOT suffix (prepare next release)
>>
>> Modified:
>> jmeter/trunk/build.xml
>> jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>>
>> Modified: jmeter/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1554518&r1=1554517&r2=1554518&view=diff
>> ==============================================================================
>> --- jmeter/trunk/build.xml (original)
>> +++ jmeter/trunk/build.xml Tue Dec 31 14:27:33 2013
>> @@ -503,7 +503,7 @@
>> JMeter version
>> This is overridden for formal releases.
>> -->
>> - <property name="jmeter.version" value="2.10-SNAPSHOT"/>
>> + <property name="jmeter.version" value="2.11-SNAPSHOT"/>
> Not sure this is supposed to be done yet.
>
> I thought the version was supposed to be bumped once the release has been made.
Yes; it's not the good timing to do this.
2.11-SNAPSHOT (or 2.10.1-SNAPSHOT) are usually set just after the
release. This has not been done, because (I guess) we were focused on
creating a bugfix version 2.10.1.
Unfortunately, I forgot to remove the suffix in the release process for RC1!
>
>> <!-- Remember to change "docversion" below if necessary -->
>> <condition property="implementation.version"
>> value="${jmeter.version} r${svn.revision}" else="${jmeter.version}.${DSTAMP}">
>>
>> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1554518&r1=1554517&r2=1554518&view=diff
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Tue Dec 31 14:27:33 2013
>> @@ -49,7 +49,7 @@ public final class JMeterVersion {
>> * This ensures that JMeterUtils always gets the correct
>> * version, even if JMeterUtils is not re-compiled during the build.
>> */
>> - private static final String VERSION = "2.10";
>> + private static final String VERSION = "2.11-SNAPSHOT";
> That looks wrong.
> The version in the previous tag did not have the -SNAPSHOT suffix.
Yes, you are right. Fixed with the release process.
>
>> private static final String IMPLEMENTATION;
>>
>>
>>