pool/maven-surefire
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-surefire?expand=0&rev=21

Browse Source
This commit is contained in:
Fridrich Strba 2022-04-26 13:45:16 +00:00 committed by Git OBS Bridge
parent b0a3e2c274
commit 1cf773976a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0004-Port-to-current-maven-shared-utils.patch
View File

@ -1,14 +1,6 @@
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java 2022-04-26 11:44:38.061316377 +0200 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java 2022-04-26 11:44:38.061316377 +0200
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java 2022-04-26 11:50:27.427430853 +0200 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java 2022-04-26 11:50:27.427430853 +0200
@@ -22,6 +22,7 @@ @@ -130,14 +130,24 @@
import org.apache.maven.plugin.surefire.JdkAttributes;
import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
+import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.surefire.booter.AbstractPathConfiguration;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.StartupConfiguration;
@@ -130,14 +131,26 @@
String jvmArgLine = newJvmArgLine( forkNumber ); String jvmArgLine = newJvmArgLine( forkNumber );
if ( !jvmArgLine.isEmpty() ) if ( !jvmArgLine.isEmpty() )
{ {
@ -18,9 +10,8 @@
+ { + {
+ cli.createArg().setLine( jvmArgLine ); + cli.createArg().setLine( jvmArgLine );
+ } + }
+ catch ( CommandLineException e ) + finally
+ { + {
+ throw new SurefireBooterForkException( "Problem to set jvmArgLine: " + e.getMessage(), e );
+ } + }
} }
@ -32,9 +23,8 @@
+ { + {
+ cli.createArg().setLine( getDebugLine() ); + cli.createArg().setLine( getDebugLine() );
+ } + }
+ catch ( CommandLineException e ) + finally
+ { + {
+ throw new SurefireBooterForkException( "Problem to set debug line: " + e.getMessage(), e );
+ } + }
} }