You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/06/02 10:01:24 UTC
[1/3] lucene-solr:master: LUCENE-7852: Correct copyright year(s) in
lucene/LICENSE.txt and solr/LICENSE.txt files
Repository: lucene-solr
Updated Branches:
refs/heads/master 5b93b738b -> 445ceda01
LUCENE-7852: Correct copyright year(s) in lucene/LICENSE.txt and solr/LICENSE.txt files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/72ba34f6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/72ba34f6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/72ba34f6
Branch: refs/heads/master
Commit: 72ba34f66c60c6d6a052502c99f8f28c6b671e38
Parents: 5b93b73
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 2 10:36:07 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 2 10:36:07 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
lucene/NOTICE.txt | 2 +-
solr/CHANGES.txt | 3 +++
solr/NOTICE.txt | 4 ++--
4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/72ba34f6/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 79a30fa..4e2e4f2 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -110,6 +110,9 @@ Other
* LUCENE-7540: Upgrade ICU to 59.1 (Mike McCandless, Jim Ferenczi)
+* LUCENE-7852: Correct copyright year(s) in lucene/LICENSE.txt file.
+ (Christine Poerschke, Steve Rowe)
+
======================= Lucene 6.7.0 =======================
Other
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/72ba34f6/lucene/NOTICE.txt
----------------------------------------------------------------------
diff --git a/lucene/NOTICE.txt b/lucene/NOTICE.txt
index 6260f3b..1903adc 100644
--- a/lucene/NOTICE.txt
+++ b/lucene/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Lucene
-Copyright 2014 The Apache Software Foundation
+Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/72ba34f6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 106a4df..af9ec5e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -215,6 +215,9 @@ Other Changes
* SOLR-10791: Remove deprecated options in SSLTestConfig (hossman)
+* LUCENE-7852: Correct copyright year(s) in solr/LICENSE.txt file.
+ (Christine Poerschke, Steve Rowe)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/72ba34f6/solr/NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt
index 214a2f8..4f3fa2a 100644
--- a/solr/NOTICE.txt
+++ b/solr/NOTICE.txt
@@ -1,6 +1,6 @@
==============================================================
Apache Solr
- Copyright 2006-2014 The Apache Software Foundation
+ Copyright 2006-2017 The Apache Software Foundation
==============================================================
This product includes software developed at
@@ -119,7 +119,7 @@ parrt@antlr.org
=========================================================================
Apache Lucene
-Copyright 2014 The Apache Software Foundation
+Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[3/3] lucene-solr:master: LUCENE-7858: checkJavadocLinks.py to
mention common root causes of broken links
Posted by cp...@apache.org.
LUCENE-7858: checkJavadocLinks.py to mention common root causes of broken 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/445ceda0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/445ceda0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/445ceda0
Branch: refs/heads/master
Commit: 445ceda01cb5355d4a21a095a19fe1af2b28959e
Parents: cccf97c
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 2 10:40:53 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 2 10:40:53 2017 +0100
----------------------------------------------------------------------
dev-tools/scripts/checkJavadocLinks.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/445ceda0/dev-tools/scripts/checkJavadocLinks.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/checkJavadocLinks.py b/dev-tools/scripts/checkJavadocLinks.py
index e5ff2f3..2e3cdea 100644
--- a/dev-tools/scripts/checkJavadocLinks.py
+++ b/dev-tools/scripts/checkJavadocLinks.py
@@ -266,7 +266,10 @@ def checkAll(dirName):
if __name__ == '__main__':
if checkAll(sys.argv[1]):
print()
- print('Broken javadocs links were found!')
+ print('Broken javadocs links were found! Common root causes:')
+ # please feel free to add to this list
+ print('* A typo of some sort for manually created links.')
+ print('* Public methods referencing non-public classes in their signature.')
sys.exit(1)
sys.exit(0)
[2/3] lucene-solr:master: SOLR-10790: Fix warnings in Assign.java and
ReplicaAssigner.java classes.
Posted by cp...@apache.org.
SOLR-10790: Fix warnings in Assign.java and ReplicaAssigner.java classes.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cccf97ca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cccf97ca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cccf97ca
Branch: refs/heads/master
Commit: cccf97cae85e4714c2e7a5f042032c9fce2f47cf
Parents: 72ba34f
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 2 10:39:18 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 2 10:39:18 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/cloud/Assign.java | 2 +-
.../core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index af9ec5e..d8c9d04 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -298,6 +298,9 @@ Other Changes
* SOLR-10741: Factor out createSliceShardsStr method from HttpShardHandler.prepDistributed.
(Domenico Fabio Marino via Christine Poerschke)
+* SOLR-10790: Fix warnings in Assign.java and ReplicaAssigner.java classes.
+ (Christine Poerschke)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/core/src/java/org/apache/solr/cloud/Assign.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Assign.java b/solr/core/src/java/org/apache/solr/cloud/Assign.java
index 265e453..63e006e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Assign.java
@@ -98,7 +98,7 @@ public class Assign {
map.put(shardId, cnt);
}
- Collections.sort(shardIdNames, (o1, o2) -> {
+ Collections.sort(shardIdNames, (String o1, String o2) -> {
Integer one = map.get(o1);
Integer two = map.get(o2);
return one.compareTo(two);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
index 506e158..669e82b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
@@ -211,7 +211,7 @@ public class ReplicaAssigner {
int startPosition = 0;
Map<String, Map<String, Integer>> copyOfCurrentState = getDeepCopy(shardVsNodes, 2);
List<String> sortedLiveNodes = new ArrayList<>(this.participatingLiveNodes);
- Collections.sort(sortedLiveNodes, (n1, n2) -> {
+ Collections.sort(sortedLiveNodes, (String n1, String n2) -> {
int result1 = 0;
for (int i = 0; i < rulePermutation.length; i++) {
Rule rule = rules.get(rulePermutation[i]);