Merge branch 'bc_upgrades/expand_bcUpgradeTask' into bc_upgrades/expand_bcUpgradeTask_test

mosche · mosche · commit 238862128040 · 2025-06-06T12:28:50.000+02:00
diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java
@@ -212,7 +212,12 @@ public Path getConfigDir() {
         }
 
         public boolean isSecurityEnabled() {
-            return Boolean.parseBoolean(getSetting("xpack.security.enabled", getVersion().onOrAfter("8.0.0") ? "true" : "false"));
+            return Boolean.parseBoolean(
+                getSetting(
+                    "xpack.security.enabled",
+                    getVersion().equals(Version.fromString("0.0.0")) || getVersion().onOrAfter("8.0.0") ? "true" : "false"
+                )
+            );
         }
 
         public boolean isRemoteClusterServerEnabled() {

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,12 @@ public Path getConfigDir() {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public boolean isSecurityEnabled() {`
`215`		`- return Boolean.parseBoolean(getSetting("xpack.security.enabled", getVersion().onOrAfter("8.0.0") ? "true" : "false"));`
	`215`	`+ return Boolean.parseBoolean(`
	`216`	`+ getSetting(`
	`217`	`+ "xpack.security.enabled",`
	`218`	`+ getVersion().equals(Version.fromString("0.0.0")) \|\| getVersion().onOrAfter("8.0.0") ? "true" : "false"`
	`219`	`+ )`
	`220`	`+ );`
`216`	`221`	`}`
`217`	`222`
`218`	`223`	`public boolean isRemoteClusterServerEnabled() {`