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/03/01 22:58:38 UTC

lucene-solr:branch_6x: LUCENE-7726: Fix HTML entity bugs in Javadocs to be able to build with Java 9

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 0b4ccab6d -> e51e50e55


LUCENE-7726: Fix HTML entity bugs in Javadocs to be able to build with Java 9


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

Branch: refs/heads/branch_6x
Commit: e51e50e557fe7d2652080179994d08bea3b74239
Parents: 0b4ccab
Author: Uwe Schindler <us...@apache.org>
Authored: Wed Mar 1 23:57:18 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Wed Mar 1 23:58:19 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                                                | 3 +++
 .../src/java/org/apache/lucene/index/memory/MemoryIndex.java      | 2 +-
 .../queries/src/java/org/apache/lucene/queries/BoostingQuery.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e51e50e5/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4ba2650..4f42692 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -172,6 +172,9 @@ Build
 * LUCENE-7693: Replace "org.apache." logic in GetMavenDependenciesTask.
   (Daniel Collins, Christine Poerschke)
 
+* LUCENE-7726: Fix HTML entity bugs in Javadocs to be able to build with
+  Java 9. (Uwe Schindler, Hossman)
+
 Other
 
 * LUCENE-7666: Fix typos in lucene-join package info javadoc.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e51e50e5/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
----------------------------------------------------------------------
diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
index 42281a2..a1390b3 100644
--- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
+++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
@@ -102,7 +102,7 @@ import org.apache.lucene.util.StringHelper;
  * <a target="_blank" 
  * href="http://bobwyman.pubsub.com/main/2005/05/mary_hodder_poi.html">Prospective Search</a>, 
  * Jim Gray's
- * <a target="_blank" href="http://www.acmqueue.org/modules.php?name=Content&pa=showpage&pid=293&page=4">
+ * <a target="_blank" href="http://www.acmqueue.org/modules.php?name=Content&amp;pa=showpage&amp;pid=293&amp;page=4">
  * A Call to Arms - Custom subscriptions</a>, and Tim Bray's
  * <a target="_blank" 
  * href="http://www.tbray.org/ongoing/When/200x/2003/07/30/OnSearchTOC">On Search, the Series</a>.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e51e50e5/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
index 713014c..8671a12 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
@@ -38,7 +38,7 @@ import org.apache.lucene.search.*;
  * demoting effect
  * 
  * This code was originally made available here: 
- *   <a href="http://marc.theaimsgroup.com/?l=lucene-user&m=108058407130459&w=2">http://marc.theaimsgroup.com/?l=lucene-user&amp;m=108058407130459&amp;w=2</a>
+ *   <a href="http://marc.theaimsgroup.com/?l=lucene-user&amp;m=108058407130459&amp;w=2">http://marc.theaimsgroup.com/?l=lucene-user&amp;m=108058407130459&amp;w=2</a>
  * and is documented here: http://wiki.apache.org/lucene-java/CommunityContributions
  */
 public class BoostingQuery extends Query {