From 77cca5d9ccc83a90d434f48598c80cda4c521a31 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 11 Jan 2022 11:31:52 -0500 Subject: [PATCH 1/3] SOLR-15902: Do not set maximum Solr version on test package --- .../test-files/solr/question-answer-repository/repository.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/core/src/test-files/solr/question-answer-repository/repository.json b/solr/core/src/test-files/solr/question-answer-repository/repository.json index ad17192af87..c4c457a0efa 100644 --- a/solr/core/src/test-files/solr/question-answer-repository/repository.json +++ b/solr/core/src/test-files/solr/question-answer-repository/repository.json @@ -13,7 +13,7 @@ } ], "manifest": { - "version-constraint": "8 - 9", + "version-constraint": ">8", "plugins": [ { "name": "request-handler", From c6fb7cd4e17fabda0d55fc04f33b030f4b83fa1c Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 11 Jan 2022 11:34:56 -0500 Subject: [PATCH 2/3] Remove awaitsFix --- .../src/test/org/apache/solr/cloud/PackageManagerCLITest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java index 0578fc1b941..15b0e4513d5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java +++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java @@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory; @LogLevel("org.apache=INFO") -@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15902") public class PackageManagerCLITest extends SolrCloudTestCase { // Note for those who want to modify the jar files used in the packages used in this test: From a072e3a5385d7af69d74dc8b4e0f380b40189ff8 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 11 Jan 2022 11:45:24 -0500 Subject: [PATCH 3/3] Fix imports --- .../src/test/org/apache/solr/cloud/PackageManagerCLITest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java index 15b0e4513d5..38b66b60f39 100644 --- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java +++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java @@ -20,7 +20,6 @@ import java.lang.invoke.MethodHandles; import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.core.TestSolrConfigHandler; import org.apache.solr.util.LogLevel;