diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index eb0e82bb30c..8b7cf51b0c2 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -56,10 +56,8 @@ com.sun.jersey.version = 1.19
 /commons-collections/commons-collections = 3.2.2
 /commons-fileupload/commons-fileupload = 1.3.3
 /commons-io/commons-io = 2.5
-/commons-lang/commons-lang = 2.6
 /commons-logging/commons-logging = 1.1.3
 /de.l3s.boilerpipe/boilerpipe = 1.1.0
-/dom4j/dom4j = 1.6.1
 /info.ganglia.gmetric4j/gmetric4j = 1.0.7
 
 io.dropwizard.metrics.version = 3.2.6
@@ -191,8 +189,13 @@ org.apache.tika.version = 1.19.1
 /org.apache.tika/tika-parsers = ${org.apache.tika.version}
 /org.apache.tika/tika-xmp = ${org.apache.tika.version}
 
-/org.apache.velocity/velocity = 1.7
-/org.apache.velocity/velocity-tools = 2.0
+org.apache.velocity.tools.version = 3.0
+/org.apache.velocity.tools/velocity-tools-generic = ${org.apache.velocity.tools.version}
+/org.apache.velocity.tools/velocity-tools-view = ${org.apache.velocity.tools.version}
+/org.apache.velocity.tools/velocity-tools-view-jsp = ${org.apache.velocity.tools.version}
+
+/org.apache.velocity/velocity-engine-core = 2.0
+
 /org.apache.xmlbeans/xmlbeans = 3.0.1
 /org.apache.zookeeper/zookeeper = 3.4.13
 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e4714af4963..6537681e866 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -62,7 +62,7 @@ Versions of Major Components
 ---------------------
 Apache Tika 1.19.1
 Carrot2 3.16.0
-Velocity 1.7 and Velocity Tools 2.0
+Velocity 2.0 and Velocity Tools 3.0
 Apache ZooKeeper 3.4.13
 Jetty 9.4.14.v20181114
 
@@ -73,6 +73,8 @@ include the list of internal async requests (if any) in the "success" or "failed
 to them being included outside those keys for backwards compatibility). See SOLR-12708 for more
 details
 
+Velocity and Velocity Tools were both upgraded as part of this release. Velocity upgraded from 1.7 to 2.0. Please see https://velocity.apache.org/engine/2.0/upgrading.html about upgrading. Velocity Tools upgraded from 2.0 to 3.0. For more details, please see https://velocity.apache.org/tools/3.0/upgrading.html for details about the upgrade.
+
 New Features
 ----------------------
 
@@ -184,6 +186,8 @@ Other Changes
 
 * SOLR-13342: Remove dom4j from Solr (Kevin Risden)
 
+* SOLR-13335: Upgrade to velocity 2.0 and velocity-tools 3.0 (Kevin Risden)
+
 ==================  8.0.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/contrib/velocity/ivy.xml b/solr/contrib/velocity/ivy.xml
index 17ffed11954..ab8758baa8b 100644
--- a/solr/contrib/velocity/ivy.xml
+++ b/solr/contrib/velocity/ivy.xml
@@ -23,12 +23,13 @@
     <conf name="test" transitive="false"/>
   </configurations>
   <dependencies>
-    <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="compile"/>
-    <dependency org="commons-lang" name="commons-lang" rev="${/commons-lang/commons-lang}" conf="compile"/>
-    <dependency org="dom4j" name="dom4j" rev="${/dom4j/dom4j}" conf="compile"/>
+    <dependency org="org.apache.commons" name="commons-lang3" rev="${/org.apache.commons/commons-lang3}" conf="compile"/>
 
