Compatibility with JDK 13 and 14

framework/dependencies.yml

@@ -10,11 +10,11 @@ require:    &allDependencies
     - antlr 2.7.7
     - com.mchange -> c3p0 0.9.5.2
     - com.zaxxer -> HikariCP 3.2.0
-    - org.ow2.asm -> asm 7.0
-    - org.ow2.asm -> asm-commons 7.0
-    - org.ow2.asm -> asm-util 7.0
-    - org.ow2.asm -> asm-tree 7.0
-    - org.ow2.asm -> asm-analysis 7.0
+    - org.ow2.asm -> asm 8.0.1
+    - org.ow2.asm -> asm-commons 8.0.1
+    - org.ow2.asm -> asm-util 8.0.1
+    - org.ow2.asm -> asm-tree 8.0.1
+    - org.ow2.asm -> asm-analysis 8.0.1
     - cglib -> cglib 3.2.7
     - com.google.code.gson -> gson 2.8.5
     - com.jamonapi -> jamon 2.81
@@ -33,7 +33,7 @@ require:    &allDependencies
     - com.sun.mail -> javax.mail 1.6.2
     - javax.inject 1.0
     - javax.validation -> validation-api 1.1.0.Final
-    - jaxen 1.1.6
+    - jaxen 1.2.0
     - joda-time 2.10
     - org.hamcrest -> hamcrest-all 1.3
     - junit 4.12
@@ -49,9 +49,9 @@ require:    &allDependencies
     - org.apache.ivy -> ivy 2.4.0
     - org.bouncycastle -> bcprov-jdk15on 1.61
     - org.bouncycastle -> bcpkix-jdk15on 1.61
-    - org.codehaus.groovy -> groovy 2.5.3
-    - org.codehaus.groovy -> groovy-xml 2.5.3
-    - org.eclipse.jdt -> org.eclipse.jdt.core 3.16.0
+    - org.codehaus.groovy -> groovy 3.0.4
+    - org.codehaus.groovy -> groovy-xml 3.0.4
+    - org.eclipse.jdt -> org.eclipse.jdt.core 3.18.0
     - org.hibernate -> hibernate-core 5.4.1.Final.patched
     - net.bytebuddy -> byte-buddy 1.9.5
     - javax.persistence -> javax.persistence-api 2.2
@@ -66,7 +66,7 @@ require:    &allDependencies
     - org.hibernate -> hibernate-c3p0 5.4.1.Final
     - org.hibernate -> hibernate-ehcache 5.4.1.Final
     - com.mchange -> mchange-commons-java 0.2.12
-    - org.javassist -> javassist 3.24.0-GA
+    - org.javassist -> javassist 3.27.0-GA
     - io.netty -> netty 3.10.6.Final
     - org.postgresql -> postgresql 42.2.4
     - org.slf4j -> slf4j-api 1.7.22

framework/src/play/classloading/ApplicationCompiler.java

@@ -37,14 +37,13 @@ public class ApplicationCompiler {
     ApplicationClasses applicationClasses;
     Map<String, String> settings;
     private static final String JAVA_SOURCE_DEFAULT_VERSION = "1.8";
-    static final Map<String, String> compatibleJavaVersions = new HashMap<>();
-
-    static {
-    	compatibleJavaVersions.put("1.8", CompilerOptions.VERSION_1_8);
-    	compatibleJavaVersions.put("9", CompilerOptions.VERSION_9);
-    	compatibleJavaVersions.put("10", CompilerOptions.VERSION_10);
-    	compatibleJavaVersions.put("11", CompilerOptions.VERSION_11);
-	}
+    static final Map<String, String> compatibleJavaVersions =  org.apache.groovy.util.Maps.of( //
+    		"1.8", CompilerOptions.VERSION_1_8, //
+    		"9", CompilerOptions.VERSION_9, //
+    		"10", CompilerOptions.VERSION_10, //
+    		"11", CompilerOptions.VERSION_11, //
+    		"12", CompilerOptions.VERSION_12 //
+    		);
 
     /**
      * Try to guess the magic configuration options

framework/src/play/mvc/Scope.java

@@ -30,7 +30,7 @@ public class Scope {
     public static final String COOKIE_EXPIRE = Play.configuration.getProperty("application.session.maxAge");
     public static final boolean SESSION_HTTPONLY = Play.configuration.getProperty("application.session.httpOnly", "false").toLowerCase()
             .equals("true");
-    public static final boolean SESSION_SEND_ONLY_IF_CHANGED = Play.configuration
+    public static boolean SESSION_SEND_ONLY_IF_CHANGED = Play.configuration
             .getProperty("application.session.sendOnlyIfChanged", "false").toLowerCase().equals("true");
 
     public static SessionStore sessionStore = createSessionStore();

framework/src/play/templates/GroovyTemplate.java

@@ -6,6 +6,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -144,7 +145,7 @@ public void compile() {
 
                 Field phasesF = compilationUnit.getClass().getDeclaredField("phaseOperations");
                 phasesF.setAccessible(true);
-                LinkedList[] phases = (LinkedList[]) phasesF.get(compilationUnit);
+                Collection[] phases = (Collection[]) phasesF.get(compilationUnit);
                 LinkedList<GroovyClassOperation> output = new LinkedList<>();
                 phases[Phases.OUTPUT] = output;
                 output.add(new GroovyClassOperation() {

framework/test-src/play/mvc/SessionTest.java

@@ -23,21 +23,7 @@ private static void mockRequestAndResponse() {
     }
 
     public static void setSendOnlyIfChangedConstant(boolean value) {
-        try {
-            /*
-             * Set the final static value Scope.SESSION_SEND_ONLY_IF_CHANGED using reflection.
-             */
-            Field field = Scope.class.getField("SESSION_SEND_ONLY_IF_CHANGED");
-            field.setAccessible(true);
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-            modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
-            // Set the new value
-            field.setBoolean(null, value);
-        } catch(Exception e) {
-            throw new RuntimeException(e);
-        }
+    	Scope.SESSION_SEND_ONLY_IF_CHANGED = value;
     }
 
     @Test