DHFPROD-3448: update version, npm values, tweak hub entities not to include 5.x stuff, and correct options test

Author: aebadirad

gradle.properties

@@ -1 +1 @@
-version=2.0.6
+version=2.0.7

marklogic-data-hub/build.gradle

@@ -56,10 +56,10 @@ dependencies {
 
 node {
   // Version of node to use.
-  version = '8.9.3'
+  version = '8.10.0'
 
   // // Version of npm to use.
-  npmVersion = '5.4.2'
+  npmVersion = '6.9.0'
 
   download = true
 

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/hub-entities.xqy

@@ -121,11 +121,6 @@ declare %private function hent:fix-options($nodes as node()*)
               <search:field name="datahubCreatedByJob"/>
             </search:value>
           </search:constraint>,
-          <search:constraint name="createdByStep">
-            <search:value>
-              <search:field name="datahubCreatedByStep"/>
-            </search:value>
-          </search:constraint>,
           hent:fix-options($n/node())
         }
       case element(search:additional-query) return ()

marklogic-data-hub/src/test/java/com/marklogic/hub/DataHubTest.java

@@ -103,7 +103,7 @@ public void testValidateServer807() {
     public void testValidateServer809() {
         assertFalse(dh.isServerVersionValid("8.0-9"));
     }
-    
+
     @Test
     public void testValidateServer8nightly() {
         assertFalse(dh.isServerVersionValid("8.0-20160719"));
@@ -124,11 +124,6 @@ public void testValidateServer8nightlyValidEdge() {
         assertFalse(dh.isServerVersionValid("8.0-20170701"));
     }
 
-    @Test
-    public void testValidateServer8nightlyInValid() {
-        assertFalse(dh.isServerVersionValid("8.0-20170630"));
-    }
-
     @Test
     public void testInvalidServer9nightly() {
         assertFalse(dh.isServerVersionValid("9.0-20160719"));

marklogic-data-hub/src/test/resources/entity-manager-test/options.xml

@@ -3,6 +3,11 @@
   <search:constraint name="Collection">
     <search:collection/>
   </search:constraint>
+  <search:constraint name="createdByJob">
+    <search:value>
+      <search:field name="datahubCreatedByJob"/>
+    </search:value>
+  </search:constraint>
   <search:constraint name="entity-type">
     <search:value>
       <search:element ns="http://marklogic.com/entity-services" name="title"/>
@@ -15,20 +20,22 @@
   </search:constraint>
   <search:constraint name="name">
     <search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
-      <search:path-index>//*:instance/Employee/name</search:path-index>
+      <search:path-index xmlns:es="http://marklogic.com/entity-services">//*:instance/Employee/name</search:path-index>
+      <search:facet-option>limit=25</search:facet-option>
     </search:range>
   </search:constraint>
   <search:constraint name="salary">
     <search:range type="xs:decimal" facet="true">
-      <search:element ns="" name="salary"/>
+      <search:element ns="" name="salary" xmlns:es="http://marklogic.com/entity-services"/>
+      <search:facet-option>limit=25</search:facet-option>
     </search:range>
   </search:constraint>
   <search:tuples name="Employee">
     <search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
-      <search:path-index>//*:instance/Employee/name</search:path-index>
+      <search:path-index xmlns:es="http://marklogic.com/entity-services">//*:instance/Employee/name</search:path-index>
     </search:range>
     <search:range type="xs:decimal" facet="true">
-      <search:element ns="" name="salary"/>
+      <search:element ns="" name="salary" xmlns:es="http://marklogic.com/entity-services"/>
     </search:range>
   </search:tuples>
   <!--Uncomment to return no results for a blank search, rather than the default of all results
@@ -43,7 +50,7 @@
   <search:search-option>unfiltered</search:search-option>
   <!--Modify document extraction to change results returned-->
   <search:extract-document-data selected="include">
-    <search:extract-path>//*:instance/(Employee)</search:extract-path>
+    <search:extract-path xmlns:es="http://marklogic.com/entity-services">//*:instance/(Employee)</search:extract-path>
   </search:extract-document-data>
   <!--Change or remove this additional-query to broaden search beyond entity instance documents-->
   <!--To return facets, change this option to 'true' and edit constraints-->