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-07-15 16:34:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-filtering4 (Old)
and /work/SRC/openSUSE:Factory/.maven-filtering4.new.1991 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-filtering4"
Wed Jul 15 16:34:51 2026 rev:4 rq:1365422 version:4.0.0~20260707.git2d20dde
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-filtering4/maven-filtering4.changes
2025-11-09 21:10:49.274470981 +0100
+++
/work/SRC/openSUSE:Factory/.maven-filtering4.new.1991/maven-filtering4.changes
2026-07-15 16:54:09.351985514 +0200
@@ -1,0 +2,23 @@
+Mon Jul 13 16:49:46 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Update to the git checkout from 7th of June 2026 (hash 2d20dde)
+ * Changes
+ + Configure download_path_suffix for distribution area
+ + Set up for ATR (#343)
+ + Update parent POM to 47 and site to 2.0.0 (#319)
+ + Cleanup and refactor tests (#312)
+ + Add README badges for 3.x vs 4 branches
+ + Update mavenVersion to 4.0.0-rc-5 (#307)
+ + Update maven-shared-components to 49
+ + Update plexus-interpolation to 1.29
+ + Update plexus-utils (test resources) to 4.0.3 (#331)
+ + Update mockitoVersion to 5.23.0 (#310, #324, #329)
+ + Update junitVersion to 5.14.4
+
+-------------------------------------------------------------------
+Mon Jul 13 12:26:47 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Do not use the slf4j2 compatibility package, as the base slf4j
+ package is now on version 2.0.18
+
+-------------------------------------------------------------------
Old:
----
maven-filtering-4.0.0~20250928.git84993b0.tar.xz
New:
----
maven-filtering-4.0.0~20260707.git2d20dde.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-filtering4.spec ++++++
--- /var/tmp/diff_new_pack.frK0E3/_old 2026-07-15 16:54:11.980074822 +0200
+++ /var/tmp/diff_new_pack.frK0E3/_new 2026-07-15 16:54:11.996075365 +0200
@@ -20,7 +20,7 @@
%global version_suffix 4
%global file_version 4.0.0-beta-2-SNAPSHOT
Name: %{base_name}%{version_suffix}
-Version: 4.0.0~20250928.git84993b0
+Version: 4.0.0~20260707.git2d20dde
Release: 0
Summary: Shared component providing resource filtering
License: Apache-2.0
@@ -38,7 +38,7 @@
BuildRequires: plexus-build-api0
BuildRequires: plexus-interpolation
BuildRequires: plexus-utils
-BuildRequires: slf4j2
+BuildRequires: slf4j
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
@@ -64,8 +64,6 @@
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
-%pom_xpath_set pom:project/pom:properties/pom:slf4jVersion 2
-
%build
mkdir -p lib
build-jar-repository -s lib \
@@ -77,7 +75,7 @@
plexus/utils \
plexus/interpolation \
plexus/plexus-build-api0 \
- slf4j/api-2
+ slf4j/api
ant -Dproject.version=%{version} \
jar javadoc
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.frK0E3/_old 2026-07-15 16:54:12.160080939 +0200
+++ /var/tmp/diff_new_pack.frK0E3/_new 2026-07-15 16:54:12.188081890 +0200
@@ -1,6 +1,6 @@
-mtime: 1762618555
-commit: b0e78686eab01596fdd97864e6bf4a75d2ea83dbeabb68c5c6df8ec42905ac7b
-url: https://src.opensuse.org/java-packages/maven-filtering4.git
-revision: b0e78686eab01596fdd97864e6bf4a75d2ea83dbeabb68c5c6df8ec42905ac7b
+mtime: 1783961592
+commit: dec6d3019aa1d20761b1edf7a666dc1aca6b593bbc0eccbc7dbf8c901d00f0a1
+url: https://src.opensuse.org/java-packages/maven-filtering4
+revision: dec6d3019aa1d20761b1edf7a666dc1aca6b593bbc0eccbc7dbf8c901d00f0a1
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ _service ++++++
--- /var/tmp/diff_new_pack.frK0E3/_old 2026-07-15 16:54:12.212082706 +0200
+++ /var/tmp/diff_new_pack.frK0E3/_new 2026-07-15 16:54:12.228083250 +0200
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://github.com/apache/maven-filtering.git</param>
- <param
name="revision">84993b07cd1f8b9c8d5b2ecfe04bf08b0176fdc7</param>
+ <param
name="revision">2d20dde6b86914f0434cf97a76937299d55c5dca</param>
<param name="versionformat">4.0.0~%cd.git%h</param>
</service>
<service name="recompress" mode="disabled">
++++++ 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-07-13 18:53:12.000000000 +0200
@@ -0,0 +1,4 @@
+*.obscpio
+*.osc
+_build.*
+.pbuild
++++++ maven-filtering-4.0.0~20250928.git84993b0.tar.xz ->
maven-filtering-4.0.0~20260707.git2d20dde.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-filtering-4.0.0~20250928.git84993b0/.asf.yaml
new/maven-filtering-4.0.0~20260707.git2d20dde/.asf.yaml
--- old/maven-filtering-4.0.0~20250928.git84993b0/.asf.yaml 2025-09-28
12:31:15.000000000 +0200
+++ new/maven-filtering-4.0.0~20260707.git2d20dde/.asf.yaml 2026-07-07
21:20:40.000000000 +0200
@@ -40,3 +40,26 @@
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]
+# https://release-test.apache.org/projects/maven-filtering
+project:
+ metadata:
+ key: maven-filtering
+ committee: maven
+ name: Maven Filtering
+ description: A shared component for all plugins that needs to filter
resources.
+ short_description: A shared component for all plugins that needs to filter
resources.
+ homepage: https://maven.apache.org/shared/maven-filtering/
+ download_page: https://maven.apache.org/shared/maven-filtering/download.cgi
+ bug_database:
https://maven.apache.org/shared/maven-filtering/issue-management.html
+ mailing_lists:
https://maven.apache.org/shared/maven-filtering/mailing-lists.html
+ repositories:
+ - https://github.com/apache/maven-filtering.git
+ categories:
+ - build-management
+ programming_languages:
+ - Java
+ policy:
+ github_repository_name: maven-filtering
+ download_path_suffix: shared
+ features:
+ atr_sync: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-filtering-4.0.0~20250928.git84993b0/README.md
new/maven-filtering-4.0.0~20260707.git2d20dde/README.md
--- old/maven-filtering-4.0.0~20250928.git84993b0/README.md 2025-09-28
12:31:15.000000000 +0200
+++ new/maven-filtering-4.0.0~20260707.git2d20dde/README.md 2026-07-07
21:20:40.000000000 +0200
@@ -23,6 +23,12 @@
[][build]
[][test-results]
+Maven 3:
[maven-filtering-3.x](https://github.com/apache/maven-filtering/tree/maven-filtering-3.x)
+[](https://search.maven.org/artifact/org.apache.maven.shared/maven-filtering)
+[](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/shared/maven-filtering/README.md)
+[][build-3]
+[][test-results-3]
+
You have found a bug, or you have an idea for a cool new feature? Contributing
code is a great way to give something back to the open source community. Before
@@ -81,4 +87,6 @@
[cla]: https://www.apache.org/licenses/#clas
[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
[test-results]:
https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/lastCompletedBuild/testReport/
+[test-results-3]:
https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x/lastCompletedBuild/testReport/
[build]:
https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/
+[build-3]:
https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-filtering-4.0.0~20250928.git84993b0/pom.xml
new/maven-filtering-4.0.0~20260707.git2d20dde/pom.xml
--- old/maven-filtering-4.0.0~20250928.git84993b0/pom.xml 2025-09-28
12:31:15.000000000 +0200
+++ new/maven-filtering-4.0.0~20260707.git2d20dde/pom.xml 2026-07-07
21:20:40.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>45</version>
+ <version>49</version>
<relativePath />
</parent>
@@ -62,14 +62,14 @@
<properties>
<javaVersion>17</javaVersion>
- <mavenVersion>4.0.0-rc-2</mavenVersion>
+ <mavenVersion>4.0.0-rc-5</mavenVersion>
<hamcrestVersion>3.0</hamcrestVersion>
- <junitVersion>5.10.1</junitVersion>
- <mockitoVersion>5.20.0</mockitoVersion>
+ <junitVersion>5.14.4</junitVersion>
+ <mockitoVersion>5.23.0</mockitoVersion>
<mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
<plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
- <plexusInterpolationVersion>1.28</plexusInterpolationVersion>
+ <plexusInterpolationVersion>1.29</plexusInterpolationVersion>
<slf4jVersion>2.0.13</slf4jVersion>
<project.build.outputTimestamp>2024-06-26T08:01:47Z</project.build.outputTimestamp>
@@ -203,7 +203,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <maxJdkVersion>${javaVersion}</maxJdkVersion>
<excludes>
<exclude>org.jline:jline</exclude>
</excludes>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/site/site.xml
new/maven-filtering-4.0.0~20260707.git2d20dde/src/site/site.xml
--- old/maven-filtering-4.0.0~20250928.git84993b0/src/site/site.xml
2025-09-28 12:31:15.000000000 +0200
+++ new/maven-filtering-4.0.0~20260707.git2d20dde/src/site/site.xml
2026-07-07 21:20:40.000000000 +0200
@@ -19,7 +19,9 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";>
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
@@ -32,4 +34,4 @@
<item name="Download" href="download.html"/>
</menu>
</body>
-</project>
+</site>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -18,7 +18,6 @@
*/
package org.apache.maven.shared.filtering;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -41,7 +40,7 @@
private Interpolator interpolator;
@Test
- public void testDefaults() throws Exception {
+ public void defaults() throws Exception {
when(interpolator.interpolate(eq("${a}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DONE_A");
@@ -84,7 +83,7 @@
// MSHARED-198: custom delimiters doesn't work as expected
@Test
- public void testCustomDelimiters() throws Exception {
+ public void customDelimiters() throws Exception {
when(interpolator.interpolate(eq("aaaFILTER.a.MEaaa"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DONE");
when(interpolator.interpolate(eq("abcFILTER.a.MEabc"), eq(""),
isA(RecursionInterceptor.class)))
@@ -102,7 +101,7 @@
// MSHARED-235: reader exceeds readAheadLimit
@Test
- public void testMarkInvalid() throws IOException {
+ public void markInvalid() throws Exception {
try (Reader reader = getAtReader(new
StringReader("@\").replace(p,\"]\").replace(q,\""), interpolator, "\\")) {
assertEquals("@\").replace(p,\"]\").replace(q,\"",
IOUtils.toString(reader));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -28,32 +28,32 @@
/**
* @author Karl Heinz Marbaise <a
href="mailto:[email protected]";>[email protected]</a>.
*/
-public class AbstractMavenFilteringRequestTest {
+class AbstractMavenFilteringRequestTest {
private final AbstractMavenFilteringRequest request = new
AbstractMavenFilteringRequest();
private final LinkedHashSet<String> delimiters = new LinkedHashSet<>();
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingNull() {
+ void setDelimitersShouldNotChangeAnythingIfUsingNull() {
request.setDelimiters(null, false);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
+ void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
request.setDelimiters(delimiters, false);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldAddOnlyTheGivenDelimiter() {
+ void setDelimitersShouldAddOnlyTheGivenDelimiter() {
delimiters.add("test");
request.setDelimiters(delimiters, false);
assertThat(request.getDelimiters(), Matchers.contains("test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElements() {
+ void setDelimitersShouldAddDefaultDelimitersForNullElements() {
delimiters.add("test");
delimiters.add(null);
delimiters.add("second");
@@ -62,27 +62,27 @@
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
request.setDelimiters(null, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
request.setDelimiters(delimiters, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
delimiters.add("test");
request.setDelimiters(delimiters, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@",
"test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElement() {
+ void setDelimitersShouldAddDefaultDelimitersForNullElement() {
delimiters.add("test");
delimiters.add(null);
delimiters.add("second");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -19,7 +19,6 @@
package org.apache.maven.shared.filtering;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
@@ -28,12 +27,12 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class BoundedReaderTest {
+class BoundedReaderTest {
private final Reader sr = new BufferedReader(new
StringReader("01234567890"));
@Test
- public void readTillEnd() throws IOException {
+ void readTillEnd() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.mark(3);
mr.read();
@@ -44,7 +43,7 @@
}
@Test
- public void readMulti() throws IOException {
+ void readMulti() throws Exception {
char[] cbuf = new char[4];
Arrays.fill(cbuf, 'X');
@@ -60,7 +59,7 @@
}
@Test
- public void readMultiWithOffset() throws IOException {
+ void readMultiWithOffset() throws Exception {
char[] cbuf = new char[4];
Arrays.fill(cbuf, 'X');
@@ -77,7 +76,7 @@
}
@Test
- public void resetWorks() throws IOException {
+ void resetWorks() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.read();
mr.read();
@@ -91,7 +90,7 @@
}
@Test
- public void skipTest() throws IOException {
+ void skipTest() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.skip(2);
mr.read();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -19,7 +19,6 @@
package org.apache.maven.shared.filtering;
import java.io.File;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.nio.file.Files;
@@ -52,7 +51,7 @@
*
*/
@MavenDITest
-public class DefaultMavenFileFilterTest {
+class DefaultMavenFileFilterTest {
@Inject
Injector container;
@@ -65,7 +64,7 @@
}
@Test
- public void testOverwriteFile() throws Exception {
+ void overwriteFile() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
Path from = Paths.get(getBasedir(),
"src/test/units-files/reflection-test.properties");
@@ -86,7 +85,7 @@
}
@Test
- public void testNullSafeDefaultFilterWrappers() throws Exception {
+ void nullSafeDefaultFilterWrappers() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
mavenFileFilter.getDefaultFilterWrappers(null, null, false, null,
null);
@@ -95,7 +94,7 @@
}
@Test
- public void testMultiFilterFileInheritance() throws Exception {
+ void multiFilterFileInheritance() throws Exception {
DefaultMavenFileFilter mavenFileFilter = new
DefaultMavenFileFilter(mock(BuildContext.class));
File testDir = new File(getBasedir(),
"src/test/units-files/MSHARED-177");
@@ -116,7 +115,7 @@
// MSHARED-161: DefaultMavenFileFilter.getDefaultFilterWrappers loads
// filters from the current directory instead of using basedir
@Test
- public void testMavenBasedir() throws Exception {
+ void mavenBasedir() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -140,7 +139,7 @@
// MSHARED-198: custom delimiters doesn't work as expected
@Test
- public void testCustomDelimiters() throws Exception {
+ void customDelimiters() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -160,7 +159,7 @@
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the
same line, the first one being left open
@Test
- public void testLineWithSingleAtAndExpression() throws Exception {
+ void lineWithSingleAtAndExpression() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -176,7 +175,7 @@
}
@Test
- void testInterpolatorCustomizer() throws MavenFilteringException,
IOException {
+ void interpolatorCustomizer() throws Exception {
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
req.setInterpolatorCustomizer(i -> i.addValueSource(new
AbstractValueSource(false) {
@Override
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -33,12 +33,12 @@
* @author Kristian Rosenvold
*/
@MavenDITest
-public class DefaultMavenReaderFilterTest {
+class DefaultMavenReaderFilterTest {
@Inject
Injector container;
@Test
- public void testJustDoSomeFiltering() throws Exception {
+ void justDoSomeFiltering() throws Exception {
MavenReaderFilter readerFilter =
container.getInstance(MavenReaderFilter.class);
StringReader src = new StringReader("[email protected] ${foo}");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -55,7 +55,7 @@
* @since 1.0-beta-1
*/
@MavenDITest
-public class DefaultMavenResourcesFilteringTest {
+class DefaultMavenResourcesFilteringTest {
@Inject
Injector container;
@@ -78,7 +78,7 @@
}
@Test
- public void testSimpleFiltering() throws Exception {
+ void simpleFiltering() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -112,7 +112,7 @@
}
@Test
- public void testSessionFiltering() throws Exception {
+ void sessionFiltering() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/session-filtering";
@@ -155,7 +155,7 @@
}
@Test
- public void testWithMavenResourcesExecution() throws Exception {
+ void withMavenResourcesExecution() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -187,7 +187,7 @@
}
@Test
- public void testWithMavenResourcesExecutionWithAdditionalProperties()
throws Exception {
+ void withMavenResourcesExecutionWithAdditionalProperties() throws
Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -278,7 +278,7 @@
}
@Test
- public void testAddingTokens() throws Exception {
+ void addingTokens() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -314,7 +314,7 @@
}
@Test
- public void testNoFiltering() throws Exception {
+ void noFiltering() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
Path initialImageFile = Paths.get(unitFilesDir, "happy_duke.gif");
@@ -365,7 +365,7 @@
}
@Test
- public void testIncludeOneFile() throws Exception {
+ void includeOneFile() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -396,7 +396,7 @@
}
@Test
- public void testIncludeOneFileAndDirectory() throws Exception {
+ void includeOneFileAndDirectory() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
@@ -432,7 +432,7 @@
}
@Test
- public void testFlattenDirectoryStructure() throws Exception {
+ void flattenDirectoryStructure() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
@@ -478,7 +478,7 @@
}
@Test
- public void testFlattenDirectoryStructureWithoutOverride() {
+ void flattenDirectoryStructureWithoutOverride() {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
@@ -520,7 +520,7 @@
}
@Test
- public void testExcludeOneFile() throws Exception {
+ void excludeOneFile() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -562,7 +562,7 @@
}
@Test
- public void testTargetAbsolutePath() throws Exception {
+ void targetAbsolutePath() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -600,7 +600,7 @@
}
@Test
- public void testTargetPath() throws Exception {
+ void targetPath() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -633,7 +633,7 @@
}
@Test
- public void testEmptyDirectories() throws Exception {
+ void emptyDirectories() throws Exception {
List<Resource> resources = new ArrayList<>();
resources.add(new Resource() {
@@ -681,7 +681,7 @@
}
@Test
- public void testShouldReturnGitIgnoreFiles() throws Exception {
+ void shouldReturnGitIgnoreFiles() throws Exception {
createTestDataStructure();
Path outputDirectory = Paths.get(getBasedir(),
"target/testGitIgnoreFile");
@@ -773,7 +773,7 @@
* unit test for MSHARED-81 :
https://issues.apache.org/jira/browse/MSHARED-81
*/
@Test
- public void testMSHARED81() throws Exception {
+ void mshared81() throws Exception {
mavenProject.addProperty("escaped", "this is escaped");
mavenProject.addProperty("escaped.at", "this is escaped.at");
mavenProject.addProperty("foo", "this is foo");
@@ -864,7 +864,7 @@
* unit test for edge cases :
https://issues.apache.org/jira/browse/MSHARED-228
*/
@Test
- public void testEdgeCases() throws Exception {
+ void edgeCases() throws Exception {
mavenProject.addProperty("escaped", "this is escaped");
mavenProject.addProperty("escaped.at", "this is escaped.at");
mavenProject.addProperty("foo", "this is foo");
@@ -918,7 +918,7 @@
// MSHARED-220: Apply filtering to filenames
@Test
- public void testFilterFileName() throws Exception {
+ void filterFileName() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-filename-filtering";
@@ -950,7 +950,7 @@
* MRESOURCES-171: Use correct encoding when filtering properties-files
*/
@Test
- public void testFilterPropertiesFiles() throws Exception {
+ void filterPropertiesFiles() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/MRESOURCES-171";
@@ -977,7 +977,7 @@
}
@Test
- public void testGetEncoding() {
+ void getEncoding() {
Path propertiesFile = Paths.get("file.properties");
Path regularFile = Paths.get("file.xml");
@@ -992,7 +992,7 @@
}
@Test
- public void testIsPropertiesFile() {
+ void isPropertiesFile() {
// Properties files
assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(Paths.get("file.properties")));
assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(Paths.get("some/parent/path",
"file.properties")));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -40,7 +40,7 @@
* @author Olivier Lamy
*/
@MavenDITest
-public class EscapeStringTest {
+class EscapeStringTest {
@Inject
Injector container;
@@ -56,7 +56,7 @@
}
@Test
- public void testEscape() throws Exception {
+ void escape() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -18,7 +18,6 @@
*/
package org.apache.maven.shared.filtering;
-import java.io.IOException;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -37,11 +36,11 @@
* @since 1.0
*
*/
-public class FilteringUtilsTest {
+class FilteringUtilsTest {
private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExisting0ByteFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExisting0ByteFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "");
@@ -64,7 +63,7 @@
}
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExistingJunkFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExistingJunkFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "junk");
@@ -87,7 +86,7 @@
}
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExistingSameFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExistingSameFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.copy(fromFile, toFile, StandardCopyOption.REPLACE_EXISTING);
@@ -110,17 +109,17 @@
}
@Test
- public void testEscapeWindowsPathStartingWithDrive() {
+ void escapeWindowsPathStartingWithDrive() {
assertEquals("C:\\\\Users\\\\Administrator",
FilteringUtils.escapeWindowsPath("C:\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathMissingDriveLetter() {
+ void escapeWindowsPathMissingDriveLetter() {
assertEquals(":\\Users\\Administrator",
FilteringUtils.escapeWindowsPath(":\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathInvalidDriveLetter() {
+ void escapeWindowsPathInvalidDriveLetter() {
assertEquals("4:\\Users\\Administrator",
FilteringUtils.escapeWindowsPath("4:\\Users\\Administrator"));
}
@@ -142,7 +141,7 @@
// MSHARED-179
@Test
- public void testEscapeWindowsPathNotAtBeginning() {
+ void escapeWindowsPathNotAtBeginning() {
assertEquals(
"jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true",
FilteringUtils.escapeWindowsPath("jdbc:derby:C:\\Users\\Administrator/test;create=true"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -46,7 +46,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
@MavenDITest
-public class IncrementalResourceFilteringTest {
+class IncrementalResourceFilteringTest {
final Path baseDirectory = Paths.get(getBasedir());
final Path outputDirectory =
baseDirectory.resolve("target/IncrementalResourceFilteringTest");
@@ -72,7 +72,7 @@
}
@Test
- public void testSimpleIncrementalFiltering() throws Exception {
+ void simpleIncrementalFiltering() throws Exception {
// run full build first
filter("time");
@@ -107,7 +107,7 @@
}
@Test
- public void testOutputChange() throws Exception {
+ void outputChange() throws Exception {
// run full build first
filter("time");
@@ -126,7 +126,7 @@
}
@Test
- public void testFilterChange() throws Exception {
+ void filterChange() throws Exception {
// run full build first
filter("time");
@@ -145,7 +145,7 @@
}
@Test
- public void testFilterDeleted() throws Exception {
+ void filterDeleted() throws Exception {
// run full build first
filter("time");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -27,17 +27,17 @@
import org.apache.maven.api.di.testing.MavenDITest;
import org.apache.maven.api.plugin.testing.stubs.ProjectStub;
import org.apache.maven.di.Injector;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.maven.api.di.testing.MavenDIExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.fail;
/**
* @author Mikolaj Izdebski
*/
@MavenDITest
-public class InvalidMarkTest {
+class InvalidMarkTest {
@Inject
Injector container;
@@ -53,7 +53,7 @@
}
@Test
- public void testEscape() {
+ void escape() {
MavenResourcesFiltering mavenResourcesFiltering =
container.getInstance(MavenResourcesFiltering.class);
Resource resource = new Resource();
@@ -69,10 +69,8 @@
Collections.emptyList(),
new StubSession());
- try {
+ Assertions.assertDoesNotThrow(() -> {
mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- } catch (MavenFilteringException e) {
- fail();
- }
+ });
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -42,7 +42,7 @@
*
*/
@MavenDITest
-public class MuliLinesMavenResourcesFilteringTest {
+class MuliLinesMavenResourcesFilteringTest {
@Inject
Injector container;
@@ -58,7 +58,7 @@
/**
*/
@Test
- public void testFilteringTokenOnce() throws Exception {
+ void filteringTokenOnce() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -37,8 +37,7 @@
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-public class MultiDelimiterInterpolatorFilterReaderLineEndingTest
- extends AbstractInterpolatorFilterReaderLineEndingTest {
+class MultiDelimiterInterpolatorFilterReaderLineEndingTest extends
AbstractInterpolatorFilterReaderLineEndingTest {
@Mock
private Interpolator interpolator;
@@ -79,7 +78,7 @@
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the
same line, the first one being left open
@Test
- public void testLineWithSingleAtAndExpression() throws Exception {
+ void lineWithSingleAtAndExpression() throws Exception {
when(interpolator.interpolate(eq("${foo}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("bar");
@@ -93,7 +92,7 @@
//
http://stackoverflow.com/questions/21786805/maven-war-plugin-customize-filter-delimitters-in-webresources/
@Test
- public void testAtDollarExpression() throws Exception {
+ void atDollarExpression() throws Exception {
when(interpolator.interpolate(eq("${db.server}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DB_SERVER");
when(interpolator.interpolate(eq("${db.port}"), eq(""),
isA(RecursionInterceptor.class)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
2026-07-07 21:20:40.000000000 +0200
@@ -45,11 +45,11 @@
* @since 1.0-beta-1
*/
@MavenDITest
-public class PropertyUtilsTest {
+class PropertyUtilsTest {
private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
- public void testBasic() throws Exception {
+ void basic() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("basic.properties");
Files.deleteIfExists(basicProp);
@@ -67,7 +67,7 @@
}
@Test
- public void testSystemProperties() throws Exception {
+ void systemProperties() throws Exception {
Path systemProp = TEST_DIRECTORY.resolve("system.properties");
Files.deleteIfExists(systemProp);
@@ -82,7 +82,7 @@
}
@Test
- public void testException() {
+ void exception() {
Path nonExistent = TEST_DIRECTORY.resolve("not_existent_file");
assertFalse(Files.exists(nonExistent), "property file exist: " +
nonExistent);
@@ -91,7 +91,7 @@
}
@Test
- public void testloadpropertiesFile() throws Exception {
+ void testloadpropertiesFile() throws Exception {
Path propertyFile = Paths.get(getBasedir() +
"/src/test/units-files/propertyutils-test.properties");
Properties baseProps = new Properties();
baseProps.put("pom.version", "realVersion");
@@ -109,7 +109,7 @@
* @throws IOException if problem writing file
*/
@Test
- public void testCircularReferences() throws IOException {
+ void circularReferences() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
@@ -137,7 +137,7 @@
* @throws IOException if problem writing file
*/
@Test
- public void testCircularReferences3Vars() throws IOException {
+ void circularReferences3Vars() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/StubSession.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/StubSession.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/StubSession.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/StubSession.java
2026-07-07 21:20:40.000000000 +0200
@@ -55,6 +55,7 @@
import org.apache.maven.api.model.Repository;
import org.apache.maven.api.services.VersionResolverException;
import org.apache.maven.api.settings.Settings;
+import org.apache.maven.api.toolchain.ToolchainModel;
/**
*/
@@ -100,6 +101,11 @@
}
@Override
+ public Collection<ToolchainModel> getToolchains() {
+ return List.of();
+ }
+
+ @Override
public Map<String, String> getSystemProperties() {
return this.systemProperties;
}
@@ -312,6 +318,12 @@
}
@Override
+ public Optional<Version> resolveHighestVersion(ArtifactCoordinates
artifactCoordinates, List<RemoteRepository> list)
+ throws VersionResolverException {
+ return Optional.empty();
+ }
+
+ @Override
public List<Node> flattenDependencies(Node node, PathScope scope) {
return null;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
---
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
2025-09-28 12:31:15.000000000 +0200
+++
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
2026-07-07 21:20:40.000000000 +0200
@@ -41,13 +41,13 @@
*
*/
@MavenDITest
-public class TestReflectionProperties {
+class TestReflectionProperties {
@Inject
Injector container;
@Test
- public void testSimpleFiltering() throws Exception {
+ void simpleFiltering() throws Exception {
ProjectStub mavenProject = new ProjectStub();
mavenProject.setVersion("1.0");
mavenProject.setGroupId("org.apache");
@@ -75,7 +75,7 @@
}
@Test
- public void testSimpleNonFiltering() throws Exception {
+ void simpleNonFiltering() throws Exception {
ProjectStub mavenProject = new ProjectStub();
mavenProject.setVersion("1.0");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-4.0.0~20250928.git84993b0/src/test/resources/pom.xml
new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/resources/pom.xml
--- old/maven-filtering-4.0.0~20250928.git84993b0/src/test/resources/pom.xml
2025-09-28 12:31:15.000000000 +0200
+++ new/maven-filtering-4.0.0~20260707.git2d20dde/src/test/resources/pom.xml
2026-07-07 21:20:40.000000000 +0200
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <version>4.0.3</version>
</dependency>
</dependencies>
