You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2003/02/18 13:21:43 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Manifest.java
conor 2003/02/18 04:21:43
Modified: . Tag: ANT_15_BRANCH build.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Manifest.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.304.2.44 +1 -1 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.304.2.43
retrieving revision 1.304.2.44
diff -u -w -u -r1.304.2.43 -r1.304.2.44
--- build.xml 6 Feb 2003 12:09:19 -0000 1.304.2.43
+++ build.xml 18 Feb 2003 12:21:42 -0000 1.304.2.44
@@ -631,7 +631,7 @@
</copy>
<copy todir="${build.classes}"
- overwrite="true">
+ overwrite="true" encoding="UTF-8">
<fileset dir="${java.dir}">
<include name="**/version.txt"/>
<include name="**/defaultManifest.mf"/>
No revision
No revision
1.33.2.9 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.33.2.8
retrieving revision 1.33.2.9
diff -u -w -u -r1.33.2.8 -r1.33.2.9
--- Manifest.java 10 Feb 2003 14:24:44 -0000 1.33.2.8
+++ Manifest.java 18 Feb 2003 12:21:43 -0000 1.33.2.9
@@ -732,7 +732,7 @@
}
try {
Manifest defaultManifest
- = new Manifest(new InputStreamReader(in, "ASCII"));
+ = new Manifest(new InputStreamReader(in, "UTF-8"));
Attribute createdBy = new Attribute("Created-By",
System.getProperty("java.vm.version") + " ("
+ System.getProperty("java.vm.vendor") + ")" );