adekzs commented on code in PR #55:
URL: https://github.com/apache/maven-verifier/pull/55#discussion_r985251218
##########
src/main/java/org/apache/maven/shared/verifier/Verifier.java:
##########
@@ -115,87 +115,195 @@
private static MavenLauncher embeddedLauncher;
+ private String settingsFile;
+
+ private boolean debug;
+
public Verifier( String basedir )
throws VerificationException
{
- this( basedir, null );
+ this.basedir = basedir;
+
+ this.forkMode = System.getProperty( "verifier.forkMode" );
+
+ findLocalRepo( settingsFile );
+
+ this.mavenHome = System.getProperty( "maven.home" );
+
+ useWrapper = Files.exists( Paths.get( getBasedir(), "mvnw" ) );
+
+ this.defaultCliArguments = DEFAULT_CLI_ARGUMENTS.clone();
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, boolean debug )
throws VerificationException
{
- this( basedir, null, debug );
+ this( basedir );
+ setDebug( debug );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * use {@link #setSettingsFile(String settingsFile)} to set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile )
throws VerificationException
{
- this( basedir, settingsFile, false );
+ this( basedir );
+ setSettingsFile( settingsFile );
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * and {@link #setSettingsFile(String settingsFile)} to set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug )
throws VerificationException
{
- this( basedir, settingsFile, debug, DEFAULT_CLI_ARGUMENTS );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ * {@link #setSettingsFile(String settingsFile)} to set settings file
+ * and {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set default cliArguments
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, defaultCliArguments );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setMavenHome( null );
+ setDefaultCliArguments( defaultCliArguments );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String)},
+ * {@link #setSettingsFile(String)} to set settings file
+ * and {@link #setForkJvm(Boolean)} to set forkJvm status
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
boolean forkJvm )
throws VerificationException
{
- this( basedir, settingsFile, debug, forkJvm, DEFAULT_CLI_ARGUMENTS );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setForkJvm( forkJvm );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ *{@link #setSettingsFile(String settingsFile)} to set settings file,
+ *{@link #setForkJvm(Boolean)} to set forkJvm status and
+ * use {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
boolean forkJvm, String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, forkJvm, defaultCliArguments, null
);
+ this( basedir );
+ setSettingsFile( basedir );
+ setDebug( debug );
+ setForkJvm( forkJvm );
+ setDefaultCliArguments( defaultCliArguments );
+ setMavenHome( null );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ * {@link #setSettingsFile(String settingsFile)} to set settings file
+ * and {@link #setMavenHome(String mavenHome)} to set maven home
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String mavenHome )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, DEFAULT_CLI_ARGUMENTS,
mavenHome );
+ this( basedir );
+ setForkJvm( null );
+ setDebug( debug );
+ setSettingsFile( settingsFile );
+ setMavenHome( mavenHome );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * use {@link #setSettingsFile(String settingsFile)} to set settings file
+ * use {@link #setMavenHome(String mavenHome)} to set maven home
+ * use {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String mavenHome,
String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, defaultCliArguments,
mavenHome );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setForkJvm( null );
+ setDefaultCliArguments( defaultCliArguments );
+ setMavenHome( mavenHome );
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * use {@link #setSettingsFile(String settingsFile)} to set settings file
+ * use {@link #setForkJvm(Boolean)} to set forkJvm status
+ * use {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set CLI Arguments
+ * use {@link #setMavenHome(String mavenHome)} to set maven home
+ *
+ * */
+ @Deprecated
private Verifier( String basedir, String settingsFile, boolean debug,
Boolean forkJvm, String[] defaultCliArguments,
String mavenHome ) throws VerificationException
{
Review Comment:
It is no longer in use, I will remove this.
##########
src/main/java/org/apache/maven/shared/verifier/Verifier.java:
##########
@@ -115,87 +115,195 @@
private static MavenLauncher embeddedLauncher;
+ private String settingsFile;
+
+ private boolean debug;
+
public Verifier( String basedir )
throws VerificationException
{
- this( basedir, null );
+ this.basedir = basedir;
+
+ this.forkMode = System.getProperty( "verifier.forkMode" );
+
+ findLocalRepo( settingsFile );
+
+ this.mavenHome = System.getProperty( "maven.home" );
+
+ useWrapper = Files.exists( Paths.get( getBasedir(), "mvnw" ) );
+
+ this.defaultCliArguments = DEFAULT_CLI_ARGUMENTS.clone();
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, boolean debug )
throws VerificationException
{
- this( basedir, null, debug );
+ this( basedir );
+ setDebug( debug );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * use {@link #setSettingsFile(String settingsFile)} to set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile )
throws VerificationException
{
- this( basedir, settingsFile, false );
+ this( basedir );
+ setSettingsFile( settingsFile );
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * and {@link #setSettingsFile(String settingsFile)} to set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug )
throws VerificationException
{
- this( basedir, settingsFile, debug, DEFAULT_CLI_ARGUMENTS );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ * {@link #setSettingsFile(String settingsFile)} to set settings file
+ * and {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set default cliArguments
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, defaultCliArguments );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setMavenHome( null );
+ setDefaultCliArguments( defaultCliArguments );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String)},
+ * {@link #setSettingsFile(String)} to set settings file
+ * and {@link #setForkJvm(Boolean)} to set forkJvm status
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
boolean forkJvm )
throws VerificationException
{
- this( basedir, settingsFile, debug, forkJvm, DEFAULT_CLI_ARGUMENTS );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setForkJvm( forkJvm );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ *{@link #setSettingsFile(String settingsFile)} to set settings file,
+ *{@link #setForkJvm(Boolean)} to set forkJvm status and
+ * use {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
boolean forkJvm, String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, forkJvm, defaultCliArguments, null
);
+ this( basedir );
+ setSettingsFile( basedir );
+ setDebug( debug );
+ setForkJvm( forkJvm );
+ setDefaultCliArguments( defaultCliArguments );
+ setMavenHome( null );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)},
+ * {@link #setSettingsFile(String settingsFile)} to set settings file
+ * and {@link #setMavenHome(String mavenHome)} to set maven home
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String mavenHome )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, DEFAULT_CLI_ARGUMENTS,
mavenHome );
+ this( basedir );
+ setForkJvm( null );
+ setDebug( debug );
+ setSettingsFile( settingsFile );
+ setMavenHome( mavenHome );
}
+ /**
+ *
+ * @deprecated to be removed
+ * use {@link #Verifier(String basedir)}
+ * use {@link #setSettingsFile(String settingsFile)} to set settings file
+ * use {@link #setMavenHome(String mavenHome)} to set maven home
+ * use {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set settings file
+ *
+ * */
+ @Deprecated
public Verifier( String basedir, String settingsFile, boolean debug,
String mavenHome,
String[] defaultCliArguments )
throws VerificationException
{
- this( basedir, settingsFile, debug, null, defaultCliArguments,
mavenHome );
+ this( basedir );
+ setSettingsFile( settingsFile );
+ setDebug( debug );
+ setForkJvm( null );
Review Comment:
setting null for ForkJvm is also unnecessary, I will remove this as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
