#1367 change log4j-1.2.17 to log4j-2.17.1

.github/workflows/build-test.yml

@@ -0,0 +1,41 @@
+name: Pull Requests
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        jdk: [ 11, 17 ]
+    name: Check / Tests (JDK ${{ matrix.jdk }})
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-depth: 0
+
+      - name: Set up python 2
+        uses: actions/setup-python@v2
+        with:
+          python-version: '2.x'
+          architecture: 'x64'
+
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: 'adopt'
+
+      - name: Build with Ant
+        working-directory: ./framework
+        run: ant test

README.textile

@@ -1,6 +1,6 @@
-h1. Welcome to Play framework  
+h1. Welcome to Play framework
 
-!https://travis-ci.org/playframework/play1.svg?branch=1.4.x!:https://travis-ci.org/playframework/play1 !https://badges.gitter.im/playframework/play1.svg(Join the chat at https://gitter.im/playframework/play1)!:https://gitter.im/playframework/play1?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+!https://github.com/playframework/play1/actions/workflows/build-test.yml/badge.svg!:https://github.com/playframework/play1/actions/workflows/build-test.yml/badge.svg !https://badges.gitter.im/playframework/play1.svg(Join the chat at https://gitter.im/playframework/play1)!:https://gitter.im/playframework/play1?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 Play framework makes it easier to build Web applications with Java. It is a clean alternative to bloated Enterprise Java stacks. It focuses on developer productivity and targets RESTful architectures. Play is a perfect companion to agile software development.
 

documentation/manual/configuration.textile

@@ -747,7 +747,7 @@ Java source level, which overrides the @java.version@ system property. For examp
 
 bc. java.source=1.8
 
-Values:  @1.7@ (No longer supported since 1.5.0), @1.8@, @9@, @10@.
+Values:  @1.7@ (No longer supported since 1.5.0), @1.8@, @9@, @10@, @11@, @12@, @13@, @14@, @15@, @17@.
 
 Default: @1.8@
 

documentation/manual/logs.textile

@@ -1,6 +1,6 @@
 h1. Logging configuration
 
-The Play logger is built on "Log4j":http://logging.apache.org/log4j/1.2/index.html. Since most Java libraries use Log4j or a wrapper able to use Log4j as a backend, you can easily configure logging that is well-suited to your application.
+The Play logger is built on "Log4j":https://logging.apache.org/log4j/2.x. Since most Java libraries use Log4j or a wrapper able to use Log4j as a backend, you can easily configure logging that is well-suited to your application.
 
 
 h2. <a name="logging">Logging from your application</a>
@@ -30,14 +30,19 @@ If you need to fully configure Log4j, create a @log4j.properties@ file in the @c
 
 The default Log4j configuration is the following:
 
-bc. log4j.rootLogger=ERROR, Console
-
-log4j.logger.play=INFO
-
-# Console
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p ~ %m%n
+bc. # 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
+# root logger
+rootLogger.level = INFO
+rootLogger.appenderRef.console.ref = STDOUT
 
 Copy this file and update it for your specifics needs!
 

documentation/manual/production.textile

@@ -46,17 +46,26 @@ For production it’s a good idea to use rolling log files. Do not send logging
 
 Create a custom @log4j.properties@ in the @conf/@ directory:
 
