Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

javadoc: improve description of systemPropertyVariables #759

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,11 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
@Parameter(property = "failsafe.enableProcessChecker")
private String enableProcessChecker;

/**
* Properties file being used as system properties passed to the provider.
*
* @see AbstractSurefireMojo#systemPropertyVariables {@code systemPropertyVariables} for how the effective provider properties are calculated
michael-o marked this conversation as resolved.
Show resolved Hide resolved
*/
@Parameter(property = "failsafe.systemPropertiesFile")
private File systemPropertiesFile;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,16 +314,27 @@ public abstract class AbstractSurefireMojo extends AbstractMojo implements Suref
/**
* List of System properties to pass to a provider.
*
* @deprecated Use systemPropertyVariables instead.
* @deprecated Use {@link #systemPropertyVariables} instead.
* @see #systemPropertyVariables {@code systemPropertyVariables} for how the effective provider properties are calculated
michael-o marked this conversation as resolved.
Show resolved Hide resolved
*/
@Deprecated
@Parameter
private Properties systemProperties;

/**
* List of System properties to pass to a provider.
* The effective system properties given to a provider are contributed from several sources:
* <ol>
* <li>{@link #systemProperties}</li>
* <li>{@link AbstractSurefireMojo#getSystemPropertiesFile()} (set via parameter {@code systemPropertiesFile} on some goals)</li>
* <li>{@link #systemPropertyVariables}</li>
* <li>User properties from {@link MavenSession#getUserProperties()}, usually set via CLI options given with {@code -D}</li>
* </ol>
* Later sources may overwrite same named properties from earlier sources, that means for example that one cannot overwrite user properties with either
* {@link #systemProperties}, {@link AbstractSurefireMojo#getSystemPropertiesFile()} or {@link #systemPropertyVariables}.
*
* @since 2.5
* @see #systemProperties
*/
@Parameter
private Map<String, String> systemPropertyVariables;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,11 @@ public class SurefirePlugin extends AbstractSurefireMojo implements SurefireRepo
@Parameter(property = "surefire.enableProcessChecker")
private String enableProcessChecker;

/**
* Properties file being used as system properties passed to the provider.
*
* @see AbstractSurefireMojo#systemPropertyVariables {@code systemPropertyVariables} for how the effective provider properties are calculated
michael-o marked this conversation as resolved.
Show resolved Hide resolved
*/
@Parameter(property = "surefire.systemPropertiesFile")
private File systemPropertiesFile;

Expand Down