playframework#1367 fix carriage return

- fix rebase conflict
xael-fry · Jan 31, 2022 · eccc222 · eccc222
1 parent 7ccf446
commit eccc222
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 48 deletions.
diff --git a/framework/build.xml b/framework/build.xml
@@ -64,7 +64,7 @@
 
     <target name="compile" description="compile without cleaning">
         <mkdir dir="classes"/>
-        <javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" source="1.8" target="1.8">
+        <javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" source="11" target="11">
             <classpath refid="project.classpath" />
         </javac>
         <copy todir="classes">
@@ -233,7 +233,7 @@
     <!-- Tests -->
 
     <target name="compile-tests" depends="compile">
-        <javac encoding="utf-8" nowarn="${compile.nowarn}" debug="true"  destdir="classes" classpathref="project.classpath" srcdir="tests/src" source="1.8" target="1.8">
+        <javac encoding="utf-8" nowarn="${compile.nowarn}" debug="true"  destdir="classes" classpathref="project.classpath" srcdir="tests/src" source="11" target="11">
             <include name="**/*.java"/>
         </javac>
     </target>

diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -19,7 +19,7 @@ require:    &allDependencies
     - com.google.code.gson -> gson 2.8.9
     - com.jamonapi -> jamon 2.82
     - com.ning -> async-http-client 1.9.40
-    - commons-beanutils 1.9.4 
+    - commons-beanutils 1.9.4
     - commons-codec 1.15
     - org.apache.commons -> commons-email 1.5
     - commons-fileupload 1.4
@@ -71,7 +71,6 @@ require:    &allDependencies
     - io.netty -> netty 3.10.6.Final
     - org.postgresql -> postgresql 42.3.1
     - org.slf4j -> slf4j-api 1.7.33
-    - org.slf4j -> slf4j-log4j12 1.7.33
     - org.apache.logging.log4j -> log4j-slf4j-impl 2.17.1
     - org.yaml -> snakeyaml 1.30
     - net.spy -> spymemcached 2.12.3
@@ -92,7 +91,7 @@ repositories:
         type:       local
         artifact:   "${play.path}/framework/lib/[artifact]-[revision].jar"
         contains:   *allDependencies
-        
+
     - playCoreCrud:
         type:       local
         artifact:   "${play.path}/modules/crud"
@@ -104,16 +103,16 @@ repositories:
         artifact:   "${play.path}/modules/secure"
         contains:
             - play -> secure $version
-            
+
     - playCoreDocviewer:
         type:       local
         artifact:   "${play.path}/modules/docviewer"
         contains:
             - play -> docviewer $version
 
-    - playModules:  
+    - playModules:
         type:       chain
-        using:            
+        using:
             - playLocalModules:
                 type:       local
                 descriptor: "${play.path}/modules/[module]-[revision]/conf/dependencies.yml"
@@ -123,7 +122,7 @@ repositories:
                 type:       http
                 descriptor: "https://www.playframework.com/modules/repo/[module]/[revision]/dependencies.yml"
                 artifact:   "https://www.playframework.com/modules/[module]-[revision].zip"
-                
+
         contains:
             - play -> *
 

diff --git a/framework/lib/slf4j-api-1.7.32.jar b/framework/lib/slf4j-api-1.7.32.jar
diff --git a/framework/test-src/play/testlog4j.properties b/framework/test-src/play/testlog4j.properties
@@ -1,16 +1,17 @@
-# appender Console
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d [%t] %p %c - %m%n
-appender.console.filter.threshold.type = ThresholdFilter
-appender.console.filter.threshold.level = INFO
-# play logger
-logger.app.name = play
-logger.app.level = INFO
-# play logger
-logger.custom.name = logtest.properties
-logger.custom.level = WARN
-# root logger
-rootLogger.level = DEBUG
-rootLogger.appenderRef.console.ref = STDOUT
+# appender Console
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d [%t] %p %c - %m%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = INFO
+# play logger
+logger.app.name = play
+logger.app.level = INFO
+# play logger
+logger.custom.name = logtest.properties
+logger.custom.level = WARN
+# root logger
+rootLogger.level = DEBUG
+rootLogger.appenderRef.console.ref = STDOUT
+
diff --git a/framework/test-src/play/testlog4j.xml b/framework/test-src/play/testlog4j.xml
@@ -1,23 +1,23 @@
-<Configuration name="ConfigTest" status="ERROR" monitorInterval="5">
-    <Appenders>
-
-        <SystemPropertyArbiter propertyName="env" propertyValue="dev">
-            <Console name="Out">
-                <PatternLayout pattern="%m%n"/>
-            </Console>
-        </SystemPropertyArbiter>
-        <SystemPropertyArbiter propertyName="env" propertyValue="prod">
-            <List name="Out">
-            </List>
-        </SystemPropertyArbiter>
-
-    </Appenders>
-    <Loggers>
-        <Logger name="logtest.xml" level="trace" >
-            <AppenderRef ref="Out"/>
-        </Logger>
-        <Root level="debug">
-            <AppenderRef ref="Out"/>
-        </Root>
-    </Loggers>
-</Configuration>
+<Configuration name="ConfigTest" status="ERROR" monitorInterval="5">
+    <Appenders>
+
+        <SystemPropertyArbiter propertyName="env" propertyValue="dev">
+            <Console name="Out">
+                <PatternLayout pattern="%m%n"/>
+            </Console>
+        </SystemPropertyArbiter>
+        <SystemPropertyArbiter propertyName="env" propertyValue="prod">
+            <List name="Out">
+            </List>
+        </SystemPropertyArbiter>
+
+    </Appenders>
+    <Loggers>
+        <Logger name="logtest.xml" level="trace" >
+            <AppenderRef ref="Out"/>
+        </Logger>
+        <Root level="debug">
+            <AppenderRef ref="Out"/>
+        </Root>
+    </Loggers>
+</Configuration>