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 2021/08/13 09:55:10 UTC
[maven-javadoc-plugin] branch stabilize updated: Fix argument
escaping per OS
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/stabilize by this push:
new add0b90 Fix argument escaping per OS
add0b90 is described below
commit add0b90f62513bf466901e3162e865fb12af32f6
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Aug 13 11:54:59 2021 +0200
Fix argument escaping per OS
---
.../org/apache/maven/plugins/javadoc/JavadocReportTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 0bcf9f1..7e81ce8 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -989,8 +989,15 @@ public class JavadocReportTest
Path commandLine = new File( getBasedir(), "target/test/unit/proxy-test/target/site/apidocs/javadoc." + ( SystemUtils.IS_OS_WINDOWS ? "bat" : "sh" ) ).toPath();
assertThat( commandLine ).exists();
String readed = readFile( commandLine );
- assertThat( readed ).contains( "-J-Dhttp.proxyHost=127.0.0.1" ).contains( "-J-Dhttp.proxyPort=80" )
- .contains( "-J-Dhttp.nonProxyHosts=\"www.google.com^|*.somewhere.com\"" );
+ assertThat( readed ).contains( "-J-Dhttp.proxyHost=127.0.0.1" ).contains( "-J-Dhttp.proxyPort=80" );
+ if ( SystemUtils.IS_OS_WINDOWS )
+ {
+ assertThat( readed ).contains( "-J-Dhttp.nonProxyHosts=\"www.google.com^|*.somewhere.com\"" );
+ }
+ else
+ {
+ assertThat( readed ).contains( "\"-J-Dhttp.nonProxyHosts=www.google.com^|*.somewhere.com\"" );
+ }
Path options = new File( getBasedir(), "target/test/unit/proxy-test/target/site/apidocs/options" ).toPath();
assertThat( options ).exists();