-bc. log4j.rootLogger=ERROR, Rolling
-
-log4j.logger.play=INFO
-
-# Rolling files
-log4j.appender.Rolling=org.apache.log4j.RollingFileAppender
-log4j.appender.Rolling.File=application.log
-log4j.appender.Rolling.MaxFileSize=1MB
-log4j.appender.Rolling.MaxBackupIndex=100
-log4j.appender.Rolling.layout=org.apache.log4j.PatternLayout
-log4j.appender.Rolling.layout.ConversionPattern=%d{ABSOLUTE} %-5p ~ %m%n
+bc. # appender Console
+appender.fileLogger.type = RollingFile
+appender.fileLogger.name = fileLogger
+appender.fileLogger.fileName= logs/application.log
+appender.fileLogger.filePattern= logs/application%i.log
+appender.fileLogger.layout.type = PatternLayout
+appender.fileLogger.layout.pattern = %d [%t] %p %c - %m%n
+appender.fileLogger.policies.type = Policies
+appender.fileLogger.policies.size.type = SizeBasedTriggeringPolicy
+appender.fileLogger.policies.size.size = 1MB
+appender.fileLogger.strategy.type = DefaultRolloverStrategy
+appender.fileLogger.strategy.max = 100
+appender.fileLogger.filter.threshold.type = ThresholdFilter
+appender.fileLogger.filter.threshold.level = ERROR
+# play logger
+logger.app.name = play
+logger.app.level = ERROR
+# root logger
+rootLogger.level = ERROR
+rootLogger.appenderRef.fileLogger.ref = fileLogger
 
 h2. <a name="server">Front-end HTTP server</a>
 

documentation/manual_ja/logs.textile

@@ -1,6 +1,6 @@
 h1. ログの設定
 
-Play のロガーは組み込みの "Log4j":http://logging.apache.org/log4j/1.2/index.html です。ほとんどの Java ライブラリが Log4j か、または Log4j をバックエンドとして使えるラッパを使用するので、アプリケーションに適合するよう、容易にロギングを設定することができます。
+Play のロガーは組み込みの "Log4j":https://logging.apache.org/log4j/2.x/ です。ほとんどの Java ライブラリが Log4j か、または Log4j をバックエンドとして使えるラッパを使用するので、アプリケーションに適合するよう、容易にロギングを設定することができます。
 
 h2. <a name="logging">アプリケーションからのロギング</a>
 

framework/build.xml

@@ -25,7 +25,7 @@
     </path>
 
     <target name="clean" description="clean resources">
-        <delete dir="classes" /> 
+        <delete dir="classes" />
         <delete dir="dist" />
         <delete dir="tests-results" />
         <delete dir="tests-tmp" />
@@ -46,7 +46,7 @@
                 <include name="**/data/**"/>
                 <include name="**/logs/**"/>
                 <include name="**/i-am-working-here/**"/>
-            </fileset> 
+            </fileset>
         </delete>
         <antcall target="clean-unittest"/>
     </target>
@@ -97,7 +97,7 @@
             <tag name="play.todo" scope="all" description="To do:"/>
         	  <tag name="todo" scope="all" description="To do:"/>
             <group title="Libs" packages="play.libs.*"/>
-            <link offline="false" href="https://docs.oracle.com/javase/" />      
+            <link offline="false" href="https://docs.oracle.com/javase/" />
             <link offline="false" href="http://commons.apache.org/proper/commons-fileupload/apidocs/" />
             <link offline="false" href="https://www.javadoc.io/doc/com.google.code.gson/gson" />
             <link offline="false" href="https://docs.jboss.org/hibernate/orm/4.2/javadocs/" />
@@ -162,7 +162,7 @@
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
             <jvmarg value="${profiler.info.jvmargs.agent}"/>
             <jvmarg value="${jvm.memory}"/>
-        </java>	
+        </java>
     </target>
 
     <target name="nb-run-application">
@@ -189,7 +189,7 @@
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
             <jvmarg value="${jvm.memory}"/>
-        </java>	
+        </java>
     </target>
 
     <target name="nb-debug">
@@ -223,7 +223,7 @@
             <jvmarg value="-javaagent:${basedir}/play-${version}.jar" />
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
-        </java>	
+        </java>
     </target>
 
     <target name="test-in-nb" depends="test">
@@ -237,7 +237,7 @@
             <include name="**/*.java"/>
         </javac>
     </target>
-    
+
     <target name="build-test-modules">
         <ant antfile="build.xml" target="build" dir="../samples-and-tests/modules/testModule" >
             <property name="play.path" value="../../../"/>
