Merge branch '7.0.x'

Author: sbrannen

spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java

@@ -19,6 +19,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Objects;
 import java.util.TimeZone;
 
 import org.jspecify.annotations.Nullable;
@@ -145,12 +146,13 @@ Instant determineInitialTimestamp(TriggerContext triggerContext) {
 	@Override
 	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof CronTrigger that &&
-				this.expression.equals(that.expression)));
+				this.expression.equals(that.expression) &&
+				Objects.equals(this.zoneId, that.zoneId)));
 	}
 
 	@Override
 	public int hashCode() {
-		return this.expression.hashCode();
+		return Objects.hash(this.expression, this.zoneId);
 	}
 
 	@Override

spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.scheduling.support;
 
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -746,6 +747,20 @@ void daylightSavingMissingHour() {
 		assertThat(nextExecutionTime).isEqualTo(this.calendar.getTime());
 	}
 
+	@Test
+	void equalsAndHashCodeConsiderZoneId() {
+		String expression = "0 0 9 * * *";
+		CronTrigger amsterdam1 = new CronTrigger(expression, ZoneId.of("Europe/Amsterdam"));
+		CronTrigger amsterdam2 = new CronTrigger(expression, ZoneId.of("Europe/Amsterdam"));
+		CronTrigger newYork = new CronTrigger(expression, ZoneId.of("America/New_York"));
+
+		assertThat(amsterdam1)
+				.isEqualTo(amsterdam2)
+				.hasSameHashCodeAs(amsterdam2)
+				.isNotEqualTo(newYork)
+				.doesNotHaveSameHashCodeAs(newYork);
+	}
+
 
 	private static void roundup(Calendar calendar) {
 		calendar.add(Calendar.SECOND, 1);