Author: vsiveton
Date: Thu May 29 11:01:32 2008
New Revision: 661423
URL: http://svn.apache.org/viewvc?rev=661423&view=rev
Log:
MJAVADOC-193: Bump plexus-utils to 1.5.1
o fixed test due to PLXUTILS-64
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=661423&r1=661422&r2=661423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Thu May 29 11:01:32 2008
@@ -192,7 +192,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.9</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=661423&r1=661422&r2=661423&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
Thu May 29 11:01:32 2008
@@ -890,9 +890,9 @@
assertTrue( readed.indexOf( "-J-Dhttp.proxySet=true" ) != -1 );
assertTrue( readed.indexOf( "-J-Dhttp.proxyHost=http://localhost" ) !=
-1 );
assertTrue( readed.indexOf( "-J-Dhttp.proxyPort=80" ) != -1 );
- assertTrue( readed.indexOf( "-J-Dhttp.proxyUser=\"toto\"" ) != -1 );
- assertTrue( readed.indexOf( "-J-Dhttp.proxyPassword=\"toto\"" ) != -1
);
- assertTrue( readed.indexOf(
"-J-Dhttp.nonProxyHosts=\"www.google.com|*.somewhere.com\"" ) != -1 );
+ assertTrue( readed.indexOf( "-J-Dhttp.proxyUser=\\\"toto\\\"" ) != -1
);
+ assertTrue( readed.indexOf( "-J-Dhttp.proxyPassword=\\\"toto\\\"" ) !=
-1 );
+ assertTrue( readed.indexOf(
"-J-Dhttp.nonProxyHosts=\\\"www.google.com|*.somewhere.com\\\"" ) != -1 );
}
/**