Author: cos
Date: Thu Jan 23 22:35:16 2014
New Revision: 1560834
URL: http://svn.apache.org/r1560834
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files /
refactoring. Contributed by Mikhail Antonov.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.3/hadoop-project/pom.xml
hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.3/pom.xml
Modified: hadoop/common/branches/branch-2.3/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-project/pom.xml?rev=1560834&r1=1560833&r2=1560834&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.3/hadoop-project/pom.xml Thu Jan 23
22:35:16 2014
@@ -39,10 +39,6 @@
<!-- number of threads/forks to use when running tests in parallel, see
parallel-tests profile -->
<testsThreadCount>4</testsThreadCount>
- <!-- platform encoding override -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
<!-- These 2 versions are defined here becuase they are used -->
<!-- JDIFF generation from embedded ant in the antrun plugin -->
<jdiff.version>1.0.9</jdiff.version>
Modified: hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml?rev=1560834&r1=1560833&r2=1560834&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml
(original)
+++ hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml Thu
Jan 23 22:35:16 2014
@@ -33,7 +33,6 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
Modified: hadoop/common/branches/branch-2.3/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/pom.xml?rev=1560834&r1=1560833&r2=1560834&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/pom.xml (original)
+++ hadoop/common/branches/branch-2.3/pom.xml Thu Jan 23 22:35:16 2014
@@ -85,6 +85,10 @@ xsi:schemaLocation="http://maven.apache.
<distMgmtStagingId>apache.staging.https</distMgmtStagingId>
<distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
+
+ <!-- platform encoding override -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<modules>
