LDEV-4648 support partially escaped sequence

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
       LUCEE_BUILD_JAVA_VERSION:
         required: true
         type: string
-        default: '8'
+        default: '11'
   push:
     branches:
       - '**' # thus ignoring tagging
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DO_DEPLOY: "${{ github.event_name == 'push' && github.ref == 'refs/heads/6.0' }}"
-      LUCEE_BUILD_JAVA_VERSION: 8
+      LUCEE_BUILD_JAVA_VERSION: 11
       LUCEE_TEST_JAVA_VERSION: ''
     services:
       ldap:
@@ -78,13 +78,13 @@ jobs:
       if: ${{ inputs.LUCEE_TEST_JAVA_VERSION != '' }}
       run: echo "LUCEE_TEST_JAVA_VERSION=${{ inputs.LUCEE_TEST_JAVA_VERSION }}" >> $GITHUB_ENV
 
-    - uses: szenius/set-timezone@v1.1
+    - uses: szenius/set-timezone@v1.2
       with:
         timezoneLinux: "UTC"
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4
 
     - name: Set up Test Java Version ${{ env.LUCEE_TEST_JAVA_VERSION }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       if: ${{ env.LUCEE_TEST_JAVA_VERSION != '' }}
       with:
         java-version: ${{ env.LUCEE_TEST_JAVA_VERSION }}
@@ -95,7 +95,7 @@ jobs:
       run: echo "LUCEE_TEST_JAVA_EXEC=${{ env.JAVA_HOME }}/bin/java" >> $GITHUB_ENV
 
     - name: Set up build JDK '${{ env.LUCEE_BUILD_JAVA_VERSION }}'
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       if: ${{ env.LUCEE_TEST_JAVA_VERSION != env.LUCEE_BUILD_JAVA_VERSION }}
       with:
         java-version: '${{ env.LUCEE_BUILD_JAVA_VERSION }}'
@@ -106,13 +106,13 @@ jobs:
       run: echo "DO_DEPLOY=false" >> $GITHUB_ENV
 
     - name: Cache Lucee extensions
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/work/Lucee/Lucee/cache/
         key: lucee-extensions
         restore-keys: lucee-extensions
     - name: Cache Maven packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.m2/repository/*
@@ -208,15 +208,15 @@ jobs:
           mvn -B -e -f loader/pom.xml clean install -DtestJavaVersionExec="${{ env.LUCEE_TEST_JAVA_EXEC }}"
         fi
     - name: clean github.ref_name
-      uses: mad9000/actions-find-and-replace-string@3
+      uses: mad9000/actions-find-and-replace-string@5
       id: cleanrefname
       if: always()
       with:
           source: ${{ github.ref_name }}
           find: '/'
           replace: '-'
     - name: Upload Artifact (junit-test-results)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: Lucee-${{ steps.cleanrefname.outputs.value }}-junit-test-results-${{ github.run_number }}

ant/build-core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="susi" basedir="${rootDir}" name="luceeCore"
+<project default="lucee" basedir="${rootDir}" name="luceeCore"
     xmlns:if="ant:if"
     xmlns:resolver="antlib:org.apache.maven.resolver.ant">
   <description>
@@ -26,6 +26,7 @@
   <property name="extHibernate"          value="FAD1E8CB-4F45-4184-86359145767C29DE;version=5.4.29.27-BETA"/>
 
   <property name="stableLoader" value="lucee-5.3.7.48"/>
+  <property name="javaVersion" value="11"/>
   <property name="cdnUrl" value="https://cdn.lucee.org/"/>
 
   <import file="../ant/build-utils.xml"/>
@@ -258,7 +259,6 @@
       <fileset dir="${srcCFML}/context/gateway">
         <include name="*.cfm"/>
         <include name="*.cfc"/>
-        <include name="*.lucee"/>
         <include name="*.xml"/>
         <include name="*.json"/>
       </fileset>
@@ -268,7 +268,6 @@
       <fileset dir="${srcCFML}/context/templates/error">
         <include name="*.cfm"/>
         <include name="*.cfc"/>
-        <include name="*.lucee"/>
         <include name="*.xml"/>
         <include name="*.json"/>
       </fileset>
@@ -278,7 +277,6 @@
       <fileset dir="${srcCFML}/context/admin/plugin">
         <include name="**/*.cfm"/>
         <include name="**/*.cfc"/>
-        <include name="**/*.lucee"/>
         <include name="**/*.xml"/>
         <include name="**/*.json"/>
       </fileset>
@@ -303,7 +301,6 @@
       <fileset dir="${srcCFML}/context/admin/plugin">
         <include name="**/*.cfm"/>
         <include name="**/*.cfc"/>
-        <include name="**/*.lucee"/>
         <include name="**/*.xml"/>
         <include name="**/*.json"/>
       </fileset>
@@ -317,10 +314,13 @@
     <!-- compie the source -->
     <javac 
       srcdir="${srcInst}" 
-      source="1.8" 
-      target="1.8" 
+      source="${javaVersion}" 
+      target="${javaVersion}" 
       destdir="${temp}/agent"
-      debug="true" debuglevel="lines,vars,source" classpath="${dependencies}">
+      includeantruntime="false"
+      debug="true" 
+      debuglevel="lines,vars,source" 
+      classpath="${dependencies}">
     </javac>
 
     <!-- create the manifest file -->
@@ -337,10 +337,13 @@
     <!-- compie the source -->
     <javac 
       srcdir="${srcLoader}" 
-      source="1.8" 
-      target="1.8" 
+      source="${javaVersion}" 
+      target="${javaVersion}" 
       destdir="${temp}/loader"
-      debug="true" debuglevel="lines,vars,source" classpath="${dependencies}">
+      debug="true" 
+      includeantruntime="false"
+      debuglevel="lines,vars,source" 
+      classpath="${dependencies}">
     </javac>
 
     <!-- copy all non java files -->
@@ -369,27 +372,16 @@
     <!-- compile the core -->
     <javac 
       srcdir="${srcCore}" 
-      source="1.8" 
-      target="1.8" 
+      source="${javaVersion}" 
+      target="${javaVersion}" 
       destdir="${core}"
-      debug="true" debuglevel="lines,vars,source">
+      includeantruntime="false"
+      debug="true" 
+      debuglevel="lines,vars,source">
        <classpath refid="classpath" />
        <classpath path="${temp}/loader"/>
     </javac>
 
-    <!--
-<javac 
-      fork="yes"
-      executable="/Library/Java/JavaVirtualMachines/jdk-17.0.5.jdk/Contents/Home/bin/javac"
-      srcdir="${srcCore}" 
-      destdir="${core}"
-      debug="true" debuglevel="lines,vars,source">
-       <classpath refid="classpath" />
-    </javac>
-
-    -->
-
-
     <!-- copy all non java files from src -->
     <copy todir="${core}">
       <fileset dir="${srcCore}">
@@ -492,7 +484,7 @@
       <jvmarg value="-Dlucee.extensions.install=true"/>
       <jvmarg value="-Dlucee.full.null.support=false"/>
       <!-- this checks to see that all the required bundles are provided, so that none are missing -->
-      <jvmarg value="-Dlucee.enable.bundle.download=false"/>
+      <jvmarg value="-Dlucee.enable.bundle.download=false"/><!-- we do always download to make sure this is available -->
       <jvmarg value="-Dlucee.cli.printExceptions=true"/>
       <jvmarg value="-Dlucee.ssl.checkserveridentity=false"/>
     </java>
@@ -556,6 +548,7 @@
       <jvmarg value="-Dlucee.cli.printExceptions=true"/>
       <jvmarg value="-Dlucee.ssl.checkserveridentity=false"/>
       <jvmarg value="-DLUCEE_BUILD_ENV=${LUCEE_BUILD_ENV}"/>
+      <jvmarg value="-Dlucee.enable.bundle.download=always"/>
       <!--
       <jvmarg value="-XX:StartFlightRecording=disk=true,dumponexit=true,filename=${temp}/../lucee-testcases.jfr,maxsize=1024m,maxage=1d,settings=profile,path-to-gc-roots=true"/>
       <jvmarg value="-Dlucee.system.out=file:.../out.txt"/>

ant/run-testcases.xml

@@ -69,6 +69,31 @@
 		primary="physical"
 		trusted="no";
 
+		// set deploy and trace logs to TRACE out to console
+	admin
+		action="updateLogSettings"
+		type="server"
+		password="#request.SERVERADMINPASSWORD#"
+		name="deploy"
+		level="TRACE"
+		appenderClass="lucee.commons.io.log.log4j2.appender.ConsoleAppender"
+		appenderArgs={streamType: "output"}
+		layoutClass="lucee.commons.io.log.log4j2.layout.ClassicLayout"
+		layoutArgs={};
+
+	admin
+		action="updateLogSettings"
+		type="server"
+		password="#request.SERVERADMINPASSWORD#"
+		name="trace"
+		level="TRACE"
+		appenderClass="lucee.commons.io.log.log4j2.appender.ConsoleAppender"
+		appenderArgs={streamType: "output"}
+		layoutClass="lucee.commons.io.log.log4j2.layout.ClassicLayout"
+		layoutArgs={};
+
+
+
 	 include template="/test/run-tests.cfm";
 ]]>
   </script>

