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/08/03 12:10:02 UTC

[1/5] ant-ivy git commit: Unused imports

Repository: ant-ivy
Updated Branches:
  refs/heads/master 5918182e0 -> c21193ae1


Unused imports

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d67de452
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d67de452
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d67de452

Branch: refs/heads/master
Commit: d67de4529361899403b1c35db0feeaacaa1803ee
Parents: 5918182
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 3 12:17:50 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 3 12:17:50 2018 +0200

----------------------------------------------------------------------
 test/java/org/apache/ivy/MainTest.java                    | 2 --
 test/java/org/apache/ivy/core/module/id/ModuleIdTest.java | 1 -
 2 files changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d67de452/test/java/org/apache/ivy/MainTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/MainTest.java b/test/java/org/apache/ivy/MainTest.java
index 60e3d0b..d954350 100644
--- a/test/java/org/apache/ivy/MainTest.java
+++ b/test/java/org/apache/ivy/MainTest.java
@@ -18,8 +18,6 @@
 package org.apache.ivy;
 
 import org.apache.ivy.core.retrieve.RetrieveOptions;
-import org.apache.ivy.core.settings.IvySettings;
-import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser;
 import org.apache.ivy.util.CacheCleaner;
 import org.apache.ivy.util.cli.CommandLine;
 import org.apache.ivy.util.cli.ParseException;

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d67de452/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java b/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
index 6194e39..3095e15 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
@@ -20,7 +20,6 @@ package org.apache.ivy.core.module.id;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;


[4/5] ant-ivy git commit: Useless casts

Posted by gi...@apache.org.
Useless casts

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/27a3549a
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/27a3549a
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/27a3549a

Branch: refs/heads/master
Commit: 27a3549ae7d628ae2333f8af82e9a3ca01a08549
Parents: 93f11da
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 3 13:57:33 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 3 13:57:33 2018 +0200

----------------------------------------------------------------------
 .../repository/ssh/AbstractSshBasedRepository.java        | 10 ++++------
 .../org/apache/ivy/plugins/resolver/BasicResolver.java    |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/27a3549a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java
