Merge branch '3.7-dev' into 3.8-dev

Author: spmallette

gremlin-javascript/pom.xml

@@ -170,13 +170,13 @@ limitations under the License.
                         </configuration>
                     </execution>
                     <execution>
-                        <id>grunt jsdoc</id>
+                        <id>npm jsdoc</id>
                         <goals>
-                            <goal>grunt</goal>
+                            <goal>npm</goal>
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <arguments>jsdoc</arguments>
+                            <arguments>run doc</arguments>
                         </configuration>
                     </execution>
                 </executions>