Author: rfscholte
Date: Fri Dec 19 14:04:25 2014
New Revision: 1646725
URL: http://svn.apache.org/r1646725
Log:
Verify OS version instead of Java version.
When specifying invoker.javaHome, the Java version of the Maven runtime can be
different then the script runtime (which still uses the original runtime aka
JAVA_HOME). So use OS, which should be stable.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt?rev=1646725&r1=1646724&r2=1646725&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
Fri Dec 19 14:04:25 2014
@@ -1 +1 @@
-Java Version: ${java.version}
\ No newline at end of file
+OS Version: ${os.version}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/verify.bsh?rev=1646725&r1=1646724&r2=1646725&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop/verify.bsh
Fri Dec 19 14:04:25 2014
@@ -21,14 +21,15 @@ import java.io.*;
try
{
- String javaVersion = System.getProperty( "java.version" );
+ String osVersion = System.getProperty( "os.version" );
File a = new File( basedir, "target/parent-1.0-bin/a/filtered.txt");
BufferedReader r = new BufferedReader(new FileReader(a));
String line = r.readLine();
- if ( ! line.endsWith( javaVersion ) )
+ if ( ! line.endsWith( osVersion ) )
{
- System.out.println( "Expected java version: " + javaVersion + "\nLine was:
" + line );
+ System.out.println( "Expected OS version: " + osVersion );
+ System.out.println( "Line was: " + line );
return false;
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt?rev=1646725&r1=1646724&r2=1646725&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
Fri Dec 19 14:04:25 2014
@@ -1 +1 @@
-Java Version: ${java.version}
\ No newline at end of file
+OS Version: ${os.version}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh?rev=1646725&r1=1646724&r2=1646725&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
Fri Dec 19 14:04:25 2014
@@ -21,14 +21,15 @@ import java.io.*;
try
{
- String javaVersion = System.getProperty( "java.version" );
+ String osVersion = System.getProperty( "os.version" );
File a = new File( basedir, "target/parent-1.0-bin/child/a/filtered.txt");
BufferedReader r = new BufferedReader(new FileReader(a));
String line = r.readLine();
- if ( ! line.endsWith( javaVersion ) )
+ if ( ! line.endsWith( osVersion ) )
{
- System.out.println( "Expected java version: " + javaVersion + "\nLine was:
" + line );
+ System.out.println( "Expected OS version: " + osVersion );
+ System.out.println( "Line was: " + line );
return false;
}
}
