Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-filtering4 for
openSUSE:Factory checked in at 2025-11-09 21:09:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-filtering4 (Old)
and /work/SRC/openSUSE:Factory/.maven-filtering4.new.1980 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-filtering4"
Sun Nov 9 21:09:30 2025 rev:3 rq:1316612 version:4.0.0~20250928.git84993b0
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-filtering4/maven-filtering4.changes
2025-11-06 18:18:00.575631209 +0100
+++
/work/SRC/openSUSE:Factory/.maven-filtering4.new.1980/maven-filtering4.changes
2025-11-09 21:10:49.274470981 +0100
@@ -1,0 +2,9 @@
+Sat Nov 8 14:28:18 UTC 2025 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * 0001-Be-gracious-with-binary-files-among-the-resources-to.patch
+ + do not fail if among the resources to filter is a binary and
+ thus failing to be parsed as text with the given encoding. In
+ that case, just copy the file.
+
+-------------------------------------------------------------------
New:
----
0001-Be-gracious-with-binary-files-among-the-resources-to.patch
----------(New B)----------
New:- Added patch:
* 0001-Be-gracious-with-binary-files-among-the-resources-to.patch
+ do not fail if among the resources to filter is a binary and
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-filtering4.spec ++++++
--- /var/tmp/diff_new_pack.BnALIH/_old 2025-11-09 21:10:52.430602973 +0100
+++ /var/tmp/diff_new_pack.BnALIH/_new 2025-11-09 21:10:52.430602973 +0100
@@ -29,6 +29,7 @@
Source0: %{base_name}-%{version}.tar.xz
Source1: %{name}-build.xml
Patch0: %{name}-java8compat.patch
+Patch1: 0001-Be-gracious-with-binary-files-among-the-resources-to.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 17
@@ -59,6 +60,7 @@
%setup -q -n %{base_name}-%{version}
cp %{SOURCE1} build.xml
%patch -P 0 -p1
+%patch -P 1 -p1
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
++++++ 0001-Be-gracious-with-binary-files-among-the-resources-to.patch ++++++
>From 00d7f8b520d134dcc7158601db6717258aa7ed67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]>
Date: Sat, 8 Nov 2025 15:33:35 +0100
Subject: [PATCH] Be gracious with binary files among the resources to filter
---
.../org/apache/maven/shared/filtering/FilteringUtils.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
index aa12a5e..a96da55 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.nio.charset.MalformedInputException;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
@@ -317,6 +318,9 @@ public final class FilteringUtils {
writer.write(buffer, 0, nRead);
}
}
+ } catch (MalformedInputException e) {
+ // Most likely a binary; just copy it then
+ copyFile(from, to, encoding, null, overwrite);
}
}
--
2.51.1
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.BnALIH/_old 2025-11-09 21:10:52.506606152 +0100
+++ /var/tmp/diff_new_pack.BnALIH/_new 2025-11-09 21:10:52.510606319 +0100
@@ -1,6 +1,6 @@
-mtime: 1762413112
-commit: de5d96298bf5a3b13f306e02078cad979ca5d6809f77b2c2a7a94106a73492fa
+mtime: 1762618555
+commit: b0e78686eab01596fdd97864e6bf4a75d2ea83dbeabb68c5c6df8ec42905ac7b
url: https://src.opensuse.org/java-packages/maven-filtering4.git
-revision: de5d96298bf5a3b13f306e02078cad979ca5d6809f77b2c2a7a94106a73492fa
+revision: b0e78686eab01596fdd97864e6bf4a75d2ea83dbeabb68c5c6df8ec42905ac7b
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2025-11-08 17:16:23.000000000 +0100
@@ -0,0 +1,4 @@
+*.obscpio
+*.osc
+_build.*
+.pbuild
