You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:15:55 UTC
[maven-filtering] branch mvn4 created (now 98f292f)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git.
at 98f292f mvn4 aggregator
This branch includes the following new commits:
new 98f292f mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-filtering] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 98f292fa060c8e3ca1339c854ff98ba623d15ddb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:15:53 2022 +0100
mvn4 aggregator
---
pom.xml | 8 ++++----
.../java/org/apache/maven/shared/filtering/MavenFileFilter.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1243429..52414f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
</parent>
<artifactId>maven-filtering</artifactId>
@@ -54,8 +54,8 @@
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-08-05T15:18:01Z</project.build.outputTimestamp>
</properties>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
index 9c6f7a1..109ece0 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
@@ -47,7 +47,7 @@ public interface MavenFileFilter
* @throws MavenFilteringException in case of failure.
* @see DefaultFilterInfo#getDefaultFilterWrappers(MavenProject, List, boolean,MavenSession, MavenResourcesExecution)
*/
- void copyFile( File from, final File to, boolean filtering, MavenProject mavenProject, List<String> filters,
+ void copyFile( File from, File to, boolean filtering, MavenProject mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession )
throws MavenFilteringException;
@@ -67,7 +67,7 @@ public interface MavenFileFilter
* @param encoding The encoding used during the filtering.
* @throws MavenFilteringException In case of an error.
*/
- void copyFile( File from, final File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
+ void copyFile( File from, File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
String encoding )
throws MavenFilteringException;
@@ -81,7 +81,7 @@ public interface MavenFileFilter
* @throws MavenFilteringException In case of an error.
* @since 1.0-beta-2
*/
- void copyFile( File from, final File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
+ void copyFile( File from, File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
String encoding, boolean overwrite )
throws MavenFilteringException;
}