Author: khmarbaise
Date: Sun Dec 6 21:21:06 2015
New Revision: 1718224
URL: http://svn.apache.org/viewvc?rev=1718224&view=rev
Log:
[MASSEMBLY-790] Upgrade
maven-archiver/maven-filtering/maven-common-artifact-filters to 3.0.0
Upgrade maven-archiver to 3.0.0
Upgrade maven-filtering to 3.0.0
Upgrade maven-common-artifact-filters to 3.0.0
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1718224&r1=1718223&r2=1718224&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun Dec 6 21:21:06 2015
@@ -62,8 +62,8 @@ under the License.
<maven.compiler.target>1.6</maven.compiler.target>
<mdoVersion>1.1.3</mdoVersion>
- <mavenArchiverVersion>2.5</mavenArchiverVersion>
- <mavenFilteringVersion>1.3</mavenFilteringVersion>
+ <mavenArchiverVersion>3.0.0</mavenArchiverVersion>
+ <mavenFilteringVersion>3.0.0</mavenFilteringVersion>
<mavenVersion>3.0</mavenVersion>
<testOutputToFile>true</testOutputToFile>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod</checkstyle.violation.ignore>
@@ -108,7 +108,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.4</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java?rev=1718224&r1=1718223&r2=1718224&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
Sun Dec 6 21:21:06 2015
@@ -52,7 +52,8 @@ public class ReaderFormatter
MavenReaderFilterRequest filterRequest =
new MavenReaderFilterRequest( source, true,
configSource.getProject(), configSource.getFilters(),
- isPropertiesFile, null,
configSource.getMavenSession(), null );
+ isPropertiesFile,
configSource.getMavenSession(), null );
+
filterRequest.setEscapeString( escapeString );
// if these are NOT set, just use the defaults, which are '${*}'
and '@'.
