You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/19 00:12:39 UTC

lucene-solr:master: SOLR-10042, LUCENE-7838: Fix precommit

Repository: lucene-solr
Updated Branches:
  refs/heads/master 606b3bfc6 -> d30d012c7


SOLR-10042, LUCENE-7838: Fix precommit


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d30d012c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d30d012c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d30d012c

Branch: refs/heads/master
Commit: d30d012c7c2f9de46a32d7e9eda3b17c51a7fa04
Parents: 606b3bf
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu May 18 17:11:40 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu May 18 17:11:40 2017 -0700

----------------------------------------------------------------------
 lucene/classification/build.xml                                    | 2 +-
 .../src/java/org/apache/solr/response/VelocityResponseWriter.java  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d30d012c/lucene/classification/build.xml
----------------------------------------------------------------------
diff --git a/lucene/classification/build.xml b/lucene/classification/build.xml
index b3f1bfd..af7d2b1 100644
--- a/lucene/classification/build.xml
+++ b/lucene/classification/build.xml
@@ -47,7 +47,7 @@
     <invoke-module-javadoc>
       <links>
         <link href="../queries"/>
-        <link href="../analyzers/common"/>
+        <link href="../analyzers-common"/>
         <link href="../grouping"/>
         <link href="../sandbox"/>
       </links>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d30d012c/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
----------------------------------------------------------------------
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 c17412f..133bc63 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
@@ -42,7 +42,6 @@ import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.util.plugin.SolrCoreAware;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;