diff --git a/pom.xml b/pom.xml
index dce6def..d30f965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,19 +97,26 @@ under the License.
maven-model
${mavenVersion}
-
org.apache.maven.plugin-tools
maven-plugin-annotations
provided
-
org.codehaus.plexus
- plexus-utils
- 3.3.0
+ plexus-component-annotations
+
+
+ org.codehaus.plexus
+ plexus-interpolation
+ 1.26
+ runtime
+
+
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
+ 0.0.0.M2a
-
org.apache.maven.shared
maven-filtering
@@ -122,11 +129,11 @@ under the License.
2.6
compile
-
- org.codehaus.plexus
- plexus-interpolation
- 1.26
+ org.apache.commons
+ commons-lang3
+ 3.8.1
+ compile
@@ -147,6 +154,19 @@ under the License.
4.13
test
+
+ org.codehaus.plexus
+ plexus-utils
+ 3.3.0
+ test
+
+
+ org.eclipse.aether
+ aether-api
+ 0.9.0.M2
+ test
+
+
diff --git a/src/it/MRESOURCES-257/verify.groovy b/src/it/MRESOURCES-257/verify.groovy
index dab0203..6f88c82 100644
--- a/src/it/MRESOURCES-257/verify.groovy
+++ b/src/it/MRESOURCES-257/verify.groovy
@@ -20,4 +20,5 @@ assert new File(basedir, 'target/classes/test.txt').exists();
content = new File(basedir, 'target/classes/test.txt').text;
assert content.contains( 'jdoe@example.com' );
+assert content.contains( 'orga' );
return true;
diff --git a/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
index 9fbbe35..a350a44 100644
--- a/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
@@ -45,8 +46,6 @@
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
/**
* Copy resources for the main source code to the main output directory. Always uses the project.build.resources element
@@ -311,16 +310,16 @@ public void execute()
return;
}
- if ( StringUtils.isEmpty( encoding ) && isFilteringEnabled( getResources() ) )
+ if ( StringUtils.isBlank( encoding ) && isFilteringEnabled( getResources() ) )
{
- getLog().warn( "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
- + ", i.e. build is platform dependent!" );
- getLog().warn( "Please take a look into the FAQ: https://maven.apache.org/general.html#encoding-warning" );
+ getLog().warn( "File encoding has not been set, using platform encoding "
+ + System.getProperty( "file.encoding" )
+ + ". Build is platform dependent!" );
+ getLog().warn( "See https://maven.apache.org/general.html#encoding-warning" );
}
try
{
-
List combinedFilters = getCombinedFiltersList();
MavenResourcesExecution mavenResourcesExecution =