Le 29/01/2012 14:15, sebb a ecrit :
> On 28 January 2012 17:09, <[email protected]> wrote:
>
>> Author: milamber
>> Date: Sat Jan 28 17:09:46 2012
>> New Revision: 1237097
>>
>> URL: http://svn.apache.org/viewvc?rev=1237097&view=rev
>> Log:
>> Prepare next version 2.6
>>
>> 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=1237097&r1=1237096&r2=1237097&view=diff
>> ==============================================================================
>> --- jmeter/trunk/build.xml (original)
>> +++ jmeter/trunk/build.xml Sat Jan 28 17:09:46 2012
>> @@ -475,7 +475,7 @@
>> JMeter version
>> This is overridden for formal releases.
>> -->
>> - <property name="jmeter.version" value="2.6-SNAPSHOT"/>
>> + <property name="jmeter.version" value="2.6.${DSTAMP}"/>
>>
> Why did you change this back?
>
I thought is needed, but it's seems no needed to run ant distribution
-Djmeter.version=2.6 (without -SNAPSHOT suffix)
I will change this immediately.
Milamber
> Was it causing a problem having SNAPSHOT in the version?
>
> It's important for Maven to distinguish SNAPSHOT releases from normal
> releases by using the SNAPSHOT suffix.
> If necessary to include the date, we could add -SNAPSHOT on the end,
> but that's rather long.
>
>
>> <!-- 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=1237097&r1=1237096&r2=1237097&view=diff
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
>> (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Sat Jan
>> 28 17:09:46 2012
>> @@ -49,7 +49,7 @@ public 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.6-SNAPSHOT";
>> + private static final String VERSION = "2.6";
>>
>> private static final String IMPLEMENTATION;
>>
>>
>>
>>
>
