You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/07/28 10:49:57 UTC
svn commit: r680290 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206:
encoding/pom.xml encoding/src/main/java/Test.java pom.xml verify.bsh
Author: bentmann
Date: Mon Jul 28 01:49:55 2008
New Revision: 680290
URL: http://svn.apache.org/viewvc?rev=680290&view=rev
Log:
o Restored original test design (source file encoding is independent from output encoding and shouldn't have any effects)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java (contents, props changed)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/verify.bsh
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/pom.xml?rev=680290&r1=680289&r2=680290&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/pom.xml Mon Jul 28 01:49:55 2008
@@ -32,6 +32,5 @@
<properties>
<project.reporting.outputEncoding>UTF-16</project.reporting.outputEncoding>
- <project.build.sourceEncoding>UTF-16</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java?rev=680290&r1=680289&r2=680290&view=diff
==============================================================================
Files maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java (original) and maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java Mon Jul 28 01:49:55 2008 differ
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/encoding/src/main/java/Test.java
('mime-type' removed)
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml?rev=680290&r1=680289&r2=680290&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml Mon Jul 28 01:49:55 2008
@@ -39,13 +39,6 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/verify.bsh?rev=680290&r1=680289&r2=680290&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/verify.bsh (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/verify.bsh Mon Jul 28 01:49:55 2008
@@ -29,7 +29,7 @@
File source = new File( basedir, module + "/src/main/java/Test.java" );
File javadoc = new File( basedir, module + "/target/site/apidocs/Test.html" );
- String java = IOUtil.toString( new FileInputStream( source ), encoding );
+ String java = IOUtil.toString( new FileInputStream( source ), "UTF-8" );
String html = IOUtil.toString( new FileInputStream( javadoc ), encoding );
if ( html.indexOf( "text/html; charset=" + encoding ) < 0 )