Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-javadoc-plugin for
openSUSE:Factory checked in at 2022-03-14 19:35:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-javadoc-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-javadoc-plugin"
Mon Mar 14 19:35:47 2022 rev:8 rq:961693 version:3.3.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-javadoc-plugin/maven-javadoc-plugin.changes
2022-03-11 21:41:38.098087586 +0100
+++
/work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.25692/maven-javadoc-plugin.changes
2022-03-14 19:37:52.626184706 +0100
@@ -1,0 +2,8 @@
+Mon Mar 14 06:23:46 UTC 2022 - Fridrich Strba <[email protected]>
+
+- 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
+
+-------------------------------------------------------------------
New:
----
stale-data-encoding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-javadoc-plugin.spec ++++++
--- /var/tmp/diff_new_pack.BSjKXC/_old 2022-03-14 19:37:53.126185306 +0100
+++ /var/tmp/diff_new_pack.BSjKXC/_new 2022-03-14 19:37:53.134185315 +0100
@@ -32,6 +32,7 @@
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 @@
cp %{SOURCE1} build.xml
%patch0 -p1
%endif
+%patch1 -p1
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%pom_remove_dep :::test:
++++++ stale-data-encoding.patch ++++++
---
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 )
{
