You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/04/04 18:57:05 UTC
svn commit: r644772 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
Author: bentmann
Date: Fri Apr 4 09:57:00 2008
New Revision: 644772
URL: http://svn.apache.org/viewvc?rev=644772&view=rev
Log:
[MSHADE-27] Use platform-independent file encoding for processing of NOTICE file
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=644772&r1=644771&r2=644772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java Fri Apr 4 09:57:00 2008
@@ -61,6 +61,11 @@
String copyright;
+ /**
+ * The file encoding of the <code>NOTICE</code> file.
+ */
+ String encoding = "ISO-8859-1";
+
private static final String NOTICE_PATH = "meta-inf/notice";
private static final String NOTICE_TXT_PATH = "meta-inf/notice.txt";
@@ -102,7 +107,7 @@
}
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ BufferedReader reader = new BufferedReader( new InputStreamReader( is, encoding ) );
String line = reader.readLine();
StringBuffer sb = new StringBuffer();
@@ -187,8 +192,8 @@
{
jos.putNextEntry( new JarEntry( "META-INF/NOTICE" ) );
- OutputStreamWriter pow = new OutputStreamWriter( jos );
- PrintWriter writer = new PrintWriter(pow);
+ OutputStreamWriter pow = new OutputStreamWriter( jos, encoding );
+ PrintWriter writer = new PrintWriter( pow );
int count = 0;
for ( Iterator itr = entries.iterator() ; itr.hasNext() ; )