index 7bacf8c..4edc2d5 100644
--- a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java
+++ b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java
@@ -182,9 +182,9 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository {
      * @return credentials for given host
      **/
     private Credentials requestCredentials(String host) {
-        Object o = credentialsCache.get(host);
-        if (o == null) {
-            Credentials c = CredentialsUtil.promptCredentials(new Credentials(null, host, user,
+        Credentials c = credentialsCache.get(host);
+        if (c == null) {
+            c = CredentialsUtil.promptCredentials(new Credentials(null, host, user,
                     userPassword), getPassFile());
             if (c != null) {
                 if (credentialsCache.size() > MAX_CREDENTIALS_CACHE_SIZE) {
@@ -192,10 +192,8 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository {
                 }
                 credentialsCache.put(host, c);
             }
-            return c;
-        } else {
-            return (Credentials) o;
         }
+        return c;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/27a3549a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
index b68b465..ac318d1 100644
--- a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
@@ -708,15 +708,14 @@ public abstract class BasicResolver extends AbstractResolver {
                 continue;
             }
             if (versionMatcher.needModuleDescriptor(mrid, foundMrid)) {
-                ResolvedResource r = rmdparser.parse(rres.getResource(), rres.getRevision());
+                MDResolvedResource r = rmdparser.parse(rres.getResource(), rres.getRevision());
                 if (r == null) {
                     Message.debug("\t" + name + ": impossible to get module descriptor resource: "
                             + rres);
                     rejected.add(rres.getRevision() + " (no or bad MD)");
                     continue;
                 }
-                ModuleDescriptor md = ((MDResolvedResource) r).getResolvedModuleRevision()
-                        .getDescriptor();
+                ModuleDescriptor md = r.getResolvedModuleRevision().getDescriptor();
                 if (md.isDefault()) {
                     Message.debug("\t" + name + ": default md rejected by version matcher"
                             + "requiring module descriptor: " + rres);


[5/5] ant-ivy git commit: Redundant string length calculation

Posted by gi...@apache.org.
Redundant string length calculation

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c21193ae
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c21193ae
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c21193ae

Branch: refs/heads/master
Commit: c21193ae13a78afff783efb0bab15ba6e7e352bf
Parents: 27a3549
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 3 14:00:59 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 3 14:00:59 2018 +0200

----------------------------------------------------------------------
 src/java/org/apache/ivy/osgi/util/ZipUtil.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c21193ae/src/java/org/apache/ivy/osgi/util/ZipUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/util/ZipUtil.java b/src/java/org/apache/ivy/osgi/util/ZipUtil.java
index df03207..a127269 100644
--- a/src/java/org/apache/ivy/osgi/util/ZipUtil.java
+++ b/src/java/org/apache/ivy/osgi/util/ZipUtil.java
@@ -48,8 +48,7 @@ public class ZipUtil {
             }
         } else {
             final String strAbsPath = currDir.getPath();
-            final String strZipEntryName = strAbsPath.substring(rootDir.getPath().length() + 1,
-                strAbsPath.length());
+            final String strZipEntryName = strAbsPath.substring(rootDir.getPath().length() + 1);
 
             final byte[] b = new byte[(int) (currDir.length())];
             final FileInputStream fis = new FileInputStream(currDir);


[3/5] ant-ivy git commit: Use try with resources

Posted by gi...@apache.org.
Use try with resources

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/93f11da8
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/93f11da8
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/93f11da8

Branch: refs/heads/master
Commit: 93f11da846cb97cd940de5826925fe15b1200e94
Parents: b5b177b
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 3 13:54:24 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 3 13:54:24 2018 +0200

----------------------------------------------------------------------
 src/java/org/apache/ivy/ant/IvyReport.java | 22 ++--------------------
 test/java/org/apache/ivy/TestHelper.java   | 12 +-----------
 2 files changed, 3 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/93f11da8/src/java/org/apache/ivy/ant/IvyReport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyReport.java b/src/java/org/apache/ivy/ant/IvyReport.java
index 62217d5..cfac8df 100644
--- a/src/java/org/apache/ivy/ant/IvyReport.java
+++ b/src/java/org/apache/ivy/ant/IvyReport.java
@@ -341,31 +341,13 @@ public class IvyReport extends IvyTask {
                     }
                 }
 
-                InputStream inStream = null;
-                OutputStream outStream = null;
-                try {
-                    inStream = new BufferedInputStream(new FileInputStream(reportFile));
-                    outStream = new BufferedOutputStream(new FileOutputStream(outFile));
+                try (InputStream inStream = new BufferedInputStream(new FileInputStream(reportFile));
+                     OutputStream outStream = new BufferedOutputStream(new FileOutputStream(outFile))) {
                     StreamResult res = new StreamResult(outStream);
                     Source src = new StreamSource(inStream, JAXPUtils.getSystemId(style));
                     transformer.transform(src, res);
                 } catch (TransformerException e) {
                     throw new BuildException(e);
-                } finally {
-                    if (inStream != null) {
-                        try {
-                            inStream.close();
-                        } catch (IOException e) {
-                            // ignore
-                        }
-                    }
-                    if (outStream != null) {
-                        try {
-                            outStream.close();
-                        } catch (IOException e) {
-                            // ignore
-                        }
-                    }
                 }
             }
         } catch (TransformerConfigurationException e) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/93f11da8/test/java/org/apache/ivy/TestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java
index 5ffe8ac..066e419 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -497,9 +497,7 @@ public class TestHelper {
      * after this method since the associated socket is released and some other process can now use it.
      */
     public static int getMaybeAvailablePort() {
-        ServerSocket s = null;
-        try {
-            s = new ServerSocket(0);
+        try (ServerSocket s = new ServerSocket(0)) {
             s.setReuseAddress(true);
             int port = s.getLocalPort();
             try {
@@ -510,14 +508,6 @@ public class TestHelper {
             return port;
         } catch (IOException e) {
             // ignore
-        } finally {
-            if (s != null) {
-                try {
-                    s.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
         }
         throw new IllegalStateException("Not TCP/IP port available");
     }


[2/5] ant-ivy git commit: Use StandardCharsets

Posted by gi...@apache.org.
Use StandardCharsets

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/b5b177b8
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/b5b177b8
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/b5b177b8

Branch: refs/heads/master
Commit: b5b177b84d6e02fe88054699b6e2c2dca2852289
Parents: d67de45
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 3 12:20:40 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 3 12:20:40 2018 +0200

----------------------------------------------------------------------
 .../apache/ivy/core/cache/DefaultRepositoryCacheManager.java | 8 ++------
 src/java/org/apache/ivy/osgi/core/ManifestParser.java        | 3 ++-
 .../ivy/plugins/parser/m2/PomModuleDescriptorWriter.java     | 3 ++-
 src/java/org/apache/ivy/plugins/parser/m2/PomReader.java     | 3 ++-
 .../ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java   | 3 ++-
 .../ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java    | 3 ++-
 .../ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java | 6 +++---
 7 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
index b85e9a8..540cf92 100644
--- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
@@ -1188,12 +1189,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
      * @return the hash
      */
     private String computeResourceNameHash(Resource resource) {
-        try {
-            byte[] shaDigest = SHA_DIGEST.digest(resource.getName().getBytes("UTF-8"));
-            return HexEncoder.encode(shaDigest);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("UTF-8 not supported", e);
-        }
+        return HexEncoder.encode(SHA_DIGEST.digest(resource.getName().getBytes(StandardCharsets.UTF_8)));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/osgi/core/ManifestParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/ManifestParser.java b/src/java/org/apache/ivy/osgi/core/ManifestParser.java
index 5192ecd..ee8e3ce 100644
--- a/src/java/org/apache/ivy/osgi/core/ManifestParser.java
+++ b/src/java/org/apache/ivy/osgi/core/ManifestParser.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.List;
 import java.util.jar.Attributes;
@@ -93,7 +94,7 @@ public class ManifestParser {
     }
 
     public static BundleInfo parseManifest(String manifest) throws IOException, ParseException {
-        ByteArrayInputStream bais = new ByteArrayInputStream(manifest.getBytes("UTF-8"));
+        ByteArrayInputStream bais = new ByteArrayInputStream(manifest.getBytes(StandardCharsets.UTF_8));
         BundleInfo parseManifest = parseManifest(bais);
         bais.close();
         return parseManifest;

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
index e53bda7..bea105a 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
@@ -25,6 +25,7 @@ import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -82,7 +83,7 @@ public final class PomModuleDescriptorWriter {
             output.getParentFile().mkdirs();
         }
         PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(output),
-                "UTF-8"));
+                StandardCharsets.UTF_8));
         try {
             IvySettings settings = IvyContext.getContext().getSettings();
             IvyVariableContainer variables = new IvyVariableContainerWrapper(

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
index 4aeeb23..95af142 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
@@ -41,6 +41,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -798,7 +799,7 @@ public class PomReader {
             }
 
             int bytesToSkip = 0;
-            LineNumberReader reader = new LineNumberReader(new InputStreamReader(this.in, "UTF-8"),
+            LineNumberReader reader = new LineNumberReader(new InputStreamReader(this.in, StandardCharsets.UTF_8),
                     100);
             String firstLine = reader.readLine();
             if (firstLine != null) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
index bd8b180..8bab430 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -27,6 +27,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1281,7 +1282,7 @@ public final class XmlModuleDescriptorUpdater {
 
     public static void update(URL inStreamCtx, InputStream inStream, OutputStream outStream,
             final UpdateOptions options) throws IOException, SAXException {
-        final PrintWriter out = new PrintWriter(new OutputStreamWriter(outStream, "UTF-8"));
+        final PrintWriter out = new PrintWriter(new OutputStreamWriter(outStream, StandardCharsets.UTF_8));
         out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
         out.write(LINE_SEPARATOR);
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
index bac3180..a40f2bc 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public final class XmlModuleDescriptorWriter {
             output.getParentFile().mkdirs();
         }
         try (PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(output),
-                "UTF-8"))) {
+                StandardCharsets.UTF_8))) {
             out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
             if (licenseHeader != null) {
                 out.print(licenseHeader);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b5b177b8/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
index 656b154..2a98b62 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -1101,14 +1101,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
         final String envName = chooseSomeEnvVar();
         final URL originalPomFile = this.getClass().getResource("test-system-properties.pom");
         assertNotNull("Pom file to test, is missing", originalPomFile);
-        final List<String> pomContent = Files.readAllLines(Paths.get(originalPomFile.toURI()), Charset.forName("UTF-8"));
+        final List<String> pomContent = Files.readAllLines(Paths.get(originalPomFile.toURI()), StandardCharsets.UTF_8);
         final List<String> replacedContent = new ArrayList<>();
         for (final String line : pomContent) {
             replacedContent.add(line.replaceAll("THIS_WILL_BE_REPLACED_IN_TEST_BY_A_ENV_VAR", envName));
         }
         // write the new pom contents into a separate file
         final Path updatedPomFile = Paths.get(workDir.getRoot().toPath().toString(), "updated-test-system-properties.pom");
-        Files.write(updatedPomFile, replacedContent, Charset.forName("UTF-8"));
+        Files.write(updatedPomFile, replacedContent, StandardCharsets.UTF_8);
 
         // now start testing - we do 2 rounds -
         // once with a system property (referenced in the pom) set and once unset