update java version for bytecode creation for all cases

lucee · Feb 27, 2024 · 5f42efd · 5f42efd
1 parent 6aadb6c
commit 5f42efd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/lucee/transformer/bytecode/Page.java b/core/src/main/java/lucee/transformer/bytecode/Page.java
@@ -334,7 +334,7 @@ public byte[] execute(String className) throws TransformerException {
 		else if (isInterface(comp)) parent = InterfacePageImpl.class.getName();// "lucee/runtime/InterfacePage";
 		parent = parent.replace('.', '/');
 
-		cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL, className, null, parent, interfaces);
+		cw.visit(ASMUtil.getJavaVersionForBytecodeGeneration(), Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL, className, null, parent, interfaces);
 		if (optionalPS != null) {
 			// we use full path when FD is enabled
 			String path = config.allowRequestTimeout() ? optionalPS.getRealpathWithVirtual() : optionalPS.getPhyscalFile().getAbsolutePath();

diff --git a/core/src/main/java/lucee/transformer/bytecode/reflection/ASMProxyFactory.java b/core/src/main/java/lucee/transformer/bytecode/reflection/ASMProxyFactory.java
@@ -204,7 +204,7 @@ private static byte[] _createMethod(Type type, Class clazz, Method method, Resou
 
 		className = className.replace('.', File.separatorChar);
 		ClassWriter cw = ASMUtil.getClassWriter();
-		cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC, className, null, ASM_METHOD.getInternalName(), null);
+		cw.visit(ASMUtil.getJavaVersionForBytecodeGeneration(), Opcodes.ACC_PUBLIC, className, null, ASM_METHOD.getInternalName(), null);
 
 		// CONSTRUCTOR
 

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.0.62-SNAPSHOT"/>
+  <property name="version" value="6.1.0.63-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.0.62-SNAPSHOT</version>
+  <version>6.1.0.63-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>