(solr) branch branch_9x updated: Fix cross-dc security manager usage. Port some Lucene test setup (#3285)

[houston]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 1250f944da0 Fix cross-dc security manager usage. Port some Lucene test 
setup (#3285)
1250f944da0 is described below

commit 1250f944da0f3c9f90f7dc2d33646f2ded471ec2
Author: Houston Putman <hous...@apache.org>
AuthorDate: Mon Mar 24 12:49:28 2025 -0500

    Fix cross-dc security manager usage. Port some Lucene test setup (#3285)
    
    (cherry picked from commit 3d8d4df477fac8b6cf79b0722745401f05e9fa8a)
---
 build.gradle                         | 3 +++
 gradle/testing/defaults-tests.gradle | 9 +++++++++
 gradle/testing/randomization.gradle  | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 15876db6957..a6c23f7d0e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,6 +104,9 @@ ext {
     logger.debug('Lucene base version (without suffix): {}', luceneBaseVersion)
     return luceneBaseVersion
   }
+
+  // For testing code
+  vectorIncubatorJavaVersions = [ JavaVersion.VERSION_21, 
JavaVersion.VERSION_22, JavaVersion.VERSION_23, JavaVersion.VERSION_24, 
JavaVersion.VERSION_25 ] as Set
 }
 
 apply from: file('buildSrc/scriptDepVersions.gradle')
diff --git a/gradle/testing/defaults-tests.gradle 
b/gradle/testing/defaults-tests.gradle
index 5a83e9eaf15..6b511e1232b 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -120,6 +120,15 @@ allprojects {
         jvmArgs '--illegal-access=deny'
       }
 
+      // Enable the vector incubator module on supported Java versions:
+      if 
(rootProject.vectorIncubatorJavaVersions.contains(rootProject.runtimeJavaVersion))
 {
+        jvmArgs '--add-modules', 'jdk.incubator.vector'
+      }
+
+      if (rootProject.runtimeJavaVersion >= JavaVersion.VERSION_17) {
+        jvmArgs '--enable-native-access=ALL-UNNAMED'
+      }
+
       def loggingConfigFile = 
layout.projectDirectory.file("${resources}/logging.properties")
       def tempDir = layout.projectDirectory.dir(testsTmpDir.toString())
       jvmArgumentProviders.add(
diff --git a/gradle/testing/randomization.gradle 
b/gradle/testing/randomization.gradle
index 61e0183ddc7..115555951ac 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -205,7 +205,7 @@ allprojects {
         def useSecurityManager = 
Boolean.parseBoolean(testOptionsResolved["tests.useSecurityManager"]);
         // Allow the project to override this
         if (project.ext.has("useSecurityManager")) {
-          useSecurityManager = project.ext.get("useSecurityManager")
+          useSecurityManager &= project.ext.get("useSecurityManager")
         }
         if (useSecurityManager) {
           def commonSolrDir = project(':solr').layout.projectDirectory