Author: khmarbaise
Date: Wed Feb 10 19:31:00 2016
New Revision: 1729697
URL: http://svn.apache.org/viewvc?rev=1729697&view=rev
Log:
[MRAR-51] Moved code into maven-filtering
o Moved code which belong to maven-filtering to
maven-filtering.
Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1729697&r1=1729696&r2=1729697&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Wed Feb 10 19:31:00 2016
@@ -104,7 +104,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java?rev=1729697&r1=1729696&r2=1729697&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
Wed Feb 10 19:31:00 2016
@@ -210,7 +210,7 @@ public class RarMojo
* @since 2.3
*/
@Parameter
- protected List<String> delimiters;
+ protected LinkedHashSet<String> delimiters;
/**
* The list of extra filter properties files to be used along with System
properties,
@@ -418,32 +418,7 @@ public class RarMojo
mavenResourcesExecution.setOverwrite( overwrite );
mavenResourcesExecution.setIncludeEmptyDirs( includeEmptyDirs );
mavenResourcesExecution.setSupportMultiLineFiltering(
supportMultiLineFiltering );
-
- // if these are NOT set, just use the defaults, which are '${*}' and
'@'.
- if ( delimiters != null && !delimiters.isEmpty() )
- {
- LinkedHashSet<String> delims = new LinkedHashSet<String>();
- if ( useDefaultDelimiters )
- {
- //noinspection unchecked
- delims.addAll( mavenResourcesExecution.getDelimiters() );
- }
-
- for ( String delim : delimiters )
- {
- if ( delim == null )
- {
- // FIXME: ${filter:*} could also trigger this condition.
Need a better long-term solution.
- delims.add( "${*}" );
- }
- else
- {
- delims.add( delim );
- }
- }
-
- mavenResourcesExecution.setDelimiters( delims );
- }
+ mavenResourcesExecution.setDelimiters( delimiters,
useDefaultDelimiters );
if ( nonFilteredFileExtensions != null )
{
