Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-filtering for openSUSE:Factory
checked in at 2025-06-10 09:07:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-filtering (Old)
and /work/SRC/openSUSE:Factory/.maven-filtering.new.19631 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-filtering"
Tue Jun 10 09:07:32 2025 rev:10 rq:1284157 version:3.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-filtering/maven-filtering.changes
2025-06-03 17:54:38.572351114 +0200
+++
/work/SRC/openSUSE:Factory/.maven-filtering.new.19631/maven-filtering.changes
2025-06-10 09:09:57.959044398 +0200
@@ -1,0 +2,9 @@
+Mon Jun 9 10:39:40 UTC 2025 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 3.4.0
+ * Changes
+ + Bump apache/maven-gh-actions-shared from 3 to 4
+ + Bump org.apache.maven.shared:maven-shared-components from 41
+ + MSHARED-1412: Allow to customize Interpolator used by filter
+
+-------------------------------------------------------------------
Old:
----
maven-filtering-3.3.2-source-release.zip
New:
----
maven-filtering-3.4.0-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-filtering.spec ++++++
--- /var/tmp/diff_new_pack.wbIUf1/_old 2025-06-10 09:09:58.575069872 +0200
+++ /var/tmp/diff_new_pack.wbIUf1/_new 2025-06-10 09:09:58.575069872 +0200
@@ -17,7 +17,7 @@
Name: maven-filtering
-Version: 3.3.2
+Version: 3.4.0
Release: 0
Summary: Shared component providing resource filtering
License: Apache-2.0
++++++ maven-filtering-3.3.2-source-release.zip ->
maven-filtering-3.4.0-source-release.zip ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-filtering-3.3.2/DEPENDENCIES
new/maven-filtering-3.4.0/DEPENDENCIES
--- old/maven-filtering-3.3.2/DEPENDENCIES 2024-03-02 08:58:04.000000000
+0100
+++ new/maven-filtering-3.4.0/DEPENDENCIES 2024-08-28 15:27:34.000000000
+0200
@@ -20,10 +20,10 @@
- Plexus Interpolation API
(https://codehaus-plexus.github.io/plexus-pom/plexus-interpolation/)
org.codehaus.plexus:plexus-interpolation:bundle:1.27
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Plexus Common Utilities
(https://codehaus-plexus.github.io/plexus-pom/plexus-utils/)
org.codehaus.plexus:plexus-utils:jar:4.0.0
+ - Plexus Common Utilities (https://codehaus-plexus.github.io/plexus-utils/)
org.codehaus.plexus:plexus-utils:jar:4.0.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Plexus XML Utilities (https://codehaus-plexus.github.io/plexus-xml/)
org.codehaus.plexus:plexus-xml:jar:3.0.0
+ - Plexus XML Utilities (https://codehaus-plexus.github.io/plexus-xml/)
org.codehaus.plexus:plexus-xml:jar:3.0.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -35,10 +35,10 @@
From: 'The Apache Software Foundation' (https://www.apache.org/)
- - Apache Commons IO (https://commons.apache.org/proper/commons-io/)
commons-io:commons-io:jar:2.15.1
+ - Apache Commons IO (https://commons.apache.org/proper/commons-io/)
commons-io:commons-io:jar:2.16.1
License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Commons Lang (https://commons.apache.org/proper/commons-lang/)
org.apache.commons:commons-lang3:jar:3.14.0
+ - Apache Commons Lang (https://commons.apache.org/proper/commons-lang/)
org.apache.commons:commons-lang3:jar:3.16.0
License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-filtering-3.3.2/pom.xml
new/maven-filtering-3.4.0/pom.xml
--- old/maven-filtering-3.3.2/pom.xml 2024-03-02 08:58:04.000000000 +0100
+++ new/maven-filtering-3.4.0/pom.xml 2024-08-28 15:27:34.000000000 +0200
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>41</version>
+ <version>43</version>
<relativePath />
</parent>
<artifactId>maven-filtering</artifactId>
- <version>3.3.2</version>
+ <version>3.4.0</version>
<name>Apache Maven Filtering</name>
<description>A component to assist in filtering of resource files with
properties from a Maven project.</description>
@@ -42,7 +42,7 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</developerConnection>
- <tag>maven-filtering-3.3.2</tag>
+ <tag>maven-filtering-3.4.0</tag>
<url>https://github.com/apache/maven-filtering/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -64,7 +64,10 @@
<mavenVersion>3.6.3</mavenVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
-
<project.build.outputTimestamp>2024-03-02T08:58:03Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2024-08-28T15:27:34Z</project.build.outputTimestamp>
+ <!-- don't fail check for some rules that are too hard to enforce (could
even be told broken for some)
+ and those that are enforced by the formatting checks from spotless -->
+
<checkstyle.violation.ignore>ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
</properties>
<dependencies>
@@ -104,12 +107,10 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
- <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -119,12 +120,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.14.0</version>
+ <version>3.16.0</version>
</dependency>
<dependency>
@@ -148,7 +149,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-3.3.2/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
new/maven-filtering-3.4.0/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
---
old/maven-filtering-3.3.2/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
2024-03-02 08:58:04.000000000 +0100
+++
new/maven-filtering-3.4.0/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
2024-08-28 15:27:34.000000000 +0200
@@ -22,9 +22,11 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Properties;
+import java.util.function.Consumer;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.interpolation.Interpolator;
/**
* @since 1.0-beta-3
@@ -79,6 +81,8 @@
*/
private boolean supportMultiLineFiltering;
+ private Consumer<Interpolator> interpolatorCustomizer;
+
/**
* Create instance.
*/
@@ -338,4 +342,22 @@
public void setSupportMultiLineFiltering(boolean
supportMultiLineFiltering) {
this.supportMultiLineFiltering = supportMultiLineFiltering;
}
+
+ /**
+ *
+ * @return the customizer which is supposed to be used by filters creating
an {@link Interpolator} like those based on {@link BaseFilter}.
+ * @since 3.4.0
+ */
+ public Consumer<Interpolator> getInterpolatorCustomizer() {
+ return interpolatorCustomizer;
+ }
+
+ /**
+ *
+ * @param interpolatorCustomizer the customizer which is supposed to be
used by filters creating an {@link Interpolator} like those based on {@link
BaseFilter}.
+ * @since 3.4.0
+ */
+ public void setInterpolatorCustomizer(Consumer<Interpolator>
interpolatorCustomizer) {
+ this.interpolatorCustomizer = interpolatorCustomizer;
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-3.3.2/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
new/maven-filtering-3.4.0/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
---
old/maven-filtering-3.3.2/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
2024-03-02 08:58:04.000000000 +0100
+++
new/maven-filtering-3.4.0/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
2024-08-28 15:27:34.000000000 +0200
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Properties;
import java.util.TreeSet;
+import java.util.function.Consumer;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
@@ -173,7 +174,8 @@
request.getProjectStartExpressions(),
request.getEscapeString(),
request.isEscapeWindowsPaths(),
- request.isSupportMultiLineFiltering());
+ request.isSupportMultiLineFiltering(),
+ request.getInterpolatorCustomizer());
defaultFilterWrappers.add(wrapper);
@@ -232,6 +234,8 @@
private boolean supportMultiLineFiltering;
+ private Consumer<Interpolator> interpolatorCustomizer;
+
Wrapper(
LinkedHashSet<String> delimiters,
MavenProject project,
@@ -240,7 +244,8 @@
List<String> projectStartExpressions,
String escapeString,
boolean escapeWindowsPaths,
- boolean supportMultiLineFiltering) {
+ boolean supportMultiLineFiltering,
+ Consumer<Interpolator> interpolatorCustomizer) {
super();
this.delimiters = delimiters;
this.project = project;
@@ -250,6 +255,7 @@
this.escapeString = escapeString;
this.escapeWindowsPaths = escapeWindowsPaths;
this.supportMultiLineFiltering = supportMultiLineFiltering;
+ this.interpolatorCustomizer = interpolatorCustomizer;
}
@Override
@@ -262,6 +268,9 @@
mavenSession,
escapeString,
escapeWindowsPaths);
+ if (interpolatorCustomizer != null) {
+ interpolatorCustomizer.accept(interpolator);
+ }
MultiDelimiterInterpolatorFilterReaderLineEnding filterReader =
new MultiDelimiterInterpolatorFilterReaderLineEnding(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-filtering-3.3.2/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
new/maven-filtering-3.4.0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
---
old/maven-filtering-3.3.2/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
2024-03-02 08:58:04.000000000 +0100
+++
new/maven-filtering-3.4.0/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
2024-08-28 15:27:34.000000000 +0200
@@ -21,6 +21,7 @@
import javax.inject.Inject;
import java.io.File;
+import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.nio.file.Files;
@@ -33,6 +34,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.interpolation.AbstractValueSource;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -150,6 +152,29 @@
List<FilterWrapper> wrappers =
mavenFileFilter.getDefaultFilterWrappers(req);
+ try (Reader reader = wrappers.get(0).getReader(new
StringReader("t...@titi.com ${foo}"))) {
+ assertEquals("t...@titi.com bar", IOUtils.toString(reader));
+ }
+ }
+
+ @Test
+ void testInterpolatorCustomizer() throws MavenFilteringException,
IOException {
+ AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
+ req.setInterpolatorCustomizer(i -> {
+ i.addValueSource(new AbstractValueSource(false) {
+
+ @Override
+ public Object getValue(String expression) {
+ if (expression.equals("foo")) {
+ return "bar";
+ }
+ return null;
+ }
+ });
+ });
+
+ List<FilterWrapper> wrappers =
mavenFileFilter.getDefaultFilterWrappers(req);
+
try (Reader reader = wrappers.get(0).getReader(new
StringReader("t...@titi.com ${foo}"))) {
assertEquals("t...@titi.com bar", IOUtils.toString(reader));
}
++++++ maven-filtering-build.xml ++++++
--- /var/tmp/diff_new_pack.wbIUf1/_old 2025-06-10 09:09:58.699074999 +0200
+++ /var/tmp/diff_new_pack.wbIUf1/_new 2025-06-10 09:09:58.703075165 +0200
@@ -10,11 +10,11 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-filtering"/>
- <property name="project.version" value="3.3.2"/>
+ <property name="project.version" value="3.4.0"/>
<property name="project.name" value="Apache Maven Filtering"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="3.3"/>
+ <property name="spec.version" value="3.4"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