-    <dependency org="org.apache.velocity" name="velocity" rev="${/org.apache.velocity/velocity}" conf="compile"/>
-    <dependency org="org.apache.velocity" name="velocity-tools" rev="${/org.apache.velocity/velocity-tools}" conf="compile"/>
+    <dependency org="org.apache.velocity" name="velocity-engine-core" rev="${/org.apache.velocity/velocity-engine-core}" conf="compile"/>
+
+    <dependency org="org.apache.velocity.tools" name="velocity-tools-generic" rev="${/org.apache.velocity.tools/velocity-tools-generic}" conf="compile"/>
+    <dependency org="org.apache.velocity.tools" name="velocity-tools-view" rev="${/org.apache.velocity.tools/velocity-tools-view}" conf="compile"/>
+    <dependency org="org.apache.velocity.tools" name="velocity-tools-view-jsp" rev="${/org.apache.velocity.tools/velocity-tools-view-jsp}" conf="compile"/>
 
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
   </dependencies>
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java
index 17b28784979..dda63f6180b 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java
@@ -16,15 +16,15 @@
  */
 package org.apache.solr.response;
 
+import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.commons.collections.ExtendedProperties;
+import org.apache.velocity.util.ExtProperties;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -40,7 +40,7 @@ public class SolrParamResourceLoader extends ResourceLoader {
     // for now, a custom param convention of template.<name>=<template body> is a nice example
     // of per-request overrides of templates
 
-    org.apache.solr.common.params.SolrParams params = request.getParams();
+    SolrParams params = request.getParams();
     Iterator<String> names = params.getParameterNamesIterator();
     while (names.hasNext()) {
       String name = names.next();
@@ -52,13 +52,13 @@ public class SolrParamResourceLoader extends ResourceLoader {
   }
 
   @Override
-  public void init(ExtendedProperties extendedProperties) {
+  public void init(ExtProperties extendedProperties) {
   }
 
   @Override
-  public InputStream getResourceStream(String s) throws ResourceNotFoundException {
-    String template = templates.get(s);
-    return template == null ? null : new ByteArrayInputStream(template.getBytes(StandardCharsets.UTF_8));
+  public Reader getResourceReader(String source, String encoding) throws ResourceNotFoundException {
+    String template = templates.get(source);
+    return template == null ? null : new StringReader(template);
   }
 
   @Override
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java
deleted file mode 100644
index 00f817f7fc6..00000000000
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.response;
-
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.LogChute;
-import org.slf4j.Logger;
-
-public class SolrVelocityLogger implements LogChute {
-  private final Logger log;
-
-  public SolrVelocityLogger(Logger log) {
-    this.log = log;
-  }
-
-  @Override
-  public void init(RuntimeServices runtimeServices) throws Exception {
-  }
-
-  @Override
-  public void log(int level, String message) {
-    switch(level) {
-      case LogChute.TRACE_ID:
-        log.trace(message);
-        break;
-
-      case LogChute.DEBUG_ID:
-        log.debug(message);
-        break;
-
-      case LogChute.INFO_ID:
-        log.info(message);
-        break;
-
-      case LogChute.WARN_ID:
-        log.warn(message);
-        break;
-
-      case LogChute.ERROR_ID:
-        log.error(message);
-        break;
-
-      default: // unknown logging level, use warn
-        log.warn(message);
-        break;
-    }
-  }
-
-  @Override
-  public void log(int level, String message, Throwable throwable) {
-    switch(level) {
-      case LogChute.TRACE_ID:
-        log.trace(message, throwable);
-        break;
-
-      case LogChute.DEBUG_ID:
-        log.debug(message, throwable);
-        break;
-
-      case LogChute.INFO_ID:
-        log.info(message, throwable);
-        break;
-
-      case LogChute.WARN_ID:
-        log.warn(message, throwable);
-        break;
-
-      case LogChute.ERROR_ID:
-        log.error(message, throwable);
-        break;
-
-      default: // unknown logging level, use warn
-        log.warn(message, throwable);
-        break;
-    }
-  }
-
-  @Override
-  public boolean isLevelEnabled(int level) {
-    switch(level) {
-      case LogChute.TRACE_ID:
-        return log.isTraceEnabled();
-
-      case LogChute.DEBUG_ID:
-        return log.isDebugEnabled();
-
-      case LogChute.INFO_ID:
-        return log.isInfoEnabled();
-
-      case LogChute.WARN_ID:
-        return log.isWarnEnabled();
-
-      case LogChute.ERROR_ID:
-        return log.isErrorEnabled();
-
-      default:
-        return false;
-    }
-  }
-}
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
index c83a5a7bb5d..bf778e14509 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
@@ -17,13 +17,13 @@
 package org.apache.solr.response;
 
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.Reader;
 
-import org.apache.commons.collections.ExtendedProperties;
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.util.ExtProperties;
 
 /**
   * Velocity resource loader wrapper around Solr resource loader
@@ -37,13 +37,13 @@ public class SolrVelocityResourceLoader extends ResourceLoader {
   }
 
   @Override
-  public void init(ExtendedProperties extendedProperties) {
+  public void init(ExtProperties extendedProperties) {
   }
 
   @Override
-  public InputStream getResourceStream(String template_name) throws ResourceNotFoundException {
+  public Reader getResourceReader(String source, String encoding) throws ResourceNotFoundException {
     try {
-      return loader.openResource("velocity/" + template_name);
+      return buildReader(loader.openResource("velocity/" + source), encoding);
     } catch (IOException ioe) {
       throw new ResourceNotFoundException(ioe);
     }
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
index 3d4abb24c99..9066dc6c84b 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
@@ -26,7 +26,6 @@ import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.ResourceBundle;
@@ -45,16 +44,14 @@ import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-import org.apache.velocity.tools.ConversionUtils;
+import org.apache.velocity.tools.generic.CollectionTool;
 import org.apache.velocity.tools.generic.ComparisonDateTool;
 import org.apache.velocity.tools.generic.DisplayTool;
 import org.apache.velocity.tools.generic.EscapeTool;
-import org.apache.velocity.tools.generic.ListTool;
 import org.apache.velocity.tools.generic.LocaleConfig;
 import org.apache.velocity.tools.generic.MathTool;
 import org.apache.velocity.tools.generic.NumberTool;
 import org.apache.velocity.tools.generic.ResourceTool;
-import org.apache.velocity.tools.generic.SortTool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,7 +83,6 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
   private String initPropertiesFileName;  // used just to hold from init() to inform()
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  private static final SolrVelocityLogger velocityLogger = new SolrVelocityLogger(log);
   private Properties velocityInitProps = new Properties();
   private Map<String,String> customTools = new HashMap<String,String>();
 
@@ -210,8 +206,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
     context.put("log", log);   // TODO: add test; TODO: should this be overridable with a custom "log" named tool?
     context.put("esc", new EscapeTool());
     context.put("date", new ComparisonDateTool());
-    context.put("list", new ListTool());
-    context.put(SORT, new SortTool());
+    context.put(SORT, new CollectionTool());
 
     MathTool mathTool = new MathTool();
     mathTool.configure(toolConfig);
@@ -284,9 +279,6 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
   private VelocityEngine createEngine(SolrQueryRequest request) {
     VelocityEngine engine = new VelocityEngine();
 
-    // route all Velocity logging through Solr's logging facility
-    engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, velocityLogger);
-
     // Set some engine properties that improve the experience
     //   - these could be considered in the future for parameterization, but can also be overridden by using
     //     the init.properties.file setting.  (TODO: add a test for this properties set here overridden)
@@ -380,7 +372,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
     return "{\"result\":\"" + replaced + "\"}";
   }
 
-  // see: http://svn.apache.org/repos/asf/velocity/tools/branches/2.0.x/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
+  // see: https://github.com/apache/velocity-tools/blob/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
   private static class SolrVelocityResourceTool extends ResourceTool {
 
     private ClassLoader solrClassLoader;
@@ -397,17 +389,5 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
           (loc == null) ? this.getLocale() : this.toLocale(loc),
           solrClassLoader);
     }
-
-    // Why did Velocity Tools make this private?  Copied from ResourceTools.java
-    private Locale toLocale(Object obj) {
-      if (obj == null) {
-        return null;
-      }
-      if (obj instanceof Locale) {
-        return (Locale) obj;
-      }
-      String s = String.valueOf(obj);
-      return ConversionUtils.toLocale(s);
-    }
   }
 }
diff --git a/solr/contrib/velocity/src/resources/_macros.vm b/solr/contrib/velocity/src/resources/_macros.vm
index 83382825c39..406c4a976d4 100644
--- a/solr/contrib/velocity/src/resources/_macros.vm
+++ b/solr/contrib/velocity/src/resources/_macros.vm
@@ -14,14 +14,14 @@
 
 #macro(sort $p)#if($p)#foreach($s in $p)&sort=$esc.url($s)#end#end#end
 
-#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#sort($request.params.getParams('sort'))#debug#end
+#macro(lensNoQ)?#if($request.params.getParams('fq') and $request.params.getParams('fq').size() > 0)&#fqs($request.params.getParams('fq'))#end#sort($request.params.getParams('sort'))#debug#end
 #macro(lens)#lensNoQ#q#end
 
 #macro(url_for_lens)#{url_for_home}#lens#end
 
 #macro(url_for_start $start)#url_for_home#lens&start=$start#end
 
-#macro(url_for_filters $p)#url_for_home?#q#if($list.size($p) > 0)&#fqs($p)#end#debug#end
+#macro(url_for_filters $p)#url_for_home?#q#if($p.size() > 0)&#fqs($p)#end#debug#end
 
 #macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end
 
diff --git a/solr/contrib/velocity/src/resources/velocity/footer.vm b/solr/contrib/velocity/src/resources/velocity/footer.vm
index cb0954c1eab..be9c687afa6 100644
--- a/solr/contrib/velocity/src/resources/velocity/footer.vm
+++ b/solr/contrib/velocity/src/resources/velocity/footer.vm
@@ -3,7 +3,7 @@
   <span>Options:</span>
 
   #if($debug)
-    <a href="#url_for_home?#q#if($list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end">
+    <a href="#url_for_home?#q#if($request.params.getParams('fq').size() > 0)&#fqs($request.params.getParams('fq'))#end">
       disable debug</a>
   #else
     <a href="#url_for_lens&debug=true&fl=*,score">enable debug</a>
diff --git a/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java b/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
index 9b70e1b3468..1a8a913f2e1 100644
--- a/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
+++ b/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
@@ -46,7 +46,7 @@ public class VelocityResponseWriterTest extends SolrTestCaseJ4 {
   @Test
   public void testCustomParamTemplate() throws Exception {
     org.apache.solr.response.VelocityResponseWriter vrw = new VelocityResponseWriter();
-    NamedList<String> nl = new NamedList<String>();
+    NamedList<String> nl = new NamedList<>();
     nl.add(VelocityResponseWriter.PARAMS_RESOURCE_LOADER_ENABLED, "true");
     vrw.init(nl);
     SolrQueryRequest req = req(VelocityResponseWriter.TEMPLATE,"custom",
@@ -59,7 +59,7 @@ public class VelocityResponseWriterTest extends SolrTestCaseJ4 {
   }
 
   @Test
-  public void testParamResourceLoaderDisabled() throws Exception {
+  public void testParamResourceLoaderDisabled() {
     VelocityResponseWriter vrw = new VelocityResponseWriter();
     // by default param resource loader is disabled, no need to set it here
     SolrQueryRequest req = req(VelocityResponseWriter.TEMPLATE,"custom",
@@ -77,7 +77,7 @@ public class VelocityResponseWriterTest extends SolrTestCaseJ4 {
   @Test
   public void testFileResourceLoader() throws Exception {
     VelocityResponseWriter vrw = new VelocityResponseWriter();
-    NamedList<String> nl = new NamedList<String>();
+    NamedList<String> nl = new NamedList<>();
     nl.add("template.base.dir", getFile("velocity").getAbsolutePath());
     vrw.init(nl);
     SolrQueryRequest req = req(VelocityResponseWriter.TEMPLATE,"file");
@@ -196,9 +196,9 @@ public class VelocityResponseWriterTest extends SolrTestCaseJ4 {
   }
 
   @Test
-  public void testContentType() throws Exception {
+  public void testContentType() {
     VelocityResponseWriter vrw = new VelocityResponseWriter();
-    NamedList<String> nl = new NamedList<String>();
+    NamedList<String> nl = new NamedList<>();
     vrw.init(nl);
     SolrQueryResponse rsp = new SolrQueryResponse();
 
@@ -220,5 +220,4 @@ public class VelocityResponseWriterTest extends SolrTestCaseJ4 {
             VelocityResponseWriter.JSON,"wrf",
             VelocityResponseWriter.CONTENT_TYPE,"text/plain"), rsp));
   }
-
 }
diff --git a/solr/example/files/conf/velocity/hit.vm b/solr/example/files/conf/velocity/hit.vm
index 359a55582c4..2c658cdd954 100644
--- a/solr/example/files/conf/velocity/hit.vm
+++ b/solr/example/files/conf/velocity/hit.vm
@@ -30,7 +30,7 @@
 #end
 
 ## Sort out Mime-Type
-#set($ct = $list.get($doc.getFirstValue('content_type').split(";"),0))
+#set($ct = $doc.getFirstValue('content_type').split(";").get(0))
 #set($filename = $doc.getFirstValue('resourcename'))
 #set($filetype = false)
 #set($filetype = $mimeExtensionsMap.get($ct))
diff --git a/solr/example/files/conf/velocity/macros.vm b/solr/example/files/conf/velocity/macros.vm
index 7d1bc1be101..8bebb7f5df1 100644
--- a/solr/example/files/conf/velocity/macros.vm
+++ b/solr/example/files/conf/velocity/macros.vm
@@ -1,4 +1,4 @@
-#macro(lensFilterSortOnly)?#if($list.size($response.responseHeader.params.getAll("fq")) > 0)&#fqs($response.responseHeader.params.getAll("fq"))#end#sort($request.params.getParams('sort'))#end
+#macro(lensFilterSortOnly)?#if($response.responseHeader.params.getAll("fq").size() > 0)&#fqs($response.responseHeader.params.getAll("fq"))#end#sort($request.params.getParams('sort'))#end
 #macro(lensNoQ)#lensFilterSortOnly&type=#current_type#if("#current_locale"!="")&locale=#current_locale#end#end
 #macro(lensNoType)#lensFilterSortOnly#q#if("#current_locale"!="")&locale=#current_locale#end#end
 #macro(lensNoLocale)#lensFilterSortOnly#q&type=#current_type#end
@@ -13,4 +13,4 @@
 #macro(current_locale)$!{response.responseHeader.params.locale}#end
 
 ## Usage: #label(resource_key[, default_value]) - resource_key is used as label if no default value specified and no resource exists
-#macro(label $key $default)#if($resource.get($key).exists)${resource.get($key)}#else#if($default)$default#else${key}#end#end#end
\ No newline at end of file
+#macro(label $key $default)#if($resource.get($key).exists)${resource.get($key)}#else#if($default)$default#else${key}#end#end#end
diff --git a/solr/licenses/commons-lang-2.6.jar.sha1 b/solr/licenses/commons-lang-2.6.jar.sha1
deleted file mode 100644
index 4d7b0bf1d9d..00000000000
--- a/solr/licenses/commons-lang-2.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ce1edb914c94ebc388f086c6827e8bdeec71ac2
diff --git a/solr/licenses/commons-lang-NOTICE.txt b/solr/licenses/commons-lang-NOTICE.txt
deleted file mode 100644
index b4862deb9de..00000000000
--- a/solr/licenses/commons-lang-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Lang
-Copyright 2001-2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/solr/licenses/dom4j-1.6.1.jar.sha1 b/solr/licenses/dom4j-1.6.1.jar.sha1
deleted file mode 100644
index def171f337f..00000000000
--- a/solr/licenses/dom4j-1.6.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d3ccc056b6f056dbf0dddfdf43894b9065a8f94
diff --git a/solr/licenses/dom4j-LICENSE-BSD_LIKE.txt b/solr/licenses/dom4j-LICENSE-BSD_LIKE.txt
deleted file mode 100644
index 7cae050cadb..00000000000
--- a/solr/licenses/dom4j-LICENSE-BSD_LIKE.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/solr/licenses/dom4j-NOTICE.txt b/solr/licenses/dom4j-NOTICE.txt
deleted file mode 100644
index 35666ba99af..00000000000
--- a/solr/licenses/dom4j-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
diff --git a/solr/licenses/velocity-1.7.jar.sha1 b/solr/licenses/velocity-1.7.jar.sha1
deleted file mode 100644
index e522a852a0f..00000000000
--- a/solr/licenses/velocity-1.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2ceb567b8f3f21118ecdec129fe1271dbc09aa7a
diff --git a/solr/licenses/velocity-engine-core-2.0.jar.sha1 b/solr/licenses/velocity-engine-core-2.0.jar.sha1
new file mode 100644
index 00000000000..9cbf13d1ec1
--- /dev/null
+++ b/solr/licenses/velocity-engine-core-2.0.jar.sha1
@@ -0,0 +1 @@
+6e5f29e1237b1764a4ce769feeffb85b0b19cfa7
diff --git a/solr/licenses/commons-lang-LICENSE-ASL.txt b/solr/licenses/velocity-engine-core-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/commons-lang-LICENSE-ASL.txt
rename to solr/licenses/velocity-engine-core-LICENSE-ASL.txt
diff --git a/solr/licenses/velocity-NOTICE.txt b/solr/licenses/velocity-engine-core-NOTICE.txt
similarity index 100%
rename from solr/licenses/velocity-NOTICE.txt
rename to solr/licenses/velocity-engine-core-NOTICE.txt
diff --git a/solr/licenses/velocity-tools-2.0.jar.sha1 b/solr/licenses/velocity-tools-2.0.jar.sha1
deleted file mode 100644
index 579b5fcfb2c..00000000000
--- a/solr/licenses/velocity-tools-2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69936384de86857018b023a8c56ae0635c56b6a0
diff --git a/solr/licenses/velocity-tools-generic-3.0.jar.sha1 b/solr/licenses/velocity-tools-generic-3.0.jar.sha1
new file mode 100644
index 00000000000..018c1b3946d
--- /dev/null
+++ b/solr/licenses/velocity-tools-generic-3.0.jar.sha1
@@ -0,0 +1 @@
+e789f6ec06f9a69ccb8956f407fb685b2938e74b
diff --git a/solr/licenses/velocity-tools-LICENSE-ASL.txt b/solr/licenses/velocity-tools-generic-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/velocity-tools-LICENSE-ASL.txt
rename to solr/licenses/velocity-tools-generic-LICENSE-ASL.txt
diff --git a/solr/licenses/velocity-tools-NOTICE.txt b/solr/licenses/velocity-tools-generic-NOTICE.txt
similarity index 100%
rename from solr/licenses/velocity-tools-NOTICE.txt
rename to solr/licenses/velocity-tools-generic-NOTICE.txt
diff --git a/solr/licenses/velocity-tools-view-3.0.jar.sha1 b/solr/licenses/velocity-tools-view-3.0.jar.sha1
new file mode 100644
index 00000000000..67cf265142b
--- /dev/null
+++ b/solr/licenses/velocity-tools-view-3.0.jar.sha1
@@ -0,0 +1 @@
+2f72ca8eb2bcb8af2c5fab826d64add20ab70a2e
diff --git a/solr/licenses/velocity-LICENSE-ASL.txt b/solr/licenses/velocity-tools-view-LICENSE-ASL.txt
similarity index 99%
rename from solr/licenses/velocity-LICENSE-ASL.txt
rename to solr/licenses/velocity-tools-view-LICENSE-ASL.txt
index d6456956733..261eeb9e9f8 100644
--- a/solr/licenses/velocity-LICENSE-ASL.txt
+++ b/solr/licenses/velocity-tools-view-LICENSE-ASL.txt
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/solr/licenses/velocity-tools-view-NOTICE.txt b/solr/licenses/velocity-tools-view-NOTICE.txt
new file mode 100644
index 00000000000..7d6375e8da8
--- /dev/null
+++ b/solr/licenses/velocity-tools-view-NOTICE.txt
@@ -0,0 +1,12 @@
+Apache Velocity Tools
+
+Copyright (C) 2000-2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Support for using SSL with Struts is provided using
+the sslext library package, which is open source software
+under the Apache Software License 1.1 with copyright attributed
+to The Apache Software Foundation.
+This software is available from http://sslext.sourceforge.net/
diff --git a/solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 b/solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1
new file mode 100644
index 00000000000..45dd7f863ab
--- /dev/null
+++ b/solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1
@@ -0,0 +1 @@
+27f6a21c7973ffb75001b3e9ac4731facf5757b4
diff --git a/solr/licenses/velocity-tools-view-jsp-LICENSE-ASL.txt b/solr/licenses/velocity-tools-view-jsp-LICENSE-ASL.txt
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/solr/licenses/velocity-tools-view-jsp-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/solr/licenses/velocity-tools-view-jsp-NOTICE.txt b/solr/licenses/velocity-tools-view-jsp-NOTICE.txt
new file mode 100644
index 00000000000..7d6375e8da8
--- /dev/null
+++ b/solr/licenses/velocity-tools-view-jsp-NOTICE.txt
@@ -0,0 +1,12 @@
+Apache Velocity Tools
+
+Copyright (C) 2000-2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Support for using SSL with Struts is provided using
+the sslext library package, which is open source software
+under the Apache Software License 1.1 with copyright attributed
+to The Apache Software Foundation.
+This software is available from http://sslext.sourceforge.net/
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
index ef2157c76e5..42dde898474 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
@@ -15,7 +15,7 @@
 
 #macro(q)&q=$!{esc.url($params.get('q'))}#end
 
-#macro(fqs $p)#foreach($fq in $p)#if($velocityCount>1)&#{end}fq=$esc.url($fq)#end#end
+#macro(fqs $p)#foreach($fq in $p)#if($velocityCount && $velocityCount>1)&#{end}fq=$esc.url($fq)#end#end
 
 #macro(debug)#if($request.params.get('debugQuery'))&debugQuery=true#end#end
 
@@ -33,7 +33,7 @@
 
 #macro(sort $p)#if($p)#foreach($s in $p)&sort=$esc.url($s)#end#end#end
 
-#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#sort($request.params.getParams('sort'))#debug#boostPrice#annotate#spatial#qOpts#group#end
+#macro(lensNoQ)?#if($request.params.getParams('fq') && $request.params.getParams('fq').size() > 0)&#fqs($request.params.getParams('fq'))#end#sort($request.params.getParams('sort'))#debug#boostPrice#annotate#spatial#qOpts#group#end
 #macro(lens)#lensNoQ#q#end
         
 
@@ -41,7 +41,7 @@
 
 #macro(url_for_start $start)#url_for_home#lens&start=$start#end
 
-#macro(url_for_filters $p)#url_for_home?#q#boostPrice#spatial#qOpts#if($list.size($p) > 0)&#fqs($p)#end#debug#end
+#macro(url_for_filters $p)#url_for_home?#q#boostPrice#spatial#qOpts#if($p && $p.size() > 0)&#fqs($p)#end#debug#end
 
 #macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end
 
@@ -79,7 +79,7 @@
 #end
 
 #macro(display_facet_query $field, $display, $fieldName)
-  #if($field.size() > 0)
+  #if($field && $field.size() > 0)
   <span class="facet-field">$display</span>
     <ul>
     #foreach ($facet in $field)
@@ -121,7 +121,7 @@
 
 ## $pivots is a list of facet_pivot
 #macro(display_facet_pivot $pivots, $display)
-  #if($pivots.size() > 0)
+  #if($pivots && $pivots.size() > 0)
   <span class="facet-field">$display</span>
     <ul>
       #foreach ($pivot in $pivots)
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
index 606733afc42..d0eb4f817c0 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
@@ -3,7 +3,7 @@
  *#
 
 #set($collations = $response.response.spellcheck.collations.getAll("collation"))
-#if($collations.size() > 0)
+#if($collations && $collations.size() > 0)
   Did you mean
   #foreach($collation in $collations)
     <a href="#{url_for_home}#{lensNoQ}&q=$esc.url($collation.collationQuery)">$esc.html($collation.collationQuery)</a> ($collation.hits)?
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
index 0604c34cc23..e7430d38f5f 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
@@ -7,7 +7,7 @@
   <span>Options:</span>
 
   #if($request.params.get('debugQuery'))
-    <a href="#url_for_home?#q#if($list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end">
+    <a href="#url_for_home?#q#if($request.params.getParams('fq').size() > 0)&#fqs($request.params.getParams('fq'))#end">
       disable debug</a>
   #else
     <a href="#url_for_lens&debugQuery=true&fl=*,score">
@@ -15,7 +15,7 @@
   #end
   -
   #if($annotate)
-    <a href="#url_for_home?#q#if($list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#boostPrice">
+    <a href="#url_for_home?#q#if($request.params.getParams('fq').size() > 0)&#fqs($request.params.getParams('fq'))#end#boostPrice">
       disable annotation</a>
   #else
     <a href="#url_for_lens&annotateBrowse=true">
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
index 9e8d6cb71cb..74f1c075649 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
@@ -25,7 +25,7 @@
 #end
 
 ## Sort out Mime-Type
-#set($ct = $list.get($doc.getFirstValue('content_type').split(";"),0))
+#set($ct = $doc.getFirstValue('content_type').split(";").get(0))
 #set($filename = $doc.getFieldValue('resourcename'))
 #set($filetype = false)
 #set($filetype = $mimeExtensionsMap.get($ct))
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 1c24d887105..f8ab3499a5b 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -241,7 +241,7 @@
         <attribute key="ivy-log4j-version" value="${ivyversions.org.log4j.major.version}" />
         <attribute key="ivy-opennlp-version" value="${ivyversions./org.apache.opennlp/opennlp-tools}" />
         <attribute key="ivy-tika-version" value="${ivyversions.org.apache.tika.version}" />
-        <attribute key="ivy-velocity-tools-version" value="${ivyversions./org.apache.velocity/velocity-tools}" />
+        <attribute key="ivy-velocity-tools-version" value="${ivyversions.org.apache.velocity.tools.version}" />
         <attribute key="ivy-zookeeper-version" value="${ivyversions./org.apache.zookeeper/zookeeper}" />
       </asciidoctor:convert>
     </sequential>
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index 24b01af332f..7c29200fdeb 100755
--- a/solr/solr-ref-guide/src/_config.yml.template
+++ b/solr/solr-ref-guide/src/_config.yml.template
@@ -84,7 +84,7 @@ solr-attributes: &solr-attributes-ref
   ivy-log4j-version: "${ivyversions.org.apache.logging.log4j.version}"
   ivy-opennlp-version: "${ivyversions./org.apache.opennlp/opennlp-tools}"
   ivy-tika-version: "${ivyversions.org.apache.tika.version}"
-  ivy-velocity-tools-version: "${ivyversions./org.apache.velocity/velocity-tools}"
+  ivy-velocity-tools-version: "${ivyversions.org.apache.velocity.tools.version}"
   ivy-zookeeper-version: "${ivyversions./org.apache.zookeeper/zookeeper}"
 
 asciidoctor:
diff --git a/solr/solr-ref-guide/src/velocity-response-writer.adoc b/solr/solr-ref-guide/src/velocity-response-writer.adoc
index 38c3c4e5063..bc6da16cb72 100644
--- a/solr/solr-ref-guide/src/velocity-response-writer.adoc
+++ b/solr/solr-ref-guide/src/velocity-response-writer.adoc
@@ -109,7 +109,6 @@ Resource bundles can be added by providing a JAR file visible by the SolrResourc
 |`response` |{solr-javadocs}solr-core/org/apache/solr/response/SolrQueryResponse.html[QueryResponse] most of the time, but in some cases where QueryResponse doesn't like the request handler's output (https://wiki.apache.org/solr/AnalysisRequestHandler[AnalysisRequestHandler], for example, causes a ClassCastException parsing "response"), the response will be a SolrResponseBase object.
 |`esc` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/tools-summary.html#EscapeTool[EscapeTool] instance
 |`date` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/tools-summary.html#ComparisonDateTool[ComparisonDateTool] instance
-|`list` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/apidocs/org/apache/velocity/tools/generic/ListTool.html[ListTool] instance
 |`math` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/tools-summary.html#MathTool[MathTool] instance
 |`number` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/tools-summary.html#NumberTool[NumberTool] instance
 |`sort` |A Velocity http://velocity.apache.org/tools/{ivy-velocity-tools-version}/tools-summary.html#SortTool[SortTool] instance