(solr) branch main 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 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 3d8d4df477f Fix cross-dc security manager usage. Port some Lucene test 
setup (#3285)
3d8d4df477f is described below

commit 3d8d4df477fac8b6cf79b0722745401f05e9fa8a
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)
---
 build.gradle                         | 3 +++
 gradle/testing/defaults-tests.gradle | 7 +++++++
 gradle/testing/randomization.gradle  | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d2b49d373a0..24c20452362 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,6 +114,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
 }
 
 // Include smaller chunks configuring dedicated build areas.
diff --git a/gradle/testing/defaults-tests.gradle 
b/gradle/testing/defaults-tests.gradle
index 39e730488ad..d1fdbf11858 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -113,6 +113,13 @@ allprojects {
 
       jvmArgs 
Commandline.translateCommandline(resolvedTestOption("tests.jvmargs"))
 
+      // Enable the vector incubator module on supported Java versions:
+      if 
(rootProject.vectorIncubatorJavaVersions.contains(rootProject.runtimeJavaVersion))
 {
+        jvmArgs '--add-modules', 'jdk.incubator.vector'
+      }
+
+      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 1c955a7a549..9b7a8defe2c 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -204,7 +204,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