[logging-log4j2] branch release-2.x updated: [LOG4J2-3014] Log4j1ConfigurationConverter on Windows produces " " at end of every line.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new 95f9d7e  [LOG4J2-3014] Log4j1ConfigurationConverter on Windows 
produces "
" at end of every line.
95f9d7e is described below

commit 95f9d7e0826d31def78d78e0514daf73305d91f5
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Feb 3 00:42:04 2021 -0500

    [LOG4J2-3014] Log4j1ConfigurationConverter on Windows produces "&#xd;"
    at end of every line.
    
    Drop dead comment.
---
 .../logging/log4j/core/config/builder/ConfigurationBuilderTest.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index b6aef25..1a9f6d3 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -109,7 +109,6 @@ public class ConfigurationBuilderTest {
             "</Configuration>" + EOL;
 
     @Test
-    //@DisabledOnOs(OS.WINDOWS) // TODO make test run properly on Windows
     public void testXmlConstructing() throws Exception {
         final ConfigurationBuilder<BuiltConfiguration> builder = 
ConfigurationBuilderFactory.newConfigurationBuilder();
         addTestFixtures("config name", builder);