Merge branch '6.1.0' into 6.1

# Conflicts: # loader/build.xml # loader/pom.xml
MitrahSoft · Jun 25, 2024 · b03147d · b03147d
2 parents cb35075 + d154995
commit b03147d
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 55 deletions.
diff --git a/core/src/main/cfml/context/admin/services.update.cfm b/core/src/main/cfml/context/admin/services.update.cfm
@@ -81,8 +81,13 @@
 			password="#session["password"&request.adminType]#"
 			returnvariable="minVersion";
 		minVs = toVersionSortable(minVersion);
-		otherVersions=LuceeVersionsList();
-		latest=len(otherVersions)?otherVersions[len(otherVersions)]:server.lucee.version;
+		try {
+			otherVersions=LuceeVersionsList();
+		}
+		catch(e) {
+			otherVersions=[];
+		}
+			latest=len(otherVersions)?otherVersions[len(otherVersions)]:server.lucee.version;
 		if(!isNull(otherVersions) && len(otherVersions)){
 
 			for(versions in otherVersions ){
@@ -122,7 +127,7 @@
 	
 
 	// Jira
-
+/*
 	arrChangeLog=[:];
 	try {
 		jira=new Jira("luceeserver.atlassian.net");
@@ -135,7 +140,7 @@
 		}
 	}
 	catch(e) {}
-	
+*/
 	
 
 </cfscript>
@@ -352,7 +357,7 @@
 		loaderPath = replaceNoCase(stText.services.update.loaderPath,"{loaderPath}", '<b>'& loaderInfo.LoaderPath & '</b>' );
 		//replace(stText.services.update.titleDesc2,'{context}',"<b class='error'>"&#expandPath("{lucee-server}\patches")#&"</b>");
 	</cfscript>
-
+<!--- 
 	<cfif len(arrChangeLog)>
 		<h2>#stText.services.update.changeLogsSince# (#server.lucee.version# - #latest#)</h2>
 		<ul><cfloop struct="#arrChangeLog#" index="version" item="values">
@@ -361,7 +366,10 @@
 
 		</cfloop></ul>
 	</cfif>
-
+--->
+	<h2>Changelog</h2>
+	<p class="comment">For a detailed change log, please visit the <a href="https://changelog.lucee.org">Lucee Changelog</a>.</p>
+
 	<h2>Limitation</h2>
 	<p class="comment">#loaderText#</p>
 	<p class="comment">#loaderPath#</p>	

diff --git a/core/src/main/cfml/context/admin/web_functions.cfm b/core/src/main/cfml/context/admin/web_functions.cfm
@@ -78,12 +78,9 @@ function printError(error,boolean longversion=false) {
 					if(i==1) writeOutput('error occurred in ');
 					else writeOutput('called by ');
 					writeOutput(error.TagContext[i].template&':'&error.TagContext[i].line&"</span>");
-					//writeOutput('<br>');
-					//writeOutput(error.TagContext[i].codePrintHTML);
-					//dump(error.TagContext[i]);
 				}
 			}
-			if(!isNull(error.cfcatch)) dump(error.cfcatch);
+			//if(!isNull(error.cfcatch)) dump(error.cfcatch);
 
 		}
 		//ErrorCode,addional,TagContext,StackTrace,type,Detail,Message,ExtendedInfo

diff --git a/core/src/main/cfml/context/debug/modern/reference.cfm b/core/src/main/cfml/context/debug/modern/reference.cfm
@@ -71,7 +71,6 @@
 			var endIndex=find(endNeedle, code,last);
 			if(endIndex==0) return "end not found";//code; TODO
 			var result=executeCode(mid(code,startIndex+needleLength,endIndex-(startIndex+needleLength)));
-			//dump(result);
 			code=mid(code,1,(endIndex-1)+endNeedleLength)&startBlockquote&result&endBlockquote&mid(code,endIndex+endNeedleLength);
 			last=endIndex+endNeedleLength+len(result)+len(startBlockquote)+len(endBlockquote);
 		}
@@ -460,8 +459,6 @@
 		<cfset code=enhanceHTML(markdownToHTML(md))>
 		#code#<br>
 		<cfcatch>
-			<cfif develop><cfdump var="#data#"></cfif>
-			<cfif develop><cfdump var="#cfcatch#"></cfif>
 			<p style="color:red">Unable to load content; see application log for more details</p>
 			<cflog log="application" exception="#cfcatch#">
 		</cfcatch>

