update tomcat to 10 for Lucee 6.2 and above

lucee · Aug 12, 2024 · 06e0c79 · 06e0c79
1 parent 23d8e2a
commit 06e0c79
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/apps/updateserver/services/legacy/MavenRepo.cfc b/apps/updateserver/services/legacy/MavenRepo.cfc
@@ -444,7 +444,8 @@ component {
 
 			// unpack the servers
 			if(!isNull(url.test)) throw temp;
-			zip action="unzip" file="#getDirectoryFromPath(getCurrenttemplatePath())&("build/servers/tomcat.zip")#" destination="#temp#tomcat";
+			local.minorVersion=mid(server.lucee.version,1,find(".",server.lucee.version,find(".",minorVersion)+1)-1);
+			zip action="unzip" file="#getDirectoryFromPath(getCurrenttemplatePath())&("build/servers/tomcat-"&(local.minorVersion >= '6.2'?'jakarta':'javax')&".zip")#" destination="#temp#tomcat";
 
 			// let's zip it
 			zip action="zip" file=zipTmp overwrite=true {

diff --git a/apps/updateserver/services/legacy/S3.cfc b/apps/updateserver/services/legacy/S3.cfc
@@ -513,7 +513,8 @@ component {
 			//if (!directoryExists(webDir)) directoryCreate(webDir);
 
 			// unpack the servers
-			zip action="unzip" file=#curr&("build/servers/tomcat.zip")# destination=tmpTom;
+			local.minorVersion=mid(server.lucee.version,1,find(".",server.lucee.version,find(".",minorVersion)+1)-1);
+			zip action="unzip" file=#curr&("build/servers/tomcat-"&("build/servers/tomcat-"&(local.minorVersion >= '6.2'?'jakarta':'javax')&".zip")# destination=tmpTom;
 
 			// let's zip it
 			zip action="zip" file=zipTmp overwrite=true {

diff --git a/apps/updateserver/services/legacy/build/servers/tomcat-10.1.28.zip b/apps/updateserver/services/legacy/build/servers/tomcat-10.1.28.zip
diff --git a/apps/updateserver/services/legacy/build/servers/tomcat-jakarta.zip b/apps/updateserver/services/legacy/build/servers/tomcat-jakarta.zip
diff --git a/.../services/legacy/build/servers/tomcat.zip → ...ces/legacy/build/servers/tomcat-javax.zip b/.../services/legacy/build/servers/tomcat.zip → ...ces/legacy/build/servers/tomcat-javax.zip