You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2017/01/13 19:36:01 UTC
[1/4] lucene-solr:jira/solr-8593: SOLR-9947: Fix
CloudSolrClientTest.testNonRetryableRequests failure
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8593 737194712 -> 483bfa642
SOLR-9947: Fix CloudSolrClientTest.testNonRetryableRequests failure
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dee7709d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dee7709d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dee7709d
Branch: refs/heads/jira/solr-8593
Commit: dee7709dd86c64529ee0455d05805ab41b34c736
Parents: 6c6c077
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Jan 12 20:49:38 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jan 12 20:49:38 2017 +0530
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/impl/CloudSolrClientTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dee7709d/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index cbaaa1b..1698075 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -431,7 +431,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
for (String adminPath : adminPathToMbean.keySet()) {
long errorsBefore = 0;
for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
- Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "QUERY", adminPathToMbean.get(adminPath), true);
+ Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), true);
errorsBefore += numRequests;
log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
}
@@ -448,7 +448,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
}
long errorsAfter = 0;
for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
- Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "QUERY", adminPathToMbean.get(adminPath), true);
+ Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), true);
errorsAfter += numRequests;
log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
}
[4/4] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master'
into jira/solr-8593
Posted by kr...@apache.org.
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/483bfa64
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/483bfa64
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/483bfa64
Branch: refs/heads/jira/solr-8593
Commit: 483bfa642322c2558e9696dccabf0ea60b5724de
Parents: 7371947 5b3565e
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Jan 13 14:35:53 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Jan 13 14:35:53 2017 -0500
----------------------------------------------------------------------
build.xml | 2 +-
lucene/CHANGES.txt | 3 +++
lucene/common-build.xml | 2 +-
solr/contrib/ltr/README.md | 10 +++++-----
solr/contrib/ltr/example/README.md | 2 +-
.../sample_techproducts_configs/conf/solrconfig.xml | 6 +++---
.../solr/client/solrj/impl/CloudSolrClientTest.java | 4 ++--
7 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/4] lucene-solr:jira/solr-8593: SOLR-8542: changed Solr Reference
Guide section references from "Result Reranking" to "Learning To Rank"
Posted by kr...@apache.org.
SOLR-8542: changed Solr Reference Guide section references from "Result Reranking" to "Learning To Rank"
(Also added bullet points for the solr/contrib/ltr/README links.)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/987e2650
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/987e2650
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/987e2650
Branch: refs/heads/jira/solr-8593
Commit: 987e2650b54af5547ca44abc213cce3a73105f3f
Parents: dee7709
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Jan 12 17:53:35 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Jan 12 17:56:18 2017 +0000
----------------------------------------------------------------------
solr/contrib/ltr/README.md | 10 +++++-----
solr/contrib/ltr/example/README.md | 2 +-
.../sample_techproducts_configs/conf/solrconfig.xml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/987e2650/solr/contrib/ltr/README.md
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/README.md b/solr/contrib/ltr/README.md
index a997d16..cc28dcc 100644
--- a/solr/contrib/ltr/README.md
+++ b/solr/contrib/ltr/README.md
@@ -8,17 +8,17 @@ deploy that model to Solr and use it to rerank your top X search results.
# Getting Started With Solr Learning To Rank
For information on how to get started with solr ltr please see:
-[Solr Reference Guide's section on Result Reranking](https://cwiki.apache.org/confluence/display/solr/Result+Reranking)
+ * [Solr Reference Guide's section on Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank)
# Getting Started With Solr
For information on how to get started with solr please see:
-[solr/README.txt](../../README.txt)
-[Solr Quick Start](http://lucene.apache.org/solr/quickstart.html)
+ * [solr/README.txt](../../README.txt)
+ * [Solr Quick Start](http://lucene.apache.org/solr/quickstart.html)
# How To Contribute
For information on how to contribute see:
-http://wiki.apache.org/lucene-java/HowToContribute
-http://wiki.apache.org/solr/HowToContribute
+ * http://wiki.apache.org/lucene-java/HowToContribute
+ * http://wiki.apache.org/solr/HowToContribute
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/987e2650/solr/contrib/ltr/example/README.md
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/example/README.md b/solr/contrib/ltr/example/README.md
index 7842494..054c3ab 100644
--- a/solr/contrib/ltr/example/README.md
+++ b/solr/contrib/ltr/example/README.md
@@ -1,6 +1,6 @@
This README file is only about this example directory's content.
-Please refer to the Solr Reference Guide's section on [Result Reranking](https://cwiki.apache.org/confluence/display/solr/Result+Reranking) section for broader information on Learning to Rank (LTR) with Apache Solr.
+Please refer to the Solr Reference Guide's section on [Learning To Rank](https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank) section for broader information on Learning to Rank (LTR) with Apache Solr.
# Start Solr with the LTR plugin enabled
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/987e2650/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 990a23f..69a1519 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -515,7 +515,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
- https://cwiki.apache.org/confluence/display/solr/Result+Reranking
+ https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
-->
<cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"
class="solr.search.LRUCache"
@@ -1613,7 +1613,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
- https://cwiki.apache.org/confluence/display/solr/Result+Reranking
+ https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
Query parser is used to rerank top docs with a provided model
-->
@@ -1654,7 +1654,7 @@
when running solr to run with ltr enabled:
-Dsolr.ltr.enabled=true
- https://cwiki.apache.org/confluence/display/solr/Result+Reranking
+ https://cwiki.apache.org/confluence/display/solr/Learning+To+Rank
-->
<transformer enable="${solr.ltr.enabled:false}" name="features" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory">
<str name="fvCacheName">QUERY_DOC_FV</str>
[3/4] lucene-solr:jira/solr-8593: LUCENE-7596: Update Groovy to
version 2.4.8 to allow building with Java 9 build 148+. Also update JGit
version for working-copy checks.
Posted by kr...@apache.org.
LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9 build 148+. Also update JGit version for working-copy checks.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5b3565ed
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5b3565ed
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5b3565ed
Branch: refs/heads/jira/solr-8593
Commit: 5b3565ed7e6fe5a1d027f9f60e151a6fa2e2208b
Parents: 987e265
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Jan 13 20:20:31 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Jan 13 20:20:31 2017 +0100
----------------------------------------------------------------------
build.xml | 2 +-
lucene/CHANGES.txt | 3 +++
lucene/common-build.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b3565ed/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c06273c..07c01c2 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
<project name="lucene-solr" default="-projecthelp" basedir=".">
<import file="lucene/common-build.xml"/>
- <property name="jgit-version" value="4.4.1.201607150455-r"/>
+ <property name="jgit-version" value="4.6.0.201612231935-r"/>
<property name="tests.heap-dump-dir" location="heapdumps"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b3565ed/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4912920..040f4e0 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -270,6 +270,9 @@ Build
Lucene and Solr DOAP RDF files into the Git source repository under
dev-tools/doap/ and then pulling release dates from those files, rather than
from JIRA. (Mano Kovacs, hossman, Steve Rowe)
+
+* LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9
+ build 148+. Also update JGit version for working-copy checks. (Uwe Schindler)
======================= Lucene 6.3.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b3565ed/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 42cd140..87d2e0a 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2332,7 +2332,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<!-- GROOVY scripting engine for ANT tasks -->
<target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
- <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.6"
+ <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.8"
inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
<taskdef name="groovy"
classname="org.codehaus.groovy.ant.Groovy"