Merge pull request #50 from lucee/LDEV-5377-tomcat11

LDEV-5377 use tomcat 11 for express builds for versions above 6.2.0

Author: zspitzer

apps/updateserver/services/legacy/S3.cfc

@@ -523,9 +523,14 @@ component {
 			var expressTemplates = getExpressTemplates(); // at this point it should be already cached in the application scope
 			// unpack the lucee tomcat template
 			var local_tomcat_templates = curr & "build/servers"
-			if ( checkVersionGTE( arguments.version, 6, 2 ) ) {
+			if ( checkVersionGTE( arguments.version, 6, 2, 1 ) ) {
+				systemOutput("Using Tomcat 11", true);
+				zip action="unzip" file="#local_tomcat_templates#/#expressTemplates['tomcat-11']#" destination=tmpTom;
+			} else if ( checkVersionGTE( arguments.version, 6, 2 ) ) {
+				systemOutput("Using Tomcat 10", true);
 				zip action="unzip" file="#local_tomcat_templates#/#expressTemplates['tomcat-10']#" destination=tmpTom;
 			} else {
+				systemOutput("Using Tomcat 9", true);
 				zip action="unzip" file="#local_tomcat_templates#/#expressTemplates['tomcat-9']#" destination=tmpTom;
 			}
 
@@ -622,12 +627,15 @@ component {
 		return temp;
 	}
 
-	private function checkVersionGTE( version, major, minor ){
+	private function checkVersionGTE( version, major, minor, patch="" ){
 		var v = listToArray( arguments.version, "." );
 		if ( v[ 1 ] gt arguments.major ) {
 			return true;
 		} else if ( v[ 1 ] eq arguments.major && v[ 2 ] gte arguments.minor ) {
-			return true;
+			if ( len( arguments.patch ) )
+				return v[ 3 ] gte arguments.patch;
+			else
+				return true;
 		}
 		return false;
 	}

apps/updateserver/services/legacy/expressTemplates.cfc

@@ -19,10 +19,11 @@ component {
 		var local_templates = directoryList( path=expressLocal, listInfo="query" );
 		// figure out the latest templates for Tomcat 9 and 10
 		var express_templates = {};
+		var express_versions = "lucee-tomcat-9.0.,lucee-tomcat-10.1.,lucee-tomcat-11.0.";
 		var versions = [];
 		// https://cdn.lucee.org/express-templates/lucee-tomcat-9.0.100-template.zip
 		// https://cdn.lucee.org/express-templates/lucee-tomcat-10.1.36-template.zip
-		loop list="lucee-tomcat-9.0.,lucee-tomcat-10.1." item="local.tomcat_major" {
+		loop list="#express_versions#" item="local.tomcat_major" {
 			versions = [];
 			loop query="#s3_templates#" {
 				if ( s3_templates.name contains tomcat_major 
@@ -55,8 +56,8 @@ component {
 			}
 		}
 
-		if ( structCount( express_templates ) neq 2 )
-			throw "Expected 2 express templates: [#express_templates.toJson()#]";
+		if ( structCount( express_templates ) neq listLen( express_versions ) )
+			throw "Expected #listLen(express_versions)# express templates: [#express_templates.toJson()#], i.e. [#express_versions#]";
 		return express_templates;
 	}