Stop using deprecated Constants.CHARACTER_ENCODING

Change-Id: I105b8a05bc64f249879a0795a059958553cc60c6
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
index b131808318c4e323917b95a7275d20a3df9d13a0..61ab0428905ea22a68d630d6ca8d2948c087ba75 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
@@ -302,7 +302,7 @@ public class MergeAlgorithmTest {
                MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT,
                                T(commonBase), T(ours), T(theirs));
                ByteArrayOutputStream bo=new ByteArrayOutputStream(50);
-               fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING);
+               fmt.formatMerge(bo, r, "B", "O", "T", UTF_8.name());
                return new String(bo.toByteArray(), UTF_8);
        }
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index d4282e0b85273cea4bcf3857ad2171d60092e4eb..e37f2073155e758609ad7363304db4eef034cb69 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -46,11 +46,11 @@
  */
 package org.eclipse.jgit.merge;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.time.Instant.EPOCH;
 import static org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm.HISTOGRAM;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFF_SECTION;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_ALGORITHM;
-import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
 import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
 
 import java.io.BufferedOutputStream;
@@ -1029,7 +1029,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                db != null ? nonNullRepo().getDirectory() : null, inCoreLimit);
                try {
                        new MergeFormatter().formatMerge(buf, result,
-                                       Arrays.asList(commitNames), CHARACTER_ENCODING);
+                                       Arrays.asList(commitNames), UTF_8.name());
                        buf.close();
                } catch (IOException e) {
                        buf.destroy();