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=32

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

43
stale-data-encoding.patch
View File

@ -1,19 +1,48 @@
--- 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:39:23.168128611 +0100 +++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2022-03-14 07:46:55.466835949 +0100
@@ -141,9 +141,20 @@ @@ -43,6 +43,19 @@
public class StaleHelper
{ {
try
{ + private static Charset getDataCharset()
+ final Charset cs; + {
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" ) + if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
+ && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) ) + && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
+ { + {
+ cs = StandardCharsets.UTF_8; + return StandardCharsets.UTF_8;
+ } + }
+ else + else
+ { + {
+ cs = Charset.defaultCharset(); + return Charset.defaultCharset();
+ } + }
+ }
+
/**
* Compute the data used to detect a stale javadoc
*
@@ -61,16 +74,7 @@
String[] args = cmd.getArguments();
Collections.addAll( options, args );
- final Charset cs;
- if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
- && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
- {
- cs = StandardCharsets.UTF_8;
- }
- else
- {
- cs = Charset.defaultCharset();
- }
+ final Charset cs = getDataCharset();
for ( String arg : args )
{
@@ -141,9 +145,11 @@
{
try
{
+ final Charset cs = getDataCharset();
+ +
String curdata = getStaleData( cmd ); String curdata = getStaleData( cmd );
Files.createDirectories( path.getParent() ); Files.createDirectories( path.getParent() );