From commits-return-3719-archive-asf-public=cust-asf.ponee.io@creadur.apache.org Thu Jan 4 23:40:45 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 92F52180657 for ; Thu, 4 Jan 2018 23:40:45 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 82E47160C2B; Thu, 4 Jan 2018 22:40:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C703F160C18 for ; Thu, 4 Jan 2018 23:40:44 +0100 (CET) Received: (qmail 90852 invoked by uid 500); 4 Jan 2018 22:40:44 -0000 Mailing-List: contact commits-help@creadur.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@creadur.apache.org Delivered-To: mailing list commits@creadur.apache.org Received: (qmail 90843 invoked by uid 99); 4 Jan 2018 22:40:43 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2018 22:40:43 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 242733A0168 for ; Thu, 4 Jan 2018 22:40:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1820237 - in /creadur/rat/trunk: apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java src/changes/changes.xml Date: Thu, 04 Jan 2018 22:40:38 -0000 To: commits@creadur.apache.org From: pottlinger@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180104224042.242733A0168@svn01-us-west.apache.org> Author: pottlinger Date: Thu Jan 4 22:40:38 2018 New Revision: 1820237 URL: http://svn.apache.org/viewvc?rev=1820237&view=rev Log: RAT-242: Use UTF-8 as default encoding for written reports Thanks to Matthias Bläsing https://github.com/apache/creadur-rat/pull/8 Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java creadur/rat/trunk/src/changes/changes.xml Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java?rev=1820237&r1=1820236&r2=1820237&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java (original) +++ creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java Thu Jan 4 22:40:38 2018 @@ -34,9 +34,12 @@ import org.apache.rat.report.claim.Claim import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.nio.charset.Charset; /** * Run Rat to perform a violation check. @@ -99,9 +102,11 @@ public class RatCheckMojo extends Abstra private ClaimStatistic getRawReport() throws MojoExecutionException, MojoFailureException { - FileWriter fw = null; + Writer fw = null; try { - fw = new FileWriter(reportFile); + fw = new OutputStreamWriter( + new FileOutputStream(reportFile), + Charset.forName("UTF-8")); final ClaimStatistic statistic = createReport(fw, getStyleSheet()); fw.close(); fw = null; Modified: creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java?rev=1820237&r1=1820236&r2=1820237&view=diff ============================================================================== --- creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java (original) +++ creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java Thu Jan 4 22:40:38 2018 @@ -31,19 +31,20 @@ package org.apache.rat.anttasks; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Resource; - import org.apache.tools.ant.types.ResourceCollection; - import org.apache.tools.ant.types.resources.Union; - import org.apache.tools.ant.util.FileUtils; - - import javax.xml.transform.TransformerException; - import java.io.File; - import java.io.FileWriter; - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStreamWriter; - import java.io.PrintWriter; - import java.util.ArrayList; - import java.util.List; +import org.apache.tools.ant.types.ResourceCollection; +import org.apache.tools.ant.types.resources.Union; +import org.apache.tools.ant.util.FileUtils; + +import javax.xml.transform.TransformerException; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; /** * A basic Ant task that generates a report on all files specified by @@ -188,8 +189,8 @@ public class Report extends Task { if (reportFile == null) { out = new PrintWriter( new OutputStreamWriter( - new LogOutputStream(this, Project.MSG_INFO) - ) + new LogOutputStream(this, Project.MSG_INFO), + Charset.forName("UTF-8")) ); } else { out = new PrintWriter(new FileWriter(reportFile)); Modified: creadur/rat/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/creadur/rat/trunk/src/changes/changes.xml?rev=1820237&r1=1820236&r2=1820237&view=diff ============================================================================== --- creadur/rat/trunk/src/changes/changes.xml (original) +++ creadur/rat/trunk/src/changes/changes.xml Thu Jan 4 22:40:38 2018 @@ -55,6 +55,9 @@ The type attribute can be add,u + + Use UTF-8 as default encoding for RAT Ant reports. + Do not treat TypeScript files as binary.