From b49041ac7d25cee76be1627275c07d98cbb17ba0 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Mon, 20 Jan 2025 23:33:12 -0600 Subject: [PATCH] ARTEMIS-5275 use line separator method instead of property --- .../apache/activemq/artemis/cli/commands/InstallAbstract.java | 2 +- .../artemis/cli/commands/tools/xml/XmlDataExporter.java | 2 +- .../integration/isolated/amqp/SaslKrb5LDAPSecurityTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java index fdb4171413..2dd3bb216b 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java @@ -202,7 +202,7 @@ public class InstallAbstract extends InputAbstract { // and then writing out in the new target encoding.. Let's also replace \n with the values // that is correct for the current platform. - String separator = unixTarget && IS_NIX ? "\n" : System.getProperty("line.separator"); + String separator = unixTarget && IS_NIX ? "\n" : System.lineSeparator(); content = content.replaceAll("\\r?\\n", Matcher.quoteReplacement(separator)); ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes(encoding)); try (FileOutputStream fout = new FileOutputStream(target)) { diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java index 36edf1396d..4dc92719ec 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java @@ -525,7 +525,7 @@ public final class XmlDataExporter extends DBOption { private static final char INDENT_CHAR = ' '; - private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final String LINE_SEPARATOR = System.lineSeparator(); boolean wrap = true; diff --git a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/amqp/SaslKrb5LDAPSecurityTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/amqp/SaslKrb5LDAPSecurityTest.java index 03e079518d..cfde8b3d13 100644 --- a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/amqp/SaslKrb5LDAPSecurityTest.java +++ b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/amqp/SaslKrb5LDAPSecurityTest.java @@ -203,7 +203,7 @@ public class SaslKrb5LDAPSecurityTest extends AbstractLdapTestUnit { (InetSocketAddress)kdcServer.getTransports()[0].getAcceptor().getLocalAddress(); int port = addr.getPort(); File krb5conf = new File(testDir, "krb5.conf").getAbsoluteFile(); - String krb5confBody = MessageFormat.format(sb.toString(), getRealm(), "localhost", Integer.toString(port), System.getProperty("line.separator")); + String krb5confBody = MessageFormat.format(sb.toString(), getRealm(), "localhost", Integer.toString(port), System.lineSeparator()); FileUtils.writeStringToFile(krb5conf, krb5confBody, StandardCharsets.UTF_8); System.setProperty("java.security.krb5.conf", krb5conf.getAbsolutePath());