[MRESOURCES-194] Upgrade to maven-parent version 26
- Fixed some checkstyle reported issues.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1639943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 1313ebe..4948056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
diff --git a/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java b/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
index 37dacbc..c99253c 100644
--- a/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
@@ -29,10 +29,9 @@
/**
* @deprecated use classes in the component maven-filtering
- * TODO remove the class ?
+ * TODO remove the class ?
* @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
* @author William Ferguson
- *
*/
public final class PropertyUtils
{
@@ -85,10 +84,11 @@
// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)
// with the commented variant I have provided that reuses this method.
- for (Object o : fileProps.keySet()) {
+ for ( Object o : fileProps.keySet() )
+ {
final String k = (String) o;
- final String propValue = getPropertyValue(k, combinedProps);
- fileProps.setProperty(k, propValue);
+ final String propValue = getPropertyValue( k, combinedProps );
+ fileProps.setProperty( k, propValue );
}
return fileProps;
@@ -137,7 +137,6 @@
/**
* Retrieves a property value, replacing values like ${token}
* using the Properties to look them up.
- *
* It will leave unresolved properties alone, trying for System
* properties, and implements reparsing (in the case that
* the value of a property contains a key), and will
diff --git a/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java b/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
index ffa7640..5219584 100644
--- a/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
@@ -48,8 +48,8 @@
import java.util.List;
/**
- * Copy resources for the main source code to the main output directory.
- * Always uses the project.build.resources element to specify the resources to copy.
+ * Copy resources for the main source code to the main output directory. Always uses the project.build.resources element
+ * to specify the resources to copy.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -87,9 +87,8 @@
protected MavenProject project;
/**
- * The list of additional filter properties files to be used along with System and project
- * properties, which would be used for the filtering.
- * <br/>
+ * The list of additional filter properties files to be used along with System and project properties, which would
+ * be used for the filtering. <br/>
* See also: {@link ResourcesMojo#filters}.
*
* @since 2.4
@@ -98,24 +97,21 @@
protected List<String> buildFilters;
/**
- * The list of extra filter properties files to be used along with System properties,
- * project properties, and filter properties files specified in the POM build/filters section,
- * which should be used for the filtering during the current mojo execution.
- * <br/>
- * Normally, these will be configured from a plugin's execution section, to provide a different
- * set of filters for a particular execution. For instance, starting in Maven 2.2.0, you have the
- * option of configuring executions with the id's <code>default-resources</code> and
- * <code>default-testResources</code> to supply different configurations for the two
- * different types of resources. By supplying <code>extraFilters</code> configurations, you
- * can separate which filters are used for which type of resource.
+ * The list of extra filter properties files to be used along with System properties, project properties, and filter
+ * properties files specified in the POM build/filters section, which should be used for the filtering during the
+ * current mojo execution. <br/>
+ * Normally, these will be configured from a plugin's execution section, to provide a different set of filters for a
+ * particular execution. For instance, starting in Maven 2.2.0, you have the option of configuring executions with
+ * the id's <code>default-resources</code> and <code>default-testResources</code> to supply different configurations
+ * for the two different types of resources. By supplying <code>extraFilters</code> configurations, you can separate
+ * which filters are used for which type of resource.
*/
@Parameter
protected List<String> filters;
/**
- * If false, don't use the filters specified in the build/filters section of the POM when
- * processing resources in this mojo execution.
- * <br/>
+ * If false, don't use the filters specified in the build/filters section of the POM when processing resources in
+ * this mojo execution. <br/>
* See also: {@link ResourcesMojo#buildFilters} and {@link ResourcesMojo#filters}
*
* @since 2.4
@@ -136,8 +132,7 @@
protected MavenSession session;
/**
- * Expression preceded with the String won't be interpolated
- * \${foo} will be replaced with ${foo}
+ * Expression preceded with the String won't be interpolated \${foo} will be replaced with ${foo}
*
* @since 2.3
*/
@@ -178,11 +173,13 @@
/**
* <p>
- * Set of delimiters for expressions to filter within the resources. These delimiters are specified in the
- * form 'beginToken*endToken'. If no '*' is given, the delimiter is assumed to be the same for start and end.
- * </p><p>
+ * Set of delimiters for expressions to filter within the resources. These delimiters are specified in the form
+ * 'beginToken*endToken'. If no '*' is given, the delimiter is assumed to be the same for start and end.
+ * </p>
+ * <p>
* So, the default filtering delimiters might be specified as:
* </p>
+ *
* <pre>
* <delimiters>
* <delimiter>${*}</delimiter>
@@ -206,8 +203,9 @@
/**
* <p>
- * List of plexus components hint which implements {@link MavenResourcesFiltering#filterResources(MavenResourcesExecution)}.
- * They will be executed after the resources copying/filtering.
+ * List of plexus components hint which implements
+ * {@link MavenResourcesFiltering#filterResources(MavenResourcesExecution)}. They will be executed after the
+ * resources copying/filtering.
* </p>
*
* @since 2.4
@@ -233,6 +231,14 @@
@Parameter( property = "maven.resources.supportMultiLineFiltering", defaultValue = "false" )
private boolean supportMultiLineFiltering;
+ /**
+ * Support filtering of filenames folders etc.
+ *
+ * @since 2.8
+ */
+ @Parameter( defaultValue = "false" )
+ private boolean fileNameFiltering;
+
public void contextualize( Context context )
throws ContextException
{
@@ -267,6 +273,7 @@
mavenResourcesExecution.setOverwrite( overwrite );
mavenResourcesExecution.setIncludeEmptyDirs( includeEmptyDirs );
mavenResourcesExecution.setSupportMultiLineFiltering( supportMultiLineFiltering );
+ mavenResourcesExecution.setFilterFilenames( fileNameFiltering );
// if these are NOT set, just use the defaults, which are '${*}' and '@'.
if ( delimiters != null && !delimiters.isEmpty() )
@@ -320,9 +327,10 @@
{
try
{
- mavenFilteringComponents.add(
- (MavenResourcesFiltering) plexusContainer.lookup( MavenResourcesFiltering.class.getName(),
- hint ) );
+ // CHECKSTYLE_OFF: LineLength
+ mavenFilteringComponents.add( (MavenResourcesFiltering) plexusContainer.lookup( MavenResourcesFiltering.class.getName(),
+ hint ) );
+ // CHECKSTYLE_ON: LineLength
}
catch ( ComponentLookupException e )
{