diff --git a/core/src/main/cfml/context/gateway/AsynchronousEvents.cfc b/core/src/main/cfml/context/gateway/AsynchronousEvents.cfc
@@ -91,8 +91,6 @@ component accessors=true {
 	 }
 
 	 private void function _handlerError( required any catchData, string functionName="unknown" ){
-		// systemOutput('handleError',true);
 		log text="#catchData.message#" file=#this.logfile#;
-		// writeDump(var="#catchData#",output="console");
 	 }
 }
diff --git a/core/src/main/cfml/context/gateway/AsynchronousEventsListener.cfc b/core/src/main/cfml/context/gateway/AsynchronousEventsListener.cfc
@@ -7,6 +7,5 @@ component output="no" {
 
 	private void function _handleError(required any catchData, string functionName='unknown'){
 		log text="CFMLAysncListener_handleError- Event Listener" file=this.logfile;
-		  //writeDump(var="#catchData#",output="console");
 	}
 }
diff --git a/core/src/main/java/lucee/runtime/config/maven/MavenUpdateProvider.java b/core/src/main/java/lucee/runtime/config/maven/MavenUpdateProvider.java
@@ -152,13 +152,20 @@ public Map<String, Object> detail(Version version) throws IOException, GeneralSe
 				String urlPom = Caster.toString(result.get("pom").get("url"));
 				String urlJar = Caster.toString(result.get("jar").get("url"));
 
-				Object lastModified = result.get("jar").get("lastModified");
-
 				// PomReader pomRreader = new PomReader(new URL(urlPom));
 				// Map<String, Object> res = pomRreader.read();
 				Map<String, Object> res = new LinkedHashMap<>();
 				res.put("pom", urlPom);
 				res.put("jar", urlJar);
+
+				// zero
+				Map<String, Object> zeroMap = result.get("zero.jar");
+				if (zeroMap != null) {
+					String urlJarZero = Caster.toString(zeroMap.get("url"), null);
+					if (!StringUtil.isEmpty(urlJarZero, true)) res.put("zero", urlJarZero);
+				}
+
+				Object lastModified = result.get("jar").get("lastModified");
 				res.put("lastModified", lastModified);
 
 				// LCOS

diff --git a/core/src/main/java/lucee/runtime/config/maven/RepoReader.java b/core/src/main/java/lucee/runtime/config/maven/RepoReader.java
@@ -152,7 +152,7 @@ public void endElement(String uri, String name, String qName) {
 				e.printStackTrace();
 			}
 			String key = StringUtil.isEmpty(classifier) ? extension : classifier + "." + extension;
-			snapshot.put("url", base + artifact + "-" + value + "." + extension);
+			snapshot.put("url", base + artifact + "-" + value + (StringUtil.isEmpty(classifier) ? "" : "-" + classifier) + "." + extension);
 			snapshots.put(key, snapshot);
 			snapshot = null;
 

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.1.7-SNAPSHOT"/>
+  <property name="version" value="6.1.1.8-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.1.7-SNAPSHOT</version>
+  <version>6.1.1.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>
@@ -254,14 +254,13 @@
                 <target>1.8</target>
             </configuration>
          </plugin>
-
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.2.0</version>
-            <executions>
-                <execution>
-                      <id>attach-artifacts</id>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>build-helper-maven-plugin</artifactId>
+              <version>3.2.0</version>
+              <executions>
+                  <execution>
+                      <id>attach-artifact-lco</id>
                       <phase>package</phase>
                       <goals>
                           <goal>attach-artifact</goal>
@@ -275,33 +274,24 @@
                           </artifacts>
                       </configuration>
                   </execution>
-            </executions>
-        </plugin>
-
-
-     <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.2.0</version>
-            <executions>
-              <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                  <artifacts>
-                    <artifact>
-                      <file>${project.build.directory}/lucee-zero-${project.version}.jar</file>
-                      <type>jar</type>
-                      <classifier>zero</classifier>
-                    </artifact>
-                  </artifacts>
-                </configuration>
-              </execution>
-            </executions>
-      </plugin>
+                  <execution>
+                      <id>attach-artifact-zero</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>attach-artifact</goal>
+                      </goals>
+                      <configuration>
+                          <artifacts>
+                              <artifact>
+                                  <file>${project.build.directory}/lucee-zero-${project.version}.jar</file>
+                                  <type>jar</type>
+                                  <classifier>zero</classifier>
+                              </artifact>
+                          </artifacts>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
 
       </plugins>
       <pluginManagement>