@@ -263,7 +263,7 @@
         <echo message="Testing unittests" />
 
         <antcall target="unittest" />
-        
+
         <echo message="Testing development lifecycle (wait ...)" />
 
         <exec executable="${pythonExecutable}" failonerror="true">
@@ -388,7 +388,7 @@
 
     <target name="compile-unittest" depends="compile">
         <mkdir dir="test-classes"/>
-        <javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" source="1.8" target="1.8">
+        <javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" source="11" target="11">
             <classpath refid="classpath.test" />
         </javac>
         <copy todir="test-classes">
@@ -421,7 +421,7 @@
     </target>
 
     <target name="package" depends="clean,version,jar,javadoc">
-        <mkdir dir="dist" /> 
+        <mkdir dir="dist" />
         <zip destfile="dist/play-${version}.zip" comment="Play! ${version}" update="false">
             <zipfileset prefix="play-${version}" dir=".." includes="**/*" excludes="**/cobertura.ser,**/*.pyc,hs_err*,.*,.*/*,framework/dist/**,id,play,nbproject/**,**/.bzr/**,**/.git/**,*.bzrignore,support/textmate/**,framework/classes/**,framework/tests-results/**,samples-and-tests/**/test-result,samples-and-tests/**/i-am-working-here,samples-and-tests/**/data,samples-and-tests/**/logs,samples-and-tests/**/tmp,samples-and-tests/**/db,samples-and-tests/**/attachments,modules/**" />
             <zipfileset prefix="play-${version}" dir=".." includes="play" filemode="777" />

framework/dependencies.yml

@@ -8,22 +8,22 @@ transitiveDependencies: false
 # This core dependencies are required by Play framework
 require:    &allDependencies
     - antlr 2.7.7
-    - com.mchange -> c3p0 0.9.5.2
-    - com.zaxxer -> HikariCP 3.4.5
-    - org.ow2.asm -> asm 9.0
-    - org.ow2.asm -> asm-commons 9.0
-    - org.ow2.asm -> asm-util 9.0
-    - org.ow2.asm -> asm-tree 9.0
-    - org.ow2.asm -> asm-analysis 9.0
+    - com.mchange -> c3p0 0.9.5.5
+    - com.zaxxer -> HikariCP 5.0.1
+    - org.ow2.asm -> asm 9.2
+    - org.ow2.asm -> asm-commons 9.2
+    - org.ow2.asm -> asm-util 9.2
+    - org.ow2.asm -> asm-tree 9.2
+    - org.ow2.asm -> asm-analysis 9.2
     - cglib -> cglib 3.3.0
-    - com.google.code.gson -> gson 2.8.6
-    - com.jamonapi -> jamon 2.81
+    - 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.2 
-    - commons-codec 1.10
+    - commons-beanutils 1.9.4
+    - commons-codec 1.15
     - org.apache.commons -> commons-email 1.5
-    - commons-fileupload 1.3.2
-    - commons-io 2.5
+    - commons-fileupload 1.4
+    - commons-io 2.11.0
     - com.google.code.maven-play-plugin.org.apache.commons -> commons-javaflow 1590792
     - commons-lang 2.6
     - commons-logging 1.2
@@ -34,47 +34,47 @@ require:    &allDependencies
     - javax.inject 1.0
     - javax.validation -> validation-api 1.1.0.Final
     - jaxen 1.2.0
-    - joda-time 2.10
+    - joda-time 2.10.13
     - org.hamcrest -> hamcrest-all 1.3
-    - junit 4.12
+    - junit 4.13.2
     - jregex 1.2_01
-    - log4j 1.2.17
-    - net.sf.ehcache -> ehcache 2.10.6
+    - log4j-api 2.17.1
+    - log4j-core 2.17.1
+    - net.sf.ehcache -> ehcache 2.10.9.2
     - net.sf.ezmorph -> ezmorph 1.0.6
     - net.sf.jsr107cache -> jsr107cache 1.1
