Merge branch '7.1' into 7.2

# Conflicts:
#	core/src/main/java/lucee/runtime/config/ConfigImpl.java
#	core/src/main/java/lucee/runtime/config/DeployHandler.java
#	core/src/main/java/lucee/runtime/extension/RHExtension.java
#	loader/build.xml
#	loader/pom.xml

Author: michaeloffner

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
       LUCEE_BUILD_JAVA_VERSION:
         required: true
         type: string
-        default: '21'
+        default: '25'
   push:
     branches:
       - '**' # thus ignoring tagging
@@ -19,7 +19,7 @@ on:
       LUCEE_BUILD_JAVA_VERSION:
         required: true
         type: string
-        default: '21'
+        default: '25'
       LUCEE_TEST_JAVA_VERSION:
         description: Optional Java Test version, default is the build java version
         required: false
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DO_DEPLOY: "${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/7.1') }}"
-      LUCEE_BUILD_JAVA_VERSION: 21
+      LUCEE_BUILD_JAVA_VERSION: 25
       LUCEE_TEST_JAVA_VERSION: ''
     services:
       ldap:

core/src/main/java/lucee/runtime/debug/DebuggerListener.java

@@ -75,7 +75,7 @@ default boolean onException(PageContext pc, Throwable exception, boolean caught)
 
 	/**
 	 * Called when output is written to System.out or System.err.
-	 * Only called when DEBUGGER_ENABLED and a DebuggerPrintStream is installed.
+	 * Only called when a DebuggerPrintStream is installed.
 	 *
 	 * @param text The text that was written
 	 * @param isStdErr true if written to stderr, false if stdout

core/src/main/java/lucee/runtime/debug/DebuggerPrintStream.java

@@ -4,7 +4,7 @@
 
 /**
  * PrintStream wrapper that tees output to the DebuggerListener.
- * Installed on System.out/err when DEBUGGER_ENABLED is true.
+ * Installed on System.out/err when DEBUGGER_SECRET is set.
  * Always passes through to the original stream; only notifies listener when active.
  */
 public class DebuggerPrintStream extends PrintStream {

core/src/main/java/lucee/runtime/extension/RHExtension.java

@@ -1843,7 +1843,7 @@ else if ("maven".equalsIgnoreCase(name) || "mvn".equalsIgnoreCase(name)) {
 
 			// source
 			else if ("path".equalsIgnoreCase(name) || "url".equalsIgnoreCase(name) || "resource".equalsIgnoreCase(name)) {
-				res = ResourceUtil.toResourceExisting(config, entry.getValue().trim(), null);
+				res = ResourceUtil.toResourceExisting(config, ConfigUtil.replaceConfigPlaceHolder(config, entry.getValue().trim()), null);
 				if (res != null && res.isFile()) {
 					ed.setSource(config, res);
 					if (ed.getId() == null) {

core/src/main/java/resource/fld/core-base.fld

@@ -6787,7 +6787,7 @@ When used, the function automatically validates that the secret exists and throw
 	<function>
 		<name>GetSystemMetrics</name>
 		<class>lucee.runtime.functions.system.GetSystemInfo</class>
-		<status>hidden</status>
+		<introduced>5.2.5.7</introduced>
 		<description></description>
 		<return>
 			<type>struct</type>

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="7.2.0.16-ALPHA"/>
+  <property name="version" value="7.2.0.17-ALPHA"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.2.0.16-ALPHA</version>
+  <version>7.2.0.17-ALPHA</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>