You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2023/08/18 15:20:22 UTC

[solr] branch main updated: SOLR-16733: Fail 'test' tasks using JDK20 on Mac (#1832)

This is an automated email from the ASF dual-hosted git repository.

gerlowskija pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 4f550d324e4 SOLR-16733: Fail 'test' tasks using JDK20 on Mac (#1832)
4f550d324e4 is described below

commit 4f550d324e4a912ad5668123ae3d44554574f416
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Fri Aug 18 11:20:15 2023 -0400

    SOLR-16733: Fail 'test' tasks using JDK20 on Mac (#1832)
    
    Java 20 has a JDK bug that triggers on Mac systems and crashes Solr on
    startup.  This affects deployments running on Mac as well as test runs,
    which obviously need to start and stop Solr frequently.
    
    This commit adds some gradle logic to detect this combination (JDK20 w/
    Mac) and fail the 'test' task when present.
---
 build.gradle                                  |  1 +
 gradle/testing/fail-on-unsupported-jdk.gradle | 32 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/build.gradle b/build.gradle
index ebd9b85786a..b612fe2bf58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,7 @@ apply from: file('gradle/java/javac.gradle')
 apply from: file('gradle/testing/defaults-tests.gradle')
 apply from: file('gradle/testing/randomization.gradle')
 apply from: file('gradle/testing/fail-on-no-tests.gradle')
+apply from: file('gradle/testing/fail-on-unsupported-jdk.gradle')
 apply from: file('gradle/testing/alternative-jdk-support.gradle')
 apply from: file('gradle/java/jar-manifest.gradle')
 
diff --git a/gradle/testing/fail-on-unsupported-jdk.gradle b/gradle/testing/fail-on-unsupported-jdk.gradle
new file mode 100644
index 00000000000..7d94b709764
--- /dev/null
+++ b/gradle/testing/fail-on-unsupported-jdk.gradle
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+configure(rootProject) {
+  task ensureJdkSupported() {
+    doFirst {
+      if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac") && rootProject.runtimeJavaVersion == JavaVersion.VERSION_20) {
+        throw new GradleException("Tests cannot be run with JDK20 on Mac; see SOLR-16733 for more details.")
+      }
+    }
+  }
+
+  allprojects {
+    tasks.withType(Test) {
+        dependsOn ":ensureJdkSupported"
+    }
+  }
+}