You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/03/28 16:34:28 UTC
[maven-javadoc-plugin] branch master updated: Fix typo in
additionalDependencies documentation
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 28ec24a Fix typo in additionalDependencies documentation
new fa6d5b1 Fix typo in additionalDependencies documentation
28ec24a is described below
commit 28ec24abcf788cd493368a53b001b903676a2bc4
Author: Benedikt Ritter <br...@apache.org>
AuthorDate: Thu Mar 28 17:31:31 2019 +0100
Fix typo in additionalDependencies documentation
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 86 +++++++++++-----------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index bf5884a..10fcbcb 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -1689,7 +1689,7 @@ public abstract class AbstractJavadocMojo
* <additionalDependency>
* <groupId>geronimo-spec</groupId>
* <artifactId>geronimo-spec-jta</artifactId>
- * <version>1.0.1B-rc4:</version>
+ * <version>1.0.1B-rc4</version>
* </additionalDependency>
* </additionalDependencies>
* </pre>
@@ -3647,67 +3647,67 @@ public abstract class AbstractJavadocMojo
*/
private void addProxyArg( Commandline cmd )
{
- if ( settings == null || settings.getProxies().isEmpty() )
+ if ( settings == null || settings.getProxies().isEmpty() )
{
return;
}
- Map<String, Proxy> activeProxies = new HashMap<>();
+ Map<String, Proxy> activeProxies = new HashMap<>();
- for ( Proxy proxy : settings.getProxies() )
+ for ( Proxy proxy : settings.getProxies() )
{
- if ( proxy.isActive() )
- {
- String protocol = proxy.getProtocol();
+ if ( proxy.isActive() )
+ {
+ String protocol = proxy.getProtocol();
- if ( !activeProxies.containsKey( protocol ) )
+ if ( !activeProxies.containsKey( protocol ) )
{
- activeProxies.put( protocol, proxy );
- }
- }
+ activeProxies.put( protocol, proxy );
+ }
+ }
}
- if ( activeProxies.containsKey( "https" ) )
- {
- Proxy httpsProxy = activeProxies.get( "https" );
- if ( StringUtils.isNotEmpty( httpsProxy.getHost() ) )
+ if ( activeProxies.containsKey( "https" ) )
+ {
+ Proxy httpsProxy = activeProxies.get( "https" );
+ if ( StringUtils.isNotEmpty( httpsProxy.getHost() ) )
{
- cmd.createArg().setValue( "-J-Dhttps.proxyHost=" + httpsProxy.getHost() );
- cmd.createArg().setValue( "-J-Dhttps.proxyPort=" + httpsProxy.getPort() );
-
- if ( StringUtils.isNotEmpty( httpsProxy.getNonProxyHosts() )
- && ( !activeProxies.containsKey( "http" )
- || StringUtils.isEmpty( activeProxies.get( "http" ).getNonProxyHosts() ) ) )
- {
- cmd.createArg().setValue( "-J-Dhttp.nonProxyHosts=\""
- + httpsProxy.getNonProxyHosts().replace( "|", "^|" ) + "\"" );
- }
+ cmd.createArg().setValue( "-J-Dhttps.proxyHost=" + httpsProxy.getHost() );
+ cmd.createArg().setValue( "-J-Dhttps.proxyPort=" + httpsProxy.getPort() );
+
+ if ( StringUtils.isNotEmpty( httpsProxy.getNonProxyHosts() )
+ && ( !activeProxies.containsKey( "http" )
+ || StringUtils.isEmpty( activeProxies.get( "http" ).getNonProxyHosts() ) ) )
+ {
+ cmd.createArg().setValue( "-J-Dhttp.nonProxyHosts=\""
+ + httpsProxy.getNonProxyHosts().replace( "|", "^|" ) + "\"" );
+ }
}
- }
-
- if ( activeProxies.containsKey( "http" ) )
- {
- Proxy httpProxy = activeProxies.get( "http" );
- if ( StringUtils.isNotEmpty( httpProxy.getHost() ) )
- {
- cmd.createArg().setValue( "-J-Dhttp.proxyHost=" + httpProxy.getHost() );
- cmd.createArg().setValue( "-J-Dhttp.proxyPort=" + httpProxy.getPort() );
+ }
+
+ if ( activeProxies.containsKey( "http" ) )
+ {
+ Proxy httpProxy = activeProxies.get( "http" );
+ if ( StringUtils.isNotEmpty( httpProxy.getHost() ) )
+ {
+ cmd.createArg().setValue( "-J-Dhttp.proxyHost=" + httpProxy.getHost() );
+ cmd.createArg().setValue( "-J-Dhttp.proxyPort=" + httpProxy.getPort() );
- if ( !activeProxies.containsKey( "https" ) )
+ if ( !activeProxies.containsKey( "https" ) )
{
- cmd.createArg().setValue( "-J-Dhttps.proxyHost=" + httpProxy.getHost() );
- cmd.createArg().setValue( "-J-Dhttps.proxyPort=" + httpProxy.getPort() );
- }
+ cmd.createArg().setValue( "-J-Dhttps.proxyHost=" + httpProxy.getHost() );
+ cmd.createArg().setValue( "-J-Dhttps.proxyPort=" + httpProxy.getPort() );
+ }
- if ( StringUtils.isNotEmpty( httpProxy.getNonProxyHosts() ) )
+ if ( StringUtils.isNotEmpty( httpProxy.getNonProxyHosts() ) )
{
- cmd.createArg().setValue( "-J-Dhttp.nonProxyHosts=\""
- + httpProxy.getNonProxyHosts().replace( "|", "^|" ) + "\"" );
+ cmd.createArg().setValue( "-J-Dhttp.nonProxyHosts=\""
+ + httpProxy.getNonProxyHosts().replace( "|", "^|" ) + "\"" );
}
}
}
-
- // We bravely ignore FTP because no one (probably) uses FTP for Javadoc
+
+ // We bravely ignore FTP because no one (probably) uses FTP for Javadoc
}
/**