You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/10/26 21:13:18 UTC

[4/5] lucene-solr:branch_7x: Add version 6.6.2. Sync 6.6.2 CHANGES entries. Add 6.6.2 back compat test indexes.

Add version 6.6.2.  Sync 6.6.2 CHANGES entries.  Add 6.6.2 back compat test indexes.


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

Branch: refs/heads/branch_7x
Commit: 2e1a35c5762d9180f201e1d633b6255b21305a80
Parents: ca084ed
Author: Steve Rowe <sa...@gmail.com>
Authored: Thu Oct 26 16:56:27 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 16:56:27 2017 -0400

----------------------------------------------------------------------
 .../__pycache__/scriptutil.cpython-35.pyc       | Bin 0 -> 5048 bytes
 lucene/CHANGES.txt                              |  12 ++++++
 .../index/TestBackwardsCompatibility.java       |  21 ++--------
 .../org/apache/lucene/index/index.6.6.2-cfs.zip | Bin 0 -> 15820 bytes
 .../apache/lucene/index/index.6.6.2-nocfs.zip   | Bin 0 -> 15807 bytes
 .../org/apache/lucene/index/sorted.6.6.2.zip    | Bin 0 -> 75142 bytes
 .../java/org/apache/lucene/util/Version.java    |   7 ++++
 solr/CHANGES.txt                                |  40 +++++++++++++++++++
 8 files changed, 62 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc b/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc
new file mode 100644
index 0000000..e04157d
Binary files /dev/null and b/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc differ

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c766a43..8781ed2 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -385,6 +385,18 @@ Other
   that are trivially replaced by LeafReader.terms() and MultiFields.getTerms()
   (David Smiley)
 
+======================= Lucene 6.6.2 =======================
+
+Changes in Runtime Behavior
+
+* Resolving of external entities in queryparser/xml/CoreParser is disallowed
+  by default. See SOLR-11477 for details.
+
+Bug Fixes
+
+* SOLR-11477: Disallow resolving of external entities in queryparser/xml/CoreParser
+  by default. (Michael Stepankin, Olga Barinova, Uwe Schindler, Christine Poerschke)
+
 ======================= Lucene 6.6.1 =======================
 
 Bug Fixes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 7c67ac2..09e83a8 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -312,6 +312,8 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
     "6.6.0-nocfs",
     "6.6.1-cfs",
     "6.6.1-nocfs",
+    "6.6.2-cfs",
+    "6.6.2-nocfs",
     "7.0.0-cfs",
     "7.0.0-nocfs",
     "7.0.1-cfs",
@@ -335,6 +337,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
     "sorted.6.5.1",
     "sorted.6.6.0",
     "sorted.6.6.1",
+    "sorted.6.6.2",
     "sorted.7.0.0",
     "sorted.7.0.1",
     "sorted.7.1.0"
@@ -561,24 +564,6 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
       }
     }
 
-    // BEGIN TRUNK ONLY BLOCK
-    // on trunk, the last release of the prev major release is also untested
-    Version lastPrevMajorVersion = null;
-    for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
-      if (Modifier.isStatic(field.getModifiers()) && field.getType() == Version.class) {
-        Version v = (Version)field.get(Version.class);
-        Matcher constant = constantPattern.matcher(field.getName());
-        if (constant.matches() == false) continue;
-        if (v.major == Version.LATEST.major - 1 &&
-            (lastPrevMajorVersion == null || v.onOrAfter(lastPrevMajorVersion))) {
-          lastPrevMajorVersion = v;
-        }
-      }
-    }
-    assertNotNull(lastPrevMajorVersion);
-    expectedVersions.remove(lastPrevMajorVersion.toString() + "-cfs");
-    // END TRUNK ONLY BLOCK
-
     Collections.sort(expectedVersions);
 
     // find what versions we are testing

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
new file mode 100644
index 0000000..e80ee98
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip differ

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
new file mode 100644
index 0000000..f39c2aa
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip differ

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
new file mode 100644
index 0000000..efbf665
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip differ

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/core/src/java/org/apache/lucene/util/Version.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java
index 4a477d4..1d54e55 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -123,6 +123,13 @@ public final class Version {
   public static final Version LUCENE_6_6_1 = new Version(6, 6, 1);
 
   /**
+   * Match settings and bugs in Lucene's 6.6.2 release.
+   * @deprecated Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_6_6_2 = new Version(6, 6, 2);
+
+  /**
    * Match settings and bugs in Lucene's 6.7.0 release.
    * @deprecated Use latest
    */

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1c3e28c..dbfb10d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -1131,6 +1131,46 @@ Other Changes
 
 * SOLR-11324: Clean up mention of trie fields in documentation and source comments. (Steve Rowe)
 
+==================  6.6.2 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.16
+Carrot2 3.15.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.10
+Jetty 9.3.14.v20161028
+
+Upgrade Notes
+----------------------
+
+* SOLR-11477: in the XML query parser (defType=xmlparser or {!xmlparser ... })
+  the resolving of external entities is now disallowed by default.
+
+* SOLR-11482: RunExecutableListener was deprecated and is disabled by default for
+  security reasons. Legacy applications still using it must explicitely pass
+  '-Dsolr.enableRunExecutableListener=true' to the Solr command line.
+  Be aware that you should really disable API-based config editing at the same
+  time, using '-Ddisable.configEdit=true'!  (Uwe Schindler)
+
+Bug Fixes
+----------------------
+
+* SOLR-11477: Disallow resolving of external entities in the XML query parser (defType=xmlparser).
+  (Michael Stepankin, Olga Barinova, Uwe Schindler, Christine Poerschke)
+
+
+* SOLR-11297: Message "Lock held by this virtual machine" during startup.  Solr is trying to start some cores twice.
+  (Luiz Armesto, Shawn Heisey, Erick Erickson)
+
+Other Changes
+----------------------
+
+* SOLR-10335: Upgrade to Tika 1.16. (Tim Allison, Tomás Fernández Löbbe via shalin)
+
 ==================  6.6.1 ==================
 
 Bug Fixes