Merge branch '6.0' into hideo67/LDEV-4688

.github/workflows/main-java-21.yml

@@ -0,0 +1,10 @@
+name: Build with Java 21
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/main.yml
+    with:
+      LUCEE_TEST_JAVA_VERSION: '21'
+      LUCEE_BUILD_JAVA_VERSION: '21'

README.md

@@ -1,21 +1,6 @@
-![Lucee](https://bitbucket.org/repo/rX87Rq/images/3392835614-logo-1-color-black-small.png)
+![Lucee](https://raw.githubusercontent.com/lucee/Lucee/6.0/images/lucee-white.png#gh-dark-mode-only)
+![Lucee](https://raw.githubusercontent.com/lucee/Lucee/6.0/images/lucee-black.png#gh-light-mode-only)
 
-![GitHub](https://img.shields.io/github/license/lucee/Lucee)
-5.3 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=5.3)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
-5.4 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=5.4)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
-6.0 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=6.0)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
-[![Backers on Open Collective](https://opencollective.com/Lucee/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/Lucee/sponsors/badge.svg)](#sponsors) 
-
-[![Maven Central](https://img.shields.io/maven-central/v/org.lucee/lucee)](https://mvnrepository.com/artifact/org.lucee/lucee)
-[![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/lucee/Lucee)](https://github.com/lucee/Lucee/pulls)
-[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/lucee/Lucee)](https://github.com/lucee/Lucee/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed)
-
-[![docker pulls](https://img.shields.io/docker/pulls/lucee/lucee.svg?label=docker+pulls)](https://hub.docker.com/r/lucee/lucee/)
-[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/lucee)](https://opencollective.com/lucee#section-contributors)
-[![GitHub contributors](https://img.shields.io/github/contributors/lucee/Lucee)](https://github.com/lucee/Lucee/graphs/contributors)
-
-[![Website](https://img.shields.io/website?url=https%3A%2F%2Fdownload.lucee.org%2F)](https://download.lucee.org/)
 
 ## Lucee Server
 
@@ -25,6 +10,9 @@ Lucee simplifies technologies like webservices (REST, SOAP, HTTP), ORM (Hibernat
 
 Lucee provides a compatibility layer for Adobe ColdFusion ©  CFML using less resources and delivering better performance. 
 
+ [What is new with Lucee 6](README-Lucee6.md)
+
+
 ## Installation
 
 You can [build Lucee from source](https://docs.lucee.org/guides/working-with-source.html) or grab one of our distributions:
@@ -69,6 +57,25 @@ For more peruse the [Lucee Manifesto](https://dev.lucee.org/t/lucee-manifesto/18
 
 The Lucee team is always open to feedback and active at CFML community events, and is keen to remind people that Lucee is a community project.
 
+
+![GitHub](https://img.shields.io/github/license/lucee/Lucee)
+5.3 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=5.3)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
+5.4 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=5.4)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
+6.0 [![Java CI](https://github.com/lucee/Lucee/actions/workflows/main.yml/badge.svg?branch=6.0)](https://github.com/lucee/Lucee/actions/workflows/main.yml)
+[![Backers on Open Collective](https://opencollective.com/Lucee/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/Lucee/sponsors/badge.svg)](#sponsors) 
+
+[![Maven Central](https://img.shields.io/maven-central/v/org.lucee/lucee)](https://mvnrepository.com/artifact/org.lucee/lucee)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/lucee/Lucee)](https://github.com/lucee/Lucee/pulls)
+[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/lucee/Lucee)](https://github.com/lucee/Lucee/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed)
+
+[![docker pulls](https://img.shields.io/docker/pulls/lucee/lucee.svg?label=docker+pulls)](https://hub.docker.com/r/lucee/lucee/)
+[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/lucee)](https://opencollective.com/lucee#section-contributors)
+[![GitHub contributors](https://img.shields.io/github/contributors/lucee/Lucee)](https://github.com/lucee/Lucee/graphs/contributors)
+
+[![Website](https://img.shields.io/website?url=https%3A%2F%2Fdownload.lucee.org%2F)](https://download.lucee.org/)
+
+
 ## Contributors
 
 This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
@@ -86,7 +93,7 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Lucee#sponsor)]
 
-<a class="custom-sponsor" href="https://www.mitrahsoft.com" target="_blank"><img src="https://www.mitrahsoft.com/assets/img/lucee-sponsor.svg?t=1"></a>
+<a class="custom-sponsor" href="https://www.mitrahsoft.com" target="_blank"><img src="https://www.mitrahsoft.com/assets/img/lucee-sponsor.svg?t=6"></a>
 <a href="https://opencollective.com/Lucee/sponsor/0/website" target="_blank"><img src="https://opencollective.com/Lucee/sponsor/0/avatar.svg"></a>
 <a href="https://opencollective.com/Lucee/sponsor/1/website" target="_blank"><img src="https://opencollective.com/Lucee/sponsor/1/avatar.svg"></a>
 <a href="https://opencollective.com/Lucee/sponsor/2/website" target="_blank"><img src="https://opencollective.com/Lucee/sponsor/2/avatar.svg"></a>

ant/build-core.xml

@@ -20,7 +20,7 @@
   <property name="extH2"          value="465E1E35-2425-4F4E-8B3FAB638BD7280A;version=2.1.214.0001L"/>
   <property name="extOracle"          value="D4EDFDBD-A9A3-E9AF-597322D767E0C949;version=19.12.0.0-ojdbc8"/>
   <property name="extLucene"          value="EFDEB172-F52E-4D84-9CD1A1F561B3DFC8;version=2.4.2.4"/>
-  <property name="extAxis"          value="DF28D0A4-6748-44B9-A2FDC12E4E2E4D38;version=1.4.0.37"/>
+  <property name="extAxis"          value="DF28D0A4-6748-44B9-A2FDC12E4E2E4D38;version=1.4.0.38-SNAPSHOT"/>
   <property name="extChart"          value="D46B46A9-A0E3-44E1-D972A04AC3A8DC10;version=1.0.19.24"/>
   <property name="extRedis"          value="60772C12-F179-D555-8E2CD2B4F7428718;version=3.0.0.54-SNAPSHOT"/>
   <property name="extHibernate"          value="FAD1E8CB-4F45-4184-86359145767C29DE;version=5.4.29.27-BETA"/>

core/pom.xml

@@ -111,7 +111,7 @@
   	<dependency>
   		<groupId>com.github.mwiede</groupId>
   		<artifactId>jsch</artifactId>
-  		<version>0.2.8</version>
+  		<version>0.2.11</version>
     	<scope>provided</scope>
   	</dependency>
     <dependency>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.23.0</version>
+      <version>1.24.0</version>
     </dependency>
     <dependency>
       <groupId>org.lucee</groupId>

core/src/main/cfml/context/admin/admin_layout.cfm

@@ -23,7 +23,7 @@
 <html>
 <head>
 	<title>#attributes.title# - Lucee #ucFirst(request.adminType)# Administrator</title>
-	<link rel="stylesheet" href="../res/css/admin6-#resNameAppendix#.css.cfm" type="text/css">
+	<link rel="stylesheet" href="../res/css/admin6.css.cfm" type="text/css">
 	<meta name="robots" content="noindex,nofollow">
 	<cfhtmlhead action="flush">
 </head>
@@ -117,9 +117,9 @@
 
 	<script src="../res/js/base.min.js.cfm" type="text/javascript"></script>
 	<script src="../res/js/jquery.modal.min.js.cfm" type="text/javascript"></script>
-	<script src="../res/js/jquery.blockUI-#resNameAppendix#.js.cfm" type="text/javascript"></script>
-	<script src="../res/js/admin-#resNameAppendix#.js.cfm" type="text/javascript"></script>
-	<script src="../res/js/util-#resNameAppendix#.min.js.cfm"></script>
+	<script src="../res/js/jquery.blockUI.js.cfm" type="text/javascript"></script>
+	<script src="../res/js/admin.js.cfm" type="text/javascript"></script>
+	<script src="../res/js/util.min.js.cfm"></script>
 	<cfinclude template="navigation.cfm">
 	<script>
 		$(function(){

core/src/main/cfml/context/admin/ext.functions.cfm

@@ -616,7 +616,7 @@
 			}
 			var errorMessage = "Error: Download extension returned #http.status_code# for #uri#";
 			writeLog(type="ERROR", text=errorMessage, log="deploy");
-			writeLog(type="ERROR", text=http.fileContent, log="deploy"); // log the actual error response out for debugging
+			writeLog(type="ERROR", text="file-content:"&http.fileContent, log="deploy"); // log the actual error response out for debugging
 			throw encodeForHtml(errorMessage); // rather not encode here, but this is hits a generic error handler
 		}
 	}

core/src/main/cfml/context/admin/index.cfm

@@ -3,6 +3,6 @@
 		include "web.cfm";
 	}
 	else {
-		location url="web.cfm?reinit=true" addtoken="no";
+		location url="server.cfm?reinit=true" addtoken="no";
 	}
 </cfscript>

core/src/main/cfml/context/admin/logout.cfm

@@ -1,5 +1,16 @@
-<cfset StructDelete(application, "stText")>
-<cfset StructDelete(application, "UpdateProvider")>
-<cfset StructDelete(session,"password"&request.adminType)>
-<cfcookie expires="Now" name="lucee_admin_pw_#request.adminType#" value="">
-<cflocation url="#cgi.SCRIPT_NAME#" addtoken="No">
+<cfscript>
+    StructDelete(application, "stText");
+    StructDelete(application, "UpdateProvider");
+    if(structKeyExists(url, "full")) {
+        systemOutput("=>"&request.adminType,1,1);
+        StructDelete(session,"passwordweb");
+        StructDelete(session,"passwordserver");
+        cookie expires="Now" name="lucee_admin_pw_web" value="";
+        cookie expires="Now" name="lucee_admin_pw_server" value="";
+    }
+    else {
+        StructDelete(session,"password"&request.adminType);
+        cookie expires="Now" name="lucee_admin_pw_#request.adminType#" value="";
+    }
+    location url="#cgi.SCRIPT_NAME#" addtoken="No";
+</cfscript>

core/src/main/cfml/context/admin/mvnchangeto.cfm

@@ -0,0 +1,15 @@
+<!--- create no output here!!! --->
+<cfsetting showdebugoutput="false">
+<cftry>
+	<cfsetting requesttimeout="100000">
+	<cfadmin
+		action="mvnChangeVersionTo"
+        version="#url.version#"
+		type="#url.adminType#"
+		password="#session["password"&url.adminType]#">
+
+	<cfcatch>
+		<cfset echo(cfcatch.message)>
+	</cfcatch>
+</cftry>
+<cfabort>

core/src/main/cfml/context/admin/overview.cfm

@@ -18,7 +18,7 @@ Defaults --->
 <cfset error.detail="">
 <cfparam name="form.mainAction" default="none">
 <!--- load asynchron all extension providers  --->
-<cfparam name="application[request.admintype].preloadedExtensionProviders" default="false" type="boolean">
+<cfif isNull(application[request.admintype].preloadedExtensionProviders)><cfset application[request.admintype].preloadedExtensionProviders=false></cfif>
 <cfif !application[request.admintype].preloadedExtensionProviders>
 	<cfinclude template="ext.functions.cfm">
 	<cfset application[request.admintype].preloadedExtensionProviders=true>
@@ -67,7 +67,7 @@ Redirect to entry --->
 
 <cfset lucee_version = "UNKNOWN">
 <cfinclude template="version.cfm">
-<cfif lucee_version neq server.lucee.version>
+<cfif lucee_version neq server.lucee.version && lucee_version neq "UNKNOWN">
 	<cfoutput>
 		<div class="error">Warning Lucee Admin was compiled with version #lucee_version#?</div>
 	</cfoutput>

core/src/main/cfml/context/admin/resources.component.cfm

@@ -198,8 +198,6 @@ Defaults --->
                     type="#request.adminType#"
                     password="#session["password"&request.adminType]#"
 
-                    baseComponentTemplateCFML="#form.baseComponentTemplateCFML#"
-                    baseComponentTemplateLucee="#form.baseComponentTemplateLucee#"
                     componentDumpTemplate="#form.componentDumpTemplate#"
                     componentDataMemberDefaultAccess="#form.componentDataMemberDefaultAccess#"
                     triggerDataMember="#isDefined('form.triggerDataMember')#"

core/src/main/cfml/context/admin/resources.component.list.cfm

@@ -10,50 +10,7 @@
 	<cfformClassic onerror="customError" action="#request.self#?action=#url.action#" method="post">
 		<table class="maintbl">
 			<tbody>
-				<!--- Base Component ---->
-
-				<tr>
-					<th scope="row">#stText.Components.BaseComponent# </th>
-<cfset css=iif(len(component["baseComponentTemplateCFML"]) EQ 0 and len(component["strBaseComponentTemplateCFML"]) NEQ 0,de('Red'),de(''))>
-					<td class="tblContent#css#" title="#component["strBaseComponentTemplateCFML"]#
-#component["BaseComponentTemplateCFML"]#">
-
-
-
-						<!---<table class="maintbl">
-						<cfloop list="CFML,Lucee" item="dialect">
-					<cfset css=iif(len(component["baseComponentTemplate"&dialect]) EQ 0 and
-					 len(component["strBaseComponentTemplate"&dialect]) NEQ 0,de('Red'),de(''))>
-							<tr>
-							<th scope="row">Dialect #dialect#</th>
-							<td class="tblContent#css#" title="#component["strBaseComponentTemplate"&dialect]#
-#component["BaseComponentTemplate"&dialect]#">
-							<cfif hasAccess>
-								<cfinputClassic type="text" name="baseComponentTemplate#dialect#" value="#component["strBaseComponentTemplate"&dialect]#" style="width:350px" 
-									required="no" 
-									message="#stText.Components.BaseComponentMissing#">
-							<cfelse>
-								<b>#component["strBaseComponentTemplate"&dialect]#</b>
-							</cfif>
-							</td>
-							</tr>
-						</cfloop>--->
-
-
-							<cfif hasAccess>
-								<cfinputClassic type="text" name="baseComponentTemplateCFML" value="#component["strBaseComponentTemplateCFML"]#" style="width:350px" 
-									required="no" 
-									message="#stText.Components.BaseComponentMissing#">
-							<cfelse>
-								<b>#component["strBaseComponentTemplateCFML"]#</b>
-							</cfif>
-
-						<cfoutput><input type="hidden" name="baseComponentTemplateLucee" value="#component["strBaseComponentTemplateLucee"]#" ></cfoutput>
-
-
-						<div class="comment">#stText.Components.BaseComponentDescription#</div>
-					</td>
-				</tr>
+
 				<!--- Auto Import ---->
 				<tr>
 					<th scope="row">#stText.Components.AutoImport#</th>