You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/11/17 11:40:17 UTC
ant git commit: Fix backwards compatibility
Repository: ant
Updated Branches:
refs/heads/master 1e30b48a0 -> c5b8dab91
Fix backwards compatibility
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c5b8dab9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c5b8dab9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c5b8dab9
Branch: refs/heads/master
Commit: c5b8dab9103b225f72523939652bdc6356f0937c
Parents: 1e30b48
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Nov 17 12:39:27 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Nov 17 12:39:27 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Jar.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Manifest.java | 13 ++++++++-----
.../org/apache/tools/ant/taskdefs/ManifestTask.java | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/c5b8dab9/src/main/org/apache/tools/ant/taskdefs/Jar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 53e333b..0a43fbd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -533,7 +533,7 @@ public class Jar extends Zip {
JAR_MARKER);
// time to write the manifest
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OutputStreamWriter osw = new OutputStreamWriter(baos, Manifest.JAR_ENCODING);
+ OutputStreamWriter osw = new OutputStreamWriter(baos, Manifest.JAR_CHARSET);
PrintWriter writer = new PrintWriter(osw);
manifest.write(writer, flattenClassPaths);
if (writer.checkError()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/c5b8dab9/src/main/org/apache/tools/ant/taskdefs/Manifest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 3f17aed..db38cdc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -91,8 +91,11 @@ public class Manifest {
public static final String ERROR_FROM_FORBIDDEN = "Manifest attributes should not start "
+ "with \"" + ATTRIBUTE_FROM + "\" in \"";
+ /** Charset to be used for JAR files. */
+ public static final Charset JAR_CHARSET = StandardCharsets.UTF_8;
/** Encoding to be used for JAR files. */
- public static final Charset JAR_ENCODING = StandardCharsets.UTF_8;
+ @Deprecated
+ public static final String JAR_ENCODING = JAR_CHARSET.name();
private static final String ATTRIBUTE_MANIFEST_VERSION_LC =
ATTRIBUTE_MANIFEST_VERSION.toLowerCase(Locale.ENGLISH);
@@ -342,7 +345,7 @@ public class Manifest {
private void writeValue(PrintWriter writer, String value)
throws IOException {
String line;
- int nameLength = name.getBytes(JAR_ENCODING).length;
+ int nameLength = name.getBytes(JAR_CHARSET).length;
if (nameLength > MAX_NAME_VALUE_LENGTH) {
if (nameLength > MAX_NAME_LENGTH) {
throw new IOException("Unable to write manifest line "
@@ -353,14 +356,14 @@ public class Manifest {
} else {
line = name + ": " + value;
}
- while (line.getBytes(JAR_ENCODING).length > MAX_SECTION_LENGTH) {
+ while (line.getBytes(JAR_CHARSET).length > MAX_SECTION_LENGTH) {
// try to find a MAX_LINE_LENGTH byte section
int breakIndex = MAX_SECTION_LENGTH;
if (breakIndex >= line.length()) {
breakIndex = line.length() - 1;
}
String section = line.substring(0, breakIndex);
- while (section.getBytes(JAR_ENCODING).length > MAX_SECTION_LENGTH
+ while (section.getBytes(JAR_CHARSET).length > MAX_SECTION_LENGTH
&& breakIndex > 0) {
breakIndex--;
section = line.substring(0, breakIndex);
@@ -756,7 +759,7 @@ public class Manifest {
throw new BuildException("Could not find default manifest: %s",
defManifest);
}
- Manifest defaultManifest = new Manifest(new InputStreamReader(in, JAR_ENCODING));
+ Manifest defaultManifest = new Manifest(new InputStreamReader(in, JAR_CHARSET));
String version = System.getProperty("java.runtime.version");
if (version == null) {
version = System.getProperty("java.vm.version");
http://git-wip-us.apache.org/repos/asf/ant/blob/c5b8dab9/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
index d90a049..a96a84d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
@@ -264,7 +264,7 @@ public class ManifestTask extends Task {
}
try (PrintWriter w = new PrintWriter(new OutputStreamWriter(
- Files.newOutputStream(manifestFile.toPath()), Manifest.JAR_ENCODING))) {
+ Files.newOutputStream(manifestFile.toPath()), Manifest.JAR_CHARSET))) {
toWrite.write(w, flattenClassPaths);
if (w.checkError()) {
throw new IOException("Encountered an error writing manifest");