sudip-ibm commented on PR #3945:
URL: https://github.com/apache/solr/pull/3945#issuecomment-3703302550
Hi @dsmiley,
Thank you for your input! I understand your preference for a more general
solution that doesn’t involve a specific case for s390x. I’ve attached a patch
that disables the extraction module using a build flag. Please let me know if
this approach works for you, and if so, I can prepare a PR with the changes.
```
diff --git a/build.gradle b/build.gradle
index 50a618d693..55d04f2fee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,7 @@ ext {
// Use gradle flag in root project for further referencing
withUiModule = gradle.ext.withUiModule
+ withExtractionModule = gradle.ext.withExtractionModule
}
// Include smaller chunks configuring dedicated build areas.
diff --git a/gradle/template.gradle.properties
b/gradle/template.gradle.properties
index b6ae69b85e..65a79da969 100644
--- a/gradle/template.gradle.properties
+++ b/gradle/template.gradle.properties
@@ -125,6 +125,9 @@ production=false
# parameter.
disableUiModule=false
+# Option to disable the extraction module.
+disableExtractionModule=false
+
# Changelog generator settings (./gradlew writeChangelog, see
dev-docs/changelog.adoc)
#user.name=<preferred display name>
#user.githubid=<github id>
diff --git a/settings.gradle b/settings.gradle
index 08cee48a39..7efe7370ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -48,7 +48,6 @@ include "solr:modules:clustering"
include "solr:modules:cross-dc"
include "solr:modules:cuvs"
include "solr:modules:opentelemetry"
-include "solr:modules:extraction"
include "solr:modules:gcs-repository"
include "solr:modules:jwt-auth"
include "solr:modules:langid"
@@ -73,5 +72,11 @@ if (gradle.ext.withUiModule) {
include(":solr:ui")
}
+def disableExtractionModuleValue =
providers.gradleProperty('disableExtractionModule').orNull
+gradle.ext.withExtractionModule = disableExtractionModuleValue = null ||
disableExtractionModuleValue != 'true'
+if (gradle.ext.withExtractionModule) {
+ include (":solr:modules:extraction")
+}
+
// Configures development for joint Lucene/ Solr composite build.
apply from: file('gradle/lucene-dev/lucene-dev-repo-composite.gradle')
diff --git
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java
index d223960a79..616d1f92bb 100644
---
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java
+++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java
@@ -38,11 +38,6 @@ public class ExtractingRequestHandlerTikaServerTest
extends ExtractingRequestHan
@BeforeClass
@SuppressWarnings("resource")
public static void beforeClassTika() {
- // skip this test on s390x
- Assume.assumeFalse(
- "Skipping ExtractingRequestHandlerTikaServerTest on s390x",
- "s390x".equalsIgnoreCase(System.getProperty("os.arch")));
-
String baseUrl;
try {
tika =
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
