Merge branch '4.1.x' into 4.2.x

ryanjbaxter · ryanjbaxter · commit 10583b09cd9a · 2025-01-21T15:25:31.000-05:00
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java
@@ -42,7 +42,7 @@ public abstract class PropertyUtils {
 	public static final boolean MARKER_CLASS_EXISTS = ClassUtils.isPresent(MARKER_CLASS, null);
 
 	private PropertyUtils() {
-		throw new UnsupportedOperationException("unable to instatiate utils class");
+		throw new UnsupportedOperationException("unable to instantiate utils class");
 	}
 
 	public static boolean bootstrapEnabled(Environment environment) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public abstract class PropertyUtils {`
`42`	`42`	`public static final boolean MARKER_CLASS_EXISTS = ClassUtils.isPresent(MARKER_CLASS, null);`
`43`	`43`
`44`	`44`	`private PropertyUtils() {`
`45`		`- throw new UnsupportedOperationException("unable to instatiate utils class");`
	`45`	`+ throw new UnsupportedOperationException("unable to instantiate utils class");`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static boolean bootstrapEnabled(Environment environment) {`