core/.classpath

@@ -27,11 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 10.0.2 JDK">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/Lucee loader"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

core/pom.xml

@@ -72,18 +72,18 @@
       <version>7.0.5</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.2</version>
-      <scope>compile</scope>
-    </dependency>
+   <dependency>
+    <groupId>javax.servlet</groupId>
+    <artifactId>javax.servlet-api</artifactId>
+    <version>4.0.1</version>
+    <scope>compile</scope>
+  </dependency>
+    <dependency>
+    <groupId>javax.servlet.jsp</groupId>
+    <artifactId>javax.servlet.jsp-api</artifactId>
+    <version>2.3.3</version>
+    <scope>compile</scope>
+</dependency>
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>javax.el-api</artifactId>
@@ -289,10 +289,33 @@
     </dependency>
     <dependency>
 	    <groupId>org.ow2.asm</groupId>
-	    <artifactId>asm-all</artifactId>
-	    <version>4.2</version>
+	    <artifactId>asm</artifactId>
+	    <version>9.6</version>
+      <scope>provided</scope>
+    </dependency>
+     <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>9.6</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>9.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>9.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+	    <groupId>org.ow2.asm</groupId>
+	    <artifactId>asm-analysis</artifactId>
+	    <version>9.6</version>
+	</dependency>
     <dependency>
     	<groupId>org.lucee</groupId>
     	<artifactId>xml-resolver</artifactId>