You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/10/01 11:24:42 UTC
[maven-ear-plugin] branch master updated: Bump filtering from 3.2.0 to 3.3.0
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fe25b83 Bump filtering from 3.2.0 to 3.3.0
fe25b83 is described below
commit fe25b838cb1920e76e7890c11562187999ffac90
Author: Piotrek Żygieło <pz...@users.noreply.github.com>
AuthorDate: Fri Sep 30 13:24:06 2022 +0200
Bump filtering from 3.2.0 to 3.3.0
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 86f501f..c6d9354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<properties>
<mavenArchiverVersion>3.5.1</mavenArchiverVersion>
- <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
+ <mavenFilteringVersion>3.3.0</mavenFilteringVersion>
<mavenVersion>3.1.1</mavenVersion>
<javaVersion>8</javaVersion>
<mavenWarPluginVersion>3.3.1</mavenWarPluginVersion>
diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index 8ce8277..693567d 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -55,6 +55,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.ear.util.EarMavenArchiver;
import org.apache.maven.plugins.ear.util.JavaEEVersion;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.shared.filtering.FilterWrapper;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
@@ -303,7 +304,7 @@ public class EarMojo
@Parameter( defaultValue = "${session}", readonly = true, required = true )
private MavenSession session;
- private List<FileUtils.FilterWrapper> filterWrappers;
+ private List<FilterWrapper> filterWrappers;
/**
* @since 2.9
@@ -743,7 +744,7 @@ public class EarMojo
return !mavenResourcesFiltering.filteredFileExtension( fileName, nonFilteredFileExtensions );
}
- private List<FileUtils.FilterWrapper> getFilterWrappers()
+ private List<FilterWrapper> getFilterWrappers()
throws MojoExecutionException
{
if ( filterWrappers == null )