diff --git a/maven-javadoc-plugin.changes b/maven-javadoc-plugin.changes index a5ea91f..e6c411c 100644 --- a/maven-javadoc-plugin.changes +++ b/maven-javadoc-plugin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 14 06:23:46 UTC 2022 - Fridrich Strba + +- Added patch: + * stale-data-encoding.patch + + use the same encoding when writing and getting the stale data + + fixes build with utf-8 sources on non utf-8 platforms + ------------------------------------------------------------------- Fri Mar 11 07:05:23 UTC 2022 - Fridrich Strba diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index 22b2512..228077e 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -32,6 +32,7 @@ URL: http://maven.apache.org/plugins/maven-javadoc-plugin Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip Source1: %{base_name}-build.xml Patch0: %{base_name}-bootstrap-resources.patch +Patch1: stale-data-encoding.patch BuildRequires: apache-commons-cli BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 @@ -120,6 +121,7 @@ API documentation for %{name}. cp %{SOURCE1} build.xml %patch0 -p1 %endif +%patch1 -p1 %pom_xpath_remove pom:project/pom:parent/pom:relativePath %pom_remove_dep :::test: diff --git a/stale-data-encoding.patch b/stale-data-encoding.patch new file mode 100644 index 0000000..dcdbf50 --- /dev/null +++ b/stale-data-encoding.patch @@ -0,0 +1,53 @@ +--- 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:46:55.466835949 +0100 +@@ -43,6 +43,19 @@ + public class StaleHelper + { + ++ private static Charset getDataCharset() ++ { ++ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" ) ++ && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) ) ++ { ++ return StandardCharsets.UTF_8; ++ } ++ else ++ { ++ 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 ); + Files.createDirectories( path.getParent() ); +- Files.write( path, Collections.singleton( curdata ), Charset.defaultCharset() ); ++ Files.write( path, Collections.singleton( curdata ), cs); + } + catch ( IOException e ) + {