diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 674aa3d9cd..6421517b71 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -10,7 +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 6.2 + - 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 - cglib -> cglib 3.2.7 - com.google.code.gson -> gson 2.8.5 - com.jamonapi -> jamon 2.81 @@ -47,7 +51,7 @@ require: &allDependencies - org.bouncycastle -> bcpkix-jdk15on 1.60 - org.codehaus.groovy -> groovy 2.5.3 - org.codehaus.groovy -> groovy-xml 2.5.3 - - org.eclipse.jdt -> org.eclipse.jdt.core 3.14.0 + - org.eclipse.jdt -> org.eclipse.jdt.core 3.16.0 - org.hibernate -> hibernate-core 5.4.1.Final.patched - net.bytebuddy -> byte-buddy 1.9.5 - javax.persistence -> javax.persistence-api 2.2 diff --git a/framework/lib/asm-6.2.jar b/framework/lib/asm-6.2.jar deleted file mode 100644 index 792142a59a..0000000000 Binary files a/framework/lib/asm-6.2.jar and /dev/null differ diff --git a/framework/lib/asm-7.0.jar b/framework/lib/asm-7.0.jar new file mode 100644 index 0000000000..2cf38f4616 Binary files /dev/null and b/framework/lib/asm-7.0.jar differ diff --git a/framework/lib/asm-all-5.2.jar b/framework/lib/asm-all-5.2.jar deleted file mode 100644 index 0b629c2289..0000000000 Binary files a/framework/lib/asm-all-5.2.jar and /dev/null differ diff --git a/framework/lib/asm-analysis-7.0.jar b/framework/lib/asm-analysis-7.0.jar new file mode 100644 index 0000000000..341d0c5dca Binary files /dev/null and b/framework/lib/asm-analysis-7.0.jar differ diff --git a/framework/lib/asm-commons-7.0.jar b/framework/lib/asm-commons-7.0.jar new file mode 100644 index 0000000000..ba0de6cd49 Binary files /dev/null and b/framework/lib/asm-commons-7.0.jar differ diff --git a/framework/lib/asm-tree-7.0.jar b/framework/lib/asm-tree-7.0.jar new file mode 100644 index 0000000000..243c3cbf21 Binary files /dev/null and b/framework/lib/asm-tree-7.0.jar differ diff --git a/framework/lib/asm-util-7.0.jar b/framework/lib/asm-util-7.0.jar new file mode 100644 index 0000000000..47717e5d18 Binary files /dev/null and b/framework/lib/asm-util-7.0.jar differ diff --git a/framework/lib/commons-javaflow-1590792.jar b/framework/lib/commons-javaflow-1590792.jar index 277fe7f475..d13a3a5435 100644 Binary files a/framework/lib/commons-javaflow-1590792.jar and b/framework/lib/commons-javaflow-1590792.jar differ diff --git a/framework/lib/org.eclipse.jdt.core-3.14.0.jar b/framework/lib/org.eclipse.jdt.core-3.14.0.jar deleted file mode 100644 index 674a040b94..0000000000 Binary files a/framework/lib/org.eclipse.jdt.core-3.14.0.jar and /dev/null differ diff --git a/framework/lib/org.eclipse.jdt.core-3.16.0.jar b/framework/lib/org.eclipse.jdt.core-3.16.0.jar new file mode 100644 index 0000000000..b749e518b8 Binary files /dev/null and b/framework/lib/org.eclipse.jdt.core-3.16.0.jar differ diff --git a/framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-5.0.5.patch b/framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-7.0.patch similarity index 94% rename from framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-5.0.5.patch rename to framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-7.0.patch index 65f221f575..56c2d59136 100644 --- a/framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-5.0.5.patch +++ b/framework/patches/javaflow-r1590792-0001-476-Update-to-ASM-7.0.patch @@ -1,15 +1,3 @@ -From c61bac3eb7750b64333e56bfde3d768a93c38752 Mon Sep 17 00:00:00 2001 -Date: Fri, 16 May 2014 10:52:31 +0800 -Subject: [PATCH 1/2] [#476] Update to ASM 5.0.5 - ---- - pom.xml | 2 +- - .../javaflow/bytecode/BytecodeClassLoader.java | 2 +- - .../asm/ContinuationClassAdapter.java | 4 +-- - .../asm/ContinuationMethodAdapter.java | 34 +++++++++++----------- - .../asm/ContinuationMethodAnalyzer.java | 9 ++++-- - 5 files changed, 27 insertions(+), 24 deletions(-) - diff --git a/pom.xml b/pom.xml index fcb9ba3..00269d3 100644 --- a/pom.xml @@ -19,7 +7,7 @@ index fcb9ba3..00269d3 100644 javaflow 12311186 - 4.0 -+ 5.0.2 ++ 7.0 @@ -32,7 +20,7 @@ index fe06d06..09e32cc 100644 public NameClassAdapter() { - super(Opcodes.ASM4); -+ super(Opcodes.ASM5); ++ super(Opcodes.ASM7); } public void visit( int version, int access, String name, String signature, String superName, String[] interfaces ) { @@ -47,7 +35,7 @@ index 41fcb5d..7699597 100644 - public ContinuationClassAdapter(ClassVisitor cv) { - super(Opcodes.ASM4, cv); + public ContinuationClassAdapter(final ClassVisitor cv) { -+ super(Opcodes.ASM5, cv); ++ super(Opcodes.ASM7, cv); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { @@ -60,7 +48,7 @@ index 126ccc5..d8eef5b 100644 public ContinuationMethodAdapter(ContinuationMethodAnalyzer a) { - super(Opcodes.ASM4, a.mv); -+ super(Opcodes.ASM5, a.mv); ++ super(Opcodes.ASM7, a.mv); this.canalyzer = a; this.analyzer = a.analyzer; this.labels = a.labels; @@ -209,7 +197,7 @@ index 2d480b9..c23e900 100644 public ContinuationMethodAnalyzer(String className, ClassVisitor cv, MethodVisitor mv, int access, String name, String desc, String signature, String[] exceptions) { - super(Opcodes.ASM4, access, name, desc, signature, exceptions); -+ super(Opcodes.ASM5, access, name, desc, signature, exceptions); ++ super(Opcodes.ASM7, access, name, desc, signature, exceptions); this.className = className; this.cv = cv; this.mv = mv; diff --git a/framework/patches/javaflow-r1590792-0004-constructor-fix.patch b/framework/patches/javaflow-r1590792-0004-constructor-fix.patch new file mode 100644 index 0000000000..56a6b6c7a0 --- /dev/null +++ b/framework/patches/javaflow-r1590792-0004-constructor-fix.patch @@ -0,0 +1,14 @@ +diff --git a/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAnalyzer.java b/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAnalyzer.java +index cb5c232..31c26ff 100644 +--- a/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAnalyzer.java ++++ b/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAnalyzer.java +@@ -104,8 +104,7 @@ public class ContinuationMethodAnalyzer extends MethodNode implements Opcodes { + moveNew(); + + // analyzer = new Analyzer(new BasicVerifier()); +- analyzer = new Analyzer(new SimpleVerifier() { +- ++ analyzer = new Analyzer(new SimpleVerifier(Opcodes.ASM7, null,null, null, false) { + protected Class getClass(Type t) { + try { + if (t.getSort() == Type.ARRAY) { diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java index e2c754e303..35dd32166a 100644 --- a/framework/src/play/classloading/ApplicationCompiler.java +++ b/framework/src/play/classloading/ApplicationCompiler.java @@ -43,6 +43,7 @@ public class ApplicationCompiler { 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); } /**