Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java

@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
  *
  **/
 // TermsComponent not currently supported for PointFields
-@SolrTestCaseJ4.SuppressPointFields
+@SolrTestCaseJ4.SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-10847")
 public class TermsComponentTest extends SolrTestCaseJ4 {
 
   @BeforeClass

solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java

@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.apache.solr.JSONTestUtil;
 import org.apache.solr.SolrTestCaseHS;
-import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.SimpleOrderedMap;
@@ -33,13 +32,15 @@ import org.junit.Test;
 import org.noggit.JSONParser;
 import org.noggit.ObjectBuilder;
 
-@SolrTestCaseJ4.SuppressPointFields
 public class TestJsonFacetRefinement extends SolrTestCaseHS {
 
   private static SolrInstances servers;  // for distributed testing
 
   @BeforeClass
   public static void beforeTests() throws Exception {
+    // we need DVs on point fields to compute stats & facets
+    if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) System.setProperty(NUMERIC_DOCVALUES_SYSPROP,"true");
+    
     JSONTestUtil.failRepeatedKeys = true;
     initCore("solrconfig-tlog.xml", "schema_latest.xml");
   }

solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

@@ -232,7 +232,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
   @Target(ElementType.TYPE)
   public @interface SuppressPointFields {
     /** Point to JIRA entry. */
-    public String bugUrl() default "None";
+    public String bugUrl();
   }
   
   // these are meant to be accessed sequentially, but are volatile just to ensure any test