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 2026-11-05 18:20:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-filtering4 (Old) and /work/SRC/openSUSE:Factory/.maven-filtering4.new.3759290 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-filtering4" Thu Nov 5 18:20:15 2026 rev:5 rq:1395041 version:4.0.0~beta2 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-filtering4/maven-filtering4.changes 2026-07-15 16:54:09.351985514 +0200 +++ /work/SRC/openSUSE:Factory/.maven-filtering4.new.3759290/maven-filtering4.changes 2026-11-05 18:21:43.324222141 +0100 @@ -1,0 +2,87 @@ +Wed Nov 4 19:23:08 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to version 4.0.0-beta-2 + * New features and improvements + + feat: support glob patterns in filter file paths + + MRESOURCES-162: Add failOnMissingFilterValue option to fail + build on unresolved filter tokens + + Add per-resource encoding support (MRESOURCES-281) + + feat: introduce ChangeDetection strategy for file copy + + Add nonFilteredFiles glob exclusions and opt-in + gracefulBinaryHandling + + Warn when empty filter file entries are skipped + + Reuse bounded reader during interpolation + + MSHARED-1412: Allow to customize Interpolator used by filter + * Bug Fixes + + MRESOURCES-254: resolve compound ${} references in property + values with custom delimiters + + Expand default non-filtered file extensions to include common + binary formats + + fix: handle symlinks in source and destination for copyFile + (MSHARED-1004) + + fix: restore first resource entry wins for overlapping + declarations + + fix: initialize Resource includes/excludes to empty lists + + fix: remove sensitive property values from debug log output + + Handle relative Windows paths when escaping + + Improve malformed input error details + + fix: handle missing property values + + Fix resource copy log for project base directory + + fix: normalize Windows drive paths + + Recalculate delimiter reader mark length + + Issue 289: filter file names one component at a time + + fix: copy missing fields in MavenResourcesExecution.copyOf() + + Fix setEscapeString(null) to clear escape state + + Add missing EOF checks in + MultiDelimiterInterpolatorFilterReaderLineEnding.read() + * Documentation updates + + Modernise the download page + * Maintenance + + remove pointless code + + Add Apache prefix to ATR project name + + Keep SLF4J on 1.7.x and Mockito on 4.x in Dependabot + + Unused code + + Restore the document metadata dropped when the pages were + ported + + Port the site documentation from APT to Markdown + + Build against Maven 4.0.0-rc-6 + + Set up for ATR + + Cleanup tests + + feat: enable prevent branch protection rules + + Enable Github Issues + + MSHARED-1474: Upgrade to Maven 4.0.0-rc-2 + + Use Release Drafter from shared and improvements + + Add PR Automation + + Update CI to use 4.0.0-beta-4. Added JDK 23 + * Dependency updates + + build(deps-dev): bump mockitoVersion from 5.23.0 to 5.24.0 + + Bump mavenVersion from 4.0.0-rc-2 to 4.0.0-rc-7 + + Bump org.apache.maven.shared:maven-shared-components from 43 + to 50 + + Keep SLF4J on 1.7.x and Mockito on 4.x in Dependabot + + Drop Hamcrest from tests + + Bump org.codehaus.plexus:plexus-interpolation from 1.27 to + 1.30.0 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /release-drafter.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /maven-verify.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /stale.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /pr-automation.yml from 4 to 5 + + Bump org.codehaus.plexus:plexus-utils from 3.0.24 to 4.0.3 in + /src/test/resources + + Bump mockitoVersion from 5.12.0 to 5.23.0 + + Update to 47 and site to 2.0.0 + + Bump org.apache.maven.plugin-testing + :maven-plugin-testing-harness from 4.0.0-beta-2-SNAPSHOT to + 4.0.0-beta-4 + + MSHARED-1455: Upgrade to Maven 4.0.0-rc-1 + + Bump org.hamcrest:hamcrest from 2.2 to 3.0 +- Modified patches: + * 0001-Be-gracious-with-binary-files-among-the-resources-to.patch + * maven-filtering4-java8compat.patch + + rebase + +------------------------------------------------------------------- Old: ---- maven-filtering-4.0.0~20260707.git2d20dde.tar.xz New: ---- maven-filtering-4.0.0-beta-2-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-filtering4.spec ++++++ --- /var/tmp/diff_new_pack.KkCpFG/_old 2026-11-05 18:21:44.257260927 +0100 +++ /var/tmp/diff_new_pack.KkCpFG/_new 2026-11-05 18:21:44.259261011 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven-filtering4 # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,15 @@ %global base_name maven-filtering %global version_suffix 4 -%global file_version 4.0.0-beta-2-SNAPSHOT +%global file_version 4.0.0-beta-2 Name: %{base_name}%{version_suffix} -Version: 4.0.0~20260707.git2d20dde +Version: 4.0.0~beta2 Release: 0 Summary: Shared component providing resource filtering License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/shared/%{name}/index.html -Source0: %{base_name}-%{version}.tar.xz +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{base_name}/%{file_version}/%{base_name}-%{file_version}-source-release.zip Source1: %{name}-build.xml Patch0: %{name}-java8compat.patch Patch1: 0001-Be-gracious-with-binary-files-among-the-resources-to.patch @@ -39,6 +39,7 @@ BuildRequires: plexus-interpolation BuildRequires: plexus-utils BuildRequires: slf4j +BuildRequires: unzip BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) @@ -57,7 +58,7 @@ This package contains the API documentation for %{name}. %prep -%setup -q -n %{base_name}-%{version} +%setup -q -n %{base_name}-%{file_version} cp %{SOURCE1} build.xml %patch -P 0 -p1 %patch -P 1 -p1 ++++++ 0001-Be-gracious-with-binary-files-among-the-resources-to.patch ++++++ --- /var/tmp/diff_new_pack.KkCpFG/_old 2026-11-05 18:21:44.280261884 +0100 +++ /var/tmp/diff_new_pack.KkCpFG/_new 2026-11-05 18:21:44.284262050 +0100 @@ -1,14 +1,14 @@ -From 00d7f8b520d134dcc7158601db6717258aa7ed67 Mon Sep 17 00:00:00 2001 +From a13262726ad7251394ffc7263933749fdd387582 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(+) + .../org/apache/maven/shared/filtering/FilteringUtils.java | 7 +++++++ + 1 file changed, 7 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 +index d6fc626..91d2278 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; @@ -19,17 +19,27 @@ import java.nio.file.FileSystemException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; -@@ -317,6 +318,9 @@ public final class FilteringUtils { +@@ -414,6 +415,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); ++ return copyUnconditionally(from, to, inputEncoding, outputEncoding, null); } } - + copyFilePermissions(from, to); +@@ -450,6 +454,9 @@ public final class FilteringUtils { + } + copied = writer.isModified(); + } ++ } catch (MalformedInputException e) { ++ // Most likely a binary; just copy it then ++ return copyIfContentsChanged(from, to, inputEncoding, outputEncoding, null); + } + } + copyFilePermissions(from, to); -- -2.51.1 +2.56.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.KkCpFG/_old 2026-11-05 18:21:44.324263713 +0100 +++ /var/tmp/diff_new_pack.KkCpFG/_new 2026-11-05 18:21:44.328263879 +0100 @@ -1,6 +1,6 @@ -mtime: 1783961592 -commit: dec6d3019aa1d20761b1edf7a666dc1aca6b593bbc0eccbc7dbf8c901d00f0a1 +mtime: 1793821349 +commit: 7ef8650c83aaf2db345fb4e765786c6b1a94166a03cac3b8c9e91f16380f6369 url: https://src.opensuse.org/java-packages/maven-filtering4 -revision: dec6d3019aa1d20761b1edf7a666dc1aca6b593bbc0eccbc7dbf8c901d00f0a1 +revision: 7ef8650c83aaf2db345fb4e765786c6b1a94166a03cac3b8c9e91f16380f6369 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 2026-11-04 20:42:29.000000000 +0100 @@ -0,0 +1,4 @@ +*.obscpio +*.osc +_build.* +.pbuild ++++++ maven-filtering4-build.xml ++++++ --- /var/tmp/diff_new_pack.KkCpFG/_old 2026-11-05 18:21:44.494270780 +0100 +++ /var/tmp/diff_new_pack.KkCpFG/_new 2026-11-05 18:21:44.497270905 +0100 @@ -10,7 +10,7 @@ <property name="project.groupId" value="org.apache.maven.shared"/> <property name="project.artifactId" value="maven-filtering"/> - <property name="project.version" value="4.0.0-beta-2-SNAPSHOT"/> + <property name="project.version" value="4.0.0-beta-2"/> <property name="project.name" value="Apache Maven Filtering"/> <property name="project.organization.name" value="The Apache Software Foundation"/> ++++++ maven-filtering4-java8compat.patch ++++++ --- /var/tmp/diff_new_pack.KkCpFG/_old 2026-11-05 18:21:44.515271653 +0100 +++ /var/tmp/diff_new_pack.KkCpFG/_new 2026-11-05 18:21:44.520271861 +0100 @@ -1,8 +1,43 @@ +diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java +index 914b3e8..8365f45 100644 +--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java ++++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java +@@ -214,7 +214,7 @@ class BaseFilter implements DefaultFilterInfo { + } + + if (!Files.isDirectory(searchRoot)) { +- return List.of(); ++ return Collections.emptyList(); + } + + // Build a relative glob pattern for the suffix beyond the prefix. +@@ -266,7 +266,7 @@ class BaseFilter implements DefaultFilterInfo { + try { + Path literalPath = FilteringUtils.resolveFile(basedir, filterFile); + if (Files.isRegularFile(literalPath)) { +- matched = List.of(literalPath); ++ matched = Collections.singletonList(literalPath); + } else { + getLogger().warn("Filter glob '{}' did not match any files", filterFile); + } +diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +index b838661..3a14edc 100644 +--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java ++++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +@@ -643,7 +643,7 @@ public class DefaultMavenResourcesFiltering implements MavenResourcesFiltering { + private String filterFileName(String name, List<FilterWrapper> wrappers) throws MavenFilteringException { + + StringBuilder sb = new StringBuilder(); +- Path path = Path.of(name); ++ Path path = Paths.get(name); + Iterator<Path> iterator = path.iterator(); + while (iterator.hasNext()) { + String component = iterator.next().toString(); 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..21b9aff 100644 +index 91d2278..34f5f4c 100644 --- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java +++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java -@@ -267,7 +267,7 @@ public final class FilteringUtils { +@@ -268,7 +268,7 @@ public final class FilteringUtils { } }
