diff --git a/dependency-check-ant/src/site/markdown/configuration.md b/dependency-check-ant/src/site/markdown/configuration.md index bb7997a0b..d09ea5334 100644 --- a/dependency-check-ant/src/site/markdown/configuration.md +++ b/dependency-check-ant/src/site/markdown/configuration.md @@ -32,7 +32,7 @@ failBuildOnCVSS | Specifies if the build should be failed if a CVSS score a format | The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this within the Site plugin unless the externalReport is set to true. | HTML logFile | The file path to write verbose logging information. |   suppressionFile | The file path to the XML suppression file \- used to suppress [false positives](../suppression.html) |   -proxyUrl | The Proxy URL. |   +proxyServer | The Proxy Server. |   proxyPort | The Proxy Port. |   proxyUsername | Defines the proxy user name. |   proxyPassword | Defines the proxy password. |   diff --git a/dependency-check-cli/src/site/markdown/arguments.md b/dependency-check-cli/src/site/markdown/arguments.md index 544cf4b46..fb7455502 100644 --- a/dependency-check-cli/src/site/markdown/arguments.md +++ b/dependency-check-cli/src/site/markdown/arguments.md @@ -3,7 +3,7 @@ Command Line Arguments The following table lists the command line arguments: -Short | Argument Name | Parameter | Description | Requirement +Short | Argument Name   | Parameter | Description | Requirement -------|-----------------------|-----------------|-------------|------------ \-a | \-\-app | \ | The name of the application being scanned. This is a required argument. | Required \-s | \-\-scan | \ | The path to scan \- this option can be specified multiple times. It is also possible to specify specific file types that should be scanned by supplying a scan path of '[path]/[to]/[scan]/*.zip'. The wild card can only be used to denote any file-name with a specific extension. | Required @@ -18,7 +18,7 @@ Short | Argument Name | Parameter | Description | Requirement Advanced Options ================ -Short | Argument Name | Parameter | Description | Default Value +Short | Argument Name        | Parameter | Description | Default Value -------|-----------------------|-----------------|-------------|--------------- | \-\-disableArchive | | Sets whether the Archive Analyzer will be used. | false | \-\-zipExtensions | \ | A comma-separated list of additional file extensions to be treated like a ZIP file, the contents will be extracted and analyzed. |   @@ -30,7 +30,7 @@ Short | Argument Name | Parameter | Description | Default Value | \-\-disableNuspec | | Sets whether or not the .NET Nuget Nuspec Analyzer will be used. | false | \-\-disableAssembly | | Sets whether or not the .NET Assembly Analyzer should be used. | false | \-\-pathToMono | \ | The path to Mono for .NET Assembly analysis on non-windows systems. |   - | \-\-proxyurl | \ | The proxy url to use when downloading resources. |   + | \-\-proxyserver | \ | The proxy server to use when downloading resources. |   | \-\-proxyport | \ | The proxy port to use when downloading resources. |   | \-\-connectiontimeout | \ | The connection timeout (in milliseconds) to use when downloading resources. |   | \-\-proxypass | \ | The proxy password to use when downloading resources. |   diff --git a/dependency-check-maven/src/site/markdown/configuration.md b/dependency-check-maven/src/site/markdown/configuration.md index 322c74ebf..672d4c774 100644 --- a/dependency-check-maven/src/site/markdown/configuration.md +++ b/dependency-check-maven/src/site/markdown/configuration.md @@ -55,17 +55,6 @@ databaseUser | The username used when connecting to the database. databasePassword | The password used when connecting to the database. |   -Deprecated Configuration +Proxy Configuration ==================== -The following properties have been deprecated. These can still be set in -the dependency-check-maven plugin's configuration. However, future versions -will remove these properties. Instead using these properties you should -use [Maven's settings](https://maven.apache.org/settings.html#Proxies) to -configure a proxy. - -Property | Description | Default Value ----------------------|------------------------------------|------------------ -proxyUrl | The Proxy URL. |   -proxyPort | The Proxy Port. |   -proxyUsername | Defines the proxy user name. |   -proxyPassword | Defines the proxy password. |   +Use [Maven's settings](https://maven.apache.org/settings.html#Proxies) to configure a proxy server.