-    - net.sf.oval -> oval 1.86
-    - mysql -> mysql-connector-java 8.0.22
+    - net.sf.oval -> oval 1.90
+    - mysql -> mysql-connector-java 8.0.28
     - oauth.signpost -> signpost-core 1.2.1.2
     - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2
-    - org.apache.ivy -> ivy 2.4.0
-    - org.bouncycastle -> bcprov-jdk15on 1.61
-    - org.bouncycastle -> bcpkix-jdk15on 1.61
-    - org.codehaus.groovy -> groovy 3.0.6
-    - org.codehaus.groovy -> groovy-xml 3.0.6
-    - org.eclipse.jdt -> org.eclipse.jdt.core 3.23.0
+    - org.apache.ivy -> ivy 2.5.0
+    - org.bouncycastle -> bcprov-jdk15on 1.70
+    - org.bouncycastle -> bcpkix-jdk15on 1.70
+    - org.codehaus.groovy -> groovy 3.0.9
+    - org.codehaus.groovy -> groovy-xml 3.0.9
+    - org.eclipse.jdt -> org.eclipse.jdt.core 3.28.0
     - org.hibernate -> hibernate-core 5.4.30.Final.patched
-    - net.bytebuddy -> byte-buddy 1.10.21
+    - net.bytebuddy -> byte-buddy 1.12.7
     - javax.persistence -> javax.persistence-api 2.2
     - org.hibernate.common -> hibernate-commons-annotations 5.1.2.Final
     - org.hibernate -> hibernate-validator 5.4.1.Final
-    - org.jboss -> jandex 2.2.3.Final
-    - org.jboss.logging -> jboss-logging 3.4.1.Final
+    - org.jboss -> jandex 2.4.2.Final
+    - org.jboss.logging -> jboss-logging 3.4.3.Final
     - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final
-    - javax.persistence -> javax.persistence-api 2.2 
     - javax.xml.bind -> jaxb-api 2.3.1
-    - org.glassfish.jaxb -> jaxb-runtime 2.3.1
+    - org.glassfish.jaxb -> jaxb-runtime 2.3.6
     - com.fasterxml -> classmate 1.5.1
     - org.hibernate -> hibernate-c3p0 5.4.30.Final
     - org.hibernate -> hibernate-ehcache 5.4.30.Final
-    - com.mchange -> mchange-commons-java 0.2.12
-    - org.javassist -> javassist 3.27.0-GA
+    - com.mchange -> mchange-commons-java 0.2.20
+    - org.javassist -> javassist 3.28.0-GA
     - io.netty -> netty 3.10.6.Final
-    - org.postgresql -> postgresql 42.2.18
-    - org.slf4j -> slf4j-api 1.7.22
-    - org.slf4j -> slf4j-log4j12 1.7.22
-    - org.yaml -> snakeyaml 1.17
-    - net.spy -> spymemcached 2.12.1
-    - com.thoughtworks.xstream -> xstream 1.4.9
+    - org.postgresql -> postgresql 42.3.1
+    - org.slf4j -> slf4j-api 1.7.35
+    - org.apache.logging.log4j -> log4j-slf4j-impl 2.17.1
+    - org.yaml -> snakeyaml 1.30
+    - net.spy -> spymemcached 2.12.3
+    - com.thoughtworks.xstream -> xstream 1.4.19
     - xmlpull 1.1.3.4d_b4_min
 
 # Default repositories, used for all projects

framework/pym/play/utils.py

@@ -50,7 +50,7 @@ def isExcluded(path, exclusion_list = None):
     if exclusion_list is None:
         return False
     for exclusion in exclusion_list:
-        if isParentOf(exclusion, path):
+        if isParentOf(exclusion, path) or exclusion == path:
             return True
     return False