Merge branch '7.0' into 7.1

Bump version to 7.1.0.201-SNAPSHOT.

Author: michaeloffner

.gitignore

@@ -19,7 +19,8 @@ target/*
 *.cfc.hbm.xml
 /cache
 WEB-INF
-
+core/bin/
+loader/bin/
 .classpath
 *.eml
 *.iml

README.md

@@ -9,29 +9,94 @@ 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)
+## What's New
+
+- [Lucee 7.1](https://docs.lucee.org/guides/lucee-7-1.html)
+- [Lucee 7](https://docs.lucee.org/guides/lucee-7.html)
+- [Lucee 6.2](https://docs.lucee.org/guides/lucee-6.2.html)
+- [Lucee 5.3 "Kabang"](https://docs.lucee.org/guides/lucee-5.3-kabang.html)
+- [Lucee 5](https://docs.lucee.org/guides/lucee-5.html)
+- Lucee 8.0 (coming soon)
 
 ## Changelogs
 
-- [Changelogs per Release](https://download.lucee.org/changelog/?version=6.2)
+- [Changelogs per Release](https://download.lucee.org/changelog/)
 - [New Tags & Functions, Arguments and Attributes](https://docs.lucee.org/reference/changelog.html)
 
-### Breaking changes
+### Breaking Changes
+
+See all breaking changes documentation at [docs.lucee.org/recipes](https://docs.lucee.org/recipes.html):
 
-- [Breaking Changes Between Lucee 5.4 and 6.0](https://docs.lucee.org/recipes/breaking-changes-6-0.html)
-- [Breaking Changes Between Lucee 6.0 and 6.1](https://docs.lucee.org/recipes/breaking-changes-6-1.html)
-- [Breaking Changes Between Lucee 6.1 and 6.2](https://docs.lucee.org/recipes/breaking-changes-6-2.html)
 - [Breaking Changes Between Lucee 6.2 and 7.0](https://docs.lucee.org/recipes/breaking-changes-7.html)
+- [Breaking Changes Between Lucee 7.0 and 7.1](https://docs.lucee.org/recipes/breaking-changes-7-1.html)
+- [Breaking Changes Between Lucee 7.1 and 8.0](https://docs.lucee.org/recipes/breaking-changes-8-0.html) (coming soon)
 
 ## Installation
 
-You can [build Lucee from source](https://docs.lucee.org/guides/working-with-source.html) or grab one of our distributions:
+You can [build Lucee from source](https://docs.lucee.org/guides/working-with-source.html) or download a distribution from [download.lucee.org](https://download.lucee.org/). We also provide [official Docker images and Dockerfiles](https://github.com/lucee/lucee-dockerfiles).
+
+## LuCLI
+
+[LuCLI](https://lucli.dev/) is a command-line interface for Lucee development and deployment. It provides server lifecycle management, CFML script execution, module system, dependency management, and AI integration — all from the terminal.
+
+**Quick Start:**
+
+```bash
+curl -LsSf https://lucli.dev/install.sh | sh
+# Windows:
+powershell -ExecutionPolicy Bypass -NoProfile -Command "irm https://lucli.dev/install.ps1 | iex"
+```
+
+Requires Java 17+.
+
+**Core Features:**
+
+- **Server Management** — Start, stop, restart, and monitor Lucee servers with `lucli server` commands
+- **CFML Execution** — Run `.cfs` scripts, `.cfm` templates, or `.cfc` components directly from the CLI
+- **Project Configuration** — `lucee.json` for per-project server settings (port, Lucee version, JVM memory, environment variables)
+- **Module System** — Create and install reusable CLI modules in `~/.lucli/modules/`
+- **Dependency Management** — Manage CFML libraries and Lucee extensions with automatic git/Maven resolution
+- **Secrets Management** — Store and inject encrypted secrets into your Lucee servers
+- **AI Integration** — Configure LLM endpoints and run AI prompts with skill support
+- **Daemon Mode** — Run LuCLI as a background service for programmatic access
+- **Batch Scripts** — Execute sequences of commands with `.lucli` batch files
+
+**Example `lucee.json`:**
+
+```json
+{
+  "name": "my-project",
+  "lucee": { "version": "6.2.2" },
+  "port": 8080,
+  "webroot": "./",
+  "jvm": { "maxMemory": "512m" },
+  "dependencies": {
+    "cfwheels": { "type": "cfml", "source": "git", "url": "https://github.com/cfwheels/cfwheels" }
+  }
+}
+```
+
+**Documentation:** [lucli.dev/docs](https://lucli.dev/docs/) | **GitHub:** [cybersonic/LuCLI](https://github.com/cybersonic/LuCLI)
+
+## AI Assistants & Developer Tools
+
+### Lucee Skill for AI Assistants
+
+A machine-readable skill so your AI assistant knows modern Lucee. Drop-in context for Cursor, Copilot, Warp, Claude, ChatGPT, and more. Always aligned with the latest docs.
+
+- [skill.lucee-services.com/main.skill](https://skill.lucee-services.com/main.skill)
+- [docs.lucee.org/lucee.skill](https://docs.lucee.org/lucee.skill)
+
+### Lucee MCP Server
 
-- [Lucee Express](https://lucee.org/downloads.html) (just unzip and run; delete to clean up)
-- [Installers for Windows, Linux and OSX](https://lucee.org/downloads.html)
-- [Official Dockerfiles and Docker images](https://github.com/lucee/lucee-dockerfiles)
+Hosted by Lucee, gives your AI callable tools for Lucee documentation and CFML code analysis.
 
-Alternatively try the super-useful [CommandBox](https://www.ortussolutions.com/products/commandbox) standalone developer tools for CFML powered by Lucee.
+**Tools:**
+- `search_lucee_docs` — search functions, tags, and recipes in the Lucee docs
+- `get_lucee_function` — full descriptor for a built-in function (arguments, types, examples)
+- `get_lucee_tag` — full descriptor for a tag (attributes, types, examples)
+- `parse_cfml_ast` — parse CFML source into an AST (tags, calls, control flow)
+- `query_cfml_ast` — query an AST by node type, name, or line number
 
 ## Building Lucee from Source
 

core/src/main/java/lucee/runtime/schedule/ScheduledTaskThread.java

@@ -191,7 +191,7 @@ public void _run() {
 				break;
 			}
 			if (!task.isPaused()) {
-				if (endDate < todayDate && endTime < todayTime) {
+				if (hasEndDatePassed(endDate, endTime, todayDate, todayTime)) {
 					log(Log.LEVEL_ERROR, String.format("End date %s has passed; now: %s", DateTimeUtil.format(endDate + endTime, null, timeZone),
 							DateTimeUtil.format(todayDate + todayTime, null, timeZone)));
 					break;
@@ -474,6 +474,13 @@ private static void revertDST(Calendar c, int hourExpected, int intervall, int a
 		}
 	}
 
+	public static boolean hasEndDatePassed(long endDate, long endTime, long todayDate, long todayTime) {
+		// endDate is Long.MAX_VALUE when no end date was defined (see constructor) -> task never expires,
+		// regardless of endTime; without this guard "endDate + endTime" overflows and wrongly looks like the past
+		if (endDate == Long.MAX_VALUE) return false;
+		return endDate + endTime < todayDate + todayTime;
+	}
+
 	public static long getMilliSecondsInDay(Calendar c) {
 		return (c.get(Calendar.HOUR_OF_DAY) * 3600000) + (c.get(Calendar.MINUTE) * 60000) + (c.get(Calendar.SECOND) * 1000) + (c.get(Calendar.MILLISECOND));
 	}

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.1.0.200-SNAPSHOT"/>
+  <property name="version" value="7.1.0.201-SNAPSHOT"/>
 
   <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.1.0.200-SNAPSHOT</version>
+  <version>7.1.0.201-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

test/general/Scheduler.cfc

@@ -60,6 +60,87 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
 				expect(dateAdd("l",next,UNIX0)).toBe(createDateTime(2021,1,15,11,1,31,0,"CET"));
 			});
 			// public static long calculateNextExecutionEvery(DateTimeUtil util, long now, boolean notNow, TimeZone timeZone, long start, long endTime, int amount) {
+
+			it(title="LDEV-6426: an 'every N minutes' task with only an end time must stop firing after that time each day and resume the next day", body=function(){
+				var util=DateTimeUtil.getInstance();
+				var tz=TimeZone.getDefault();
+
+				var start=createDateTime(2020,11,1,9,0,0,0,"CET").getTime();
+				// endTime as stored on the real task is milliseconds-in-day, not an absolute timestamp (see constructor)
+				var endTime=util.getMilliSecondsInDay(tz, createDateTime(2021,1,1,17,0,0,0,"CET").getTime());
+
+				// already past today's 17:00 cutoff -> next run must be tomorrow's start time, not another run today
+				var now=createDateTime(2021,1,15,17,1,0,0,"CET").getTime();
+
+				var next=ScheduledTaskThread.calculateNextExecutionEvery(util, now, true, tz, start, endTime, 300);
+				expect(dateAdd("l",next,UNIX0)).toBe(createDateTime(2021,1,16,9,0,0,0,"CET"));
+			});
+
+			it(title="LDEV-6426: task must stop after its end date even when no explicit end time was set", body=function(){
+				var util=DateTimeUtil.getInstance();
+				var tz=TimeZone.getDefault();
+				var DAY=24*3600000;
+
+				// end date is yesterday (midnight), no explicit end time -> defaults to a full day duration (see ScheduledTaskThread constructor)
+				var endDate=createDateTime(2021,1,14,0,0,0,0,"CET").getTime();
+				var endTime=DAY;
+
+				// "now" has a small time-of-day component; the old buggy check (endDate < todayDate && endTime < todayTime)
+				// never matched here because endTime (a full day) is never smaller than todayTime
+				var now=createDateTime(2021,1,15,1,0,0,0,"CET").getTime();
+				var todayTime=util.getMilliSecondsInDay(tz, now);
+				var todayDate=now-todayTime;
+
+				expect(ScheduledTaskThread.hasEndDatePassed(endDate, endTime, todayDate, todayTime)).toBeTrue();
+			});
+
+			it(title="LDEV-6426: task must keep running while still within its end date", body=function(){
+				var util=DateTimeUtil.getInstance();
+				var tz=TimeZone.getDefault();
+				var DAY=24*3600000;
+
+				var endDate=createDateTime(2021,1,20,0,0,0,0,"CET").getTime();
+				var endTime=DAY;
+
+				var now=createDateTime(2021,1,15,1,0,0,0,"CET").getTime();
+				var todayTime=util.getMilliSecondsInDay(tz, now);
+				var todayDate=now-todayTime;
+
+				expect(ScheduledTaskThread.hasEndDatePassed(endDate, endTime, todayDate, todayTime)).toBeFalse();
+			});
+
+			it(title="LDEV-6426: task without any end date must never expire (no endDate, no endTime)", body=function(){
+				var util=DateTimeUtil.getInstance();
+				var tz=TimeZone.getDefault();
+				var DAY=24*3600000;
+				var MAX=createObject("java","java.lang.Long").MAX_VALUE;
+
+				// mirrors the constructor defaults when neither endDate nor endTime is provided
+				var endDate=MAX;
+				var endTime=DAY;
+
+				// far in the future, so a naive "endDate + endTime" overflow would wrongly report "passed"
+				var now=createDateTime(2999,1,15,1,0,0,0,"CET").getTime();
+				var todayTime=util.getMilliSecondsInDay(tz, now);
+				var todayDate=now-todayTime;
+
+				expect(ScheduledTaskThread.hasEndDatePassed(endDate, endTime, todayDate, todayTime)).toBeFalse();
+			});
+
+			it(title="LDEV-6426: task with only an end time (no endDate) must never expire", body=function(){
+				var util=DateTimeUtil.getInstance();
+				var tz=TimeZone.getDefault();
+				var MAX=createObject("java","java.lang.Long").MAX_VALUE;
+
+				var endDate=MAX;
+				var endTime=util.getMilliSecondsInDay(tz, createDateTime(2021,1,1,18,0,0,0,"CET").getTime());
+
+				var now=createDateTime(2999,1,15,1,0,0,0,"CET").getTime();
+				var todayTime=util.getMilliSecondsInDay(tz, now);
+				var todayDate=now-todayTime;
+
+				expect(ScheduledTaskThread.hasEndDatePassed(endDate, endTime, todayDate, todayTime)).toBeFalse();
+			});
 		});
 	}
 }