Synchronize CHANGES entries.

lucene/CHANGES.txt

@@ -1135,7 +1135,62 @@ Other
   (Martijn van Groningen, Mike McCandless)
 
 ======================= Lucene 5.5.4 =======================
-(No Changes)
+
+Bug Fixes
+
+* LUCENE-7417: The standard Highlighter could throw an IllegalArgumentException when
+  trying to highlight a query containing a degenerate case of a MultiPhraseQuery with one
+  term.  (Thomas Kappler via David Smiley)
+
+* LUCENE-7657: Fixed potential memory leak in the case that a (Span)TermQuery
+  with a TermContext is cached. (Adrien Grand)
+
+* LUCENE-7647: Made stored fields reclaim native memory more aggressively when
+  configured with BEST_COMPRESSION. This could otherwise result in out-of-memory
+  issues. (Adrien Grand)
+
+* LUCENE-7562: CompletionFieldsConsumer sometimes throws
+  NullPointerException on ghost fields (Oliver Eilhard via Mike McCandless)
+
+* LUCENE-7547: JapaneseTokenizerFactory was failing to close the
+  dictionary file it opened (Markus via Mike McCandless)
+
+* LUCENE-6914: Fixed DecimalDigitFilter in case of supplementary code points.
+  (Hossman)
+
+* LUCENE-7440: Document id skipping (PostingsEnum.advance) could throw an
+  ArrayIndexOutOfBoundsException exception on large index segments (>1.8B docs)
+  with large skips. (yonik)
+
+* LUCENE-7570: IndexWriter may deadlock if a commit is running while
+  there are too many merges running and one of the merges hits a
+  tragic exception (Joey Echeverria via Mike McCandless)
+
+Other
+
+* 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
+
+* LUCENE-7543: Make changes-to-html target an offline operation, by moving the
+  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. 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)

solr/CHANGES.txt

@@ -2030,7 +2030,12 @@ Apache ZooKeeper 3.4.6
 Jetty 9.3.14.v20161028
 
 
-(No Changes)
+Other Changes
+----------------------
+
+* SOLR-9819: Upgrade commons-fileupload to 1.3.2, fixing a potential vulnerability CVE-2016-3092 (Anshum Gupta)
+
+* SOLR-10031: Validation of filename params in ReplicationHandler (Hrishikesh Gadre, janhoy)
 
 
 ======================= 5.5.3 =======================