From c06a7ab0c79306c221f6441641bde973b2ff1e56 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Tue, 18 Sep 2018 20:21:44 -0400 Subject: [PATCH] SOLR-12759: fix regexp --- .../solr/handler/extraction/ExtractingRequestHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index 85e1c78c834..4401745be25 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -45,7 +45,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { // Is the JDK/env affected by a known bug? - if (!TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT, Locale.US).matches("[A-Z]{3}([+-]\\d\\d(:\\d\\d)?)?")) { + if (!TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT, Locale.US).matches("[A-Z]{3,4}([+-]\\d\\d(:\\d\\d)?)?")) { assert System.getProperty("java.version").startsWith("11") : "Is some other JVM affected? Or bad regex?"; assumeTrue("SOLR-12759 JDK 11 (1st release) and Tika 1.x can result in extracting dates in a bad format.", false); }