You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2017/02/07 14:49:44 UTC
[1/2] lucene-solr:branch_5_5: LUCENE-6989: Fix javadocs
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 d1fdf3ca2 -> 7751fac73
LUCENE-6989: Fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0f4ff122
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0f4ff122
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0f4ff122
Branch: refs/heads/branch_5_5
Commit: 0f4ff1227ac96511e48f5b528349b0512c1e5fc1
Parents: d1fdf3c
Author: Uwe Schindler <us...@apache.org>
Authored: Tue Feb 7 11:37:25 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Feb 7 11:37:25 2017 +0100
----------------------------------------------------------------------
lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4ff122/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java b/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
index 4893de4..74fc7a4 100644
--- a/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
+++ b/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
@@ -175,7 +175,7 @@ public class MMapDirectory extends FSDirectory {
* is closed while another thread is still accessing it (SIGSEGV).
* <p>To enable the hack, the following requirements need to be
* fulfilled: The used JVM must be Oracle Java / OpenJDK 8
- * <em>(preliminary support for Java 9 EA build 150+ was added with Lucene 6.4)</em>.
+ * <em>(preliminary support for Java 9 EA build 150+ was added with Lucene 6.4 and 5.5.4)</em>.
* In addition, the following permissions need to be granted
* to {@code lucene-core.jar} in your
* <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/security/PolicyFiles.html">policy file</a>:
[2/2] lucene-solr:branch_5_5: Update changes
Posted by us...@apache.org.
Update changes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7751fac7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7751fac7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7751fac7
Branch: refs/heads/branch_5_5
Commit: 7751fac7371b2adca8f0790ef2df87ac4fd2854f
Parents: 0f4ff12
Author: Uwe Schindler <us...@apache.org>
Authored: Tue Feb 7 15:49:25 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Feb 7 15:49:25 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7751fac7/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 0f5c701..071bec1 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -23,8 +23,9 @@ Bug Fixes
Other
-* LUCENE-6989: Backport MMapDirectory's unmapping code to use MethodHandles. This
- allows it to work with Java 9 EA build 150 and later. (Uwe Schindler)
+* LUCENE-6989: Backport MMapDirectory's unmapping code from Lucene 6.4 to use
+ MethodHandles. This allows it to work with Java 9 (EA build 150 and later).
+ (Uwe Schindler)
Build
@@ -34,13 +35,18 @@ Build
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-7651: Fix Javadocs build for Java 8u121 by injecting "Google Code
- Prettify" without adding Javascript to Javadocs's -bottom parameter.
- Also update Prettify to latest version to fix Google Chrome issue.
+ build 148+. Also update JGit version for working-copy checks. This does not
+ fix all issues with Java 9, but allows to build the distribution.
(Uwe Schindler)
+* LUCENE-7651: Backport (Lucene 6.4.1) fix for Java 8u121 to allow documentation
+ build to inject "Google Code Prettify" without adding Javascript to Javadocs's
+ -bottom parameter. Unfortunately, this fix disables Prettify if Javadocs are
+ built with Java 7, as there is no generic way in Java 7 to inject Javascript
+ without breaking Java 8 (and possible paid Java 7 security updates). This
+ fix also updates Prettify to latest version to work around a Google Chrome
+ issue. (Uwe Schindler)
+
======================= Lucene 5.5.3 =======================
(No Changes)