You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/08/14 21:00:38 UTC
svn commit: r1373029 -
/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
Author: rfscholte
Date: Tue Aug 14 19:00:37 2012
New Revision: 1373029
URL: http://svn.apache.org/viewvc?rev=1373029&view=rev
Log:
Fix IT for MRELEASE-156
Modified:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy?rev=1373029&r1=1373028&r2=1373029&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy Tue Aug 14 19:00:37 2012
@@ -20,4 +20,12 @@
File releaseProperties = new File( basedir, 'release.properties' )
assert releaseProperties.exists()
-assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234" + File.separator )
\ No newline at end of file
+
+if ( System.properties[ 'os.name' ].toLowerCase().contains( 'windows' ) )
+{
+ assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234\\r\\n" )
+}
+else
+{
+ assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234\\n" )
+}
\ No newline at end of file
Re: svn commit: r1373029 - /maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
Posted by Robert Scholte <rf...@apache.org>.
Yes indeed.
It's just one way or another
Op Mon, 20 Aug 2012 02:12:38 +0200 schreef Brett Porter <br...@apache.org>:
> Maybe what was meant originally was System.properties['line.separator'] ?
>
> On 15/08/2012, at 5:00 AM, rfscholte@apache.org wrote:
>
>> Author: rfscholte
>> Date: Tue Aug 14 19:00:37 2012
>> New Revision: 1373029
>>
>> URL: http://svn.apache.org/viewvc?rev=1373029&view=rev
>> Log:
>> Fix IT for MRELEASE-156
>>
>> Modified:
>> maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
>>
>> Modified:
>> maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy?rev=1373029&r1=1373028&r2=1373029&view=diff
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
>> (original)
>> +++
>> maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
>> Tue Aug 14 19:00:37 2012
>> @@ -20,4 +20,12 @@
>>
>> File releaseProperties = new File( basedir, 'release.properties' )
>> assert releaseProperties.exists()
>> -assert 1 == releaseProperties.getText().count(
>> "scm.commentPrefix=ABCD-1234" + File.separator )
>> \ No newline at end of file
>> +
>> +if ( System.properties[ 'os.name' ].toLowerCase().contains( 'windows'
>> ) )
>> +{
>> + assert 1 == releaseProperties.getText().count(
>> "scm.commentPrefix=ABCD-1234\\r\\n" )
>> +}
>> +else
>> +{
>> + assert 1 == releaseProperties.getText().count(
>> "scm.commentPrefix=ABCD-1234\\n" )
>> +}
>> \ No newline at end of file
>>
>>
>
> --
> Brett Porter
> brett@apache.org
> http://brettporter.wordpress.com/
> http://au.linkedin.com/in/brettporter
> http://twitter.com/brettporter
>
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1373029 - /maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
Posted by Brett Porter <br...@apache.org>.
Maybe what was meant originally was System.properties['line.separator'] ?
On 15/08/2012, at 5:00 AM, rfscholte@apache.org wrote:
> Author: rfscholte
> Date: Tue Aug 14 19:00:37 2012
> New Revision: 1373029
>
> URL: http://svn.apache.org/viewvc?rev=1373029&view=rev
> Log:
> Fix IT for MRELEASE-156
>
> Modified:
> maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
>
> Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy
> URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy?rev=1373029&r1=1373028&r2=1373029&view=diff
> ==============================================================================
> --- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy (original)
> +++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-156/verify.groovy Tue Aug 14 19:00:37 2012
> @@ -20,4 +20,12 @@
>
> File releaseProperties = new File( basedir, 'release.properties' )
> assert releaseProperties.exists()
> -assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234" + File.separator )
> \ No newline at end of file
> +
> +if ( System.properties[ 'os.name' ].toLowerCase().contains( 'windows' ) )
> +{
> + assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234\\r\\n" )
> +}
> +else
> +{
> + assert 1 == releaseProperties.getText().count( "scm.commentPrefix=ABCD-1234\\n" )
> +}
> \ No newline at end of file
>
>
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
http://twitter.com/brettporter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org