rpm/maven-javadoc-plugin
SHA256
1
0
Fork 0
forked from pool/maven-javadoc-plugin
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-javadoc-plugin?expand=0&rev=31

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-14 06:41:51 +00:00 committed by Git OBS Bridge
parent bc2da8a107
commit fa9c932465
1 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
stale-data-encoding.patch
View File

@ -1,53 +1,24 @@
--- maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java 2022-02-07 20:52:42.000000000 +0100
+++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java 2022-03-14 07:21:32.537764730 +0100
@@ -5969,7 +5969,7 @@
if ( !isUpToDate( cmd ) )
{
doExecuteJavadocCommandLine( cmd, javadocOutputDirectory );
- StaleHelper.writeStaleData( cmd, staleDataPath.toPath() );
+ StaleHelper.writeStaleData( cmd, staleDataPath.toPath(), Charset.forName(getEncoding()) );
}
}
else
--- maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2022-02-07 20:52:42.000000000 +0100 --- maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2022-02-07 20:52:42.000000000 +0100
+++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2022-03-14 07:19:21.228985255 +0100 +++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2022-03-14 07:39:23.168128611 +0100
@@ -134,16 +134,17 @@ @@ -141,9 +141,20 @@
*
* @param cmd the command line
* @param path the stale data path
+ * @param encoding the encoding of source files
* @throws MavenReportException if an error occurs
*/
- public static void writeStaleData( Commandline cmd, Path path )
+ public static void writeStaleData( Commandline cmd, Path path, Charset charset )
throws MavenReportException
{ {
try try
{ {
+ final Charset cs;
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
+ && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
+ {
+ cs = StandardCharsets.UTF_8;
+ }
+ else
+ {
+ cs = Charset.defaultCharset();
+ }
+
String curdata = getStaleData( cmd ); String curdata = getStaleData( cmd );
Files.createDirectories( path.getParent() ); Files.createDirectories( path.getParent() );
- Files.write( path, Collections.singleton( curdata ), Charset.defaultCharset() ); - Files.write( path, Collections.singleton( curdata ), Charset.defaultCharset() );
+ Files.write( path, Collections.singleton( curdata ), charset ); + Files.write( path, Collections.singleton( curdata ), cs);
} }
catch ( IOException e ) catch ( IOException e )
{ {
@@ -151,6 +152,19 @@
}
}
+ /**
+ * Write the data used to detect a stale javadoc
+ *
+ * @param cmd the command line
+ * @param path the stale data path
+ * @throws MavenReportException if an error occurs
+ */
+ public static void writeStaleData( Commandline cmd, Path path )
+ throws MavenReportException
+ {
+ writeStaleData( cmd, path, Charset.defaultCharset());
+ }
+
private static Collection<Path> walk( Path dir )
{
Collection<Path> paths = new ArrayList<>();