Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix problems with changes2html.pl, mostly to do with marking things as attributions when they shouldn't be, or not when they should; and fixup formatting issues in lucene/CHANGES.txt and solr/CHANGES.txt 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1661772 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2015-02-23 20:39:02 +00:00
parent b03688ebee
commit acbba205a7
3 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -6222,8 +6222,8 @@ Optimizations
Test Cases Test Cases
* LUCENE-3327: Fix AIOOBE when TestFSTs is run with * LUCENE-3327: Fix AIOOBE when TestFSTs is run with -Dtests.verbose=true
-Dtests.verbose=true (James Dyer via Mike McCandless) (James Dyer via Mike McCandless)
Build Build

24
lucene/site/changes/changes2html.pl
View File

@ -545,6 +545,7 @@ for my $rel (@releases) {
}se; }se;
$bulleted_list; $bulleted_list;
}ge; }ge;
$uncode = markup_trailing_attribution($uncode);
$uncode; $uncode;
} }
}sge; }sge;
@ -626,13 +627,18 @@ print "</body>\n</html>\n";
sub markup_trailing_attribution { sub markup_trailing_attribution {
my $item = shift; my $item = shift;
# Put attributions on their own lines. # Put attributions on their own lines - this already happens if there is a preceding </ul>
my $extra_newline = ($item =~ m:</ul>:) ? '' : '<br />';
# Check for trailing parenthesized attribution with no following period. # Check for trailing parenthesized attribution with no following period.
# Exclude things like "(see #3 above)" and "(use the bug number instead of xxxx)" # Exclude things like "(see #3 above)" and "(use the bug number instead of xxxx)"
unless ($item =~ s{\s*(\((?![Ss]ee ) unless ($item =~ s{\s+(\((?![Ss]ee )
(?!spans\b) (?!spans\b)
(?!mainly\ ) (?!mainly\ )
(?!LUCENE-\d+\)) (?!LUCENE-\d+\))
(?!SOLR-\d+\))
(?!user's)
(?!like\ )
(?!r\d{6}) # subversion revision
(?!and\ ) (?!and\ )
(?!backported\ ) (?!backported\ )
(?!in\ ) (?!in\ )
@ -640,7 +646,7 @@ sub markup_trailing_attribution {
(?![Tt]he\ ) (?![Tt]he\ )
(?!use\ the\ bug\ number) (?!use\ the\ bug\ number)
[^()"]+?\))\s*$} [^()"]+?\))\s*$}
{\n<br /><span class="attrib">$1</span>}x) { {\n${extra_newline}<span class="attrib">$1</span>}x) {
# If attribution is not found, then look for attribution with a # If attribution is not found, then look for attribution with a
# trailing period, but try not to include trailing parenthesized things # trailing period, but try not to include trailing parenthesized things
# that are not attributions. # that are not attributions.
@ -650,10 +656,14 @@ sub markup_trailing_attribution {
# fewer words or it includes the word "via" or the phrase "updates from", # fewer words or it includes the word "via" or the phrase "updates from",
# then it is considered to be an attribution. # then it is considered to be an attribution.
$item =~ s{(\s*(\((?![Ss]ee\ ) $item =~ s{(\s+(\((?![Ss]ee\ )
(?!spans\b) (?!spans\b)
(?!mainly\ ) (?!mainly\ )
(?!LUCENE-\d+\)) (?!LUCENE-\d+\))
(?!SOLR-\d+\))
(?!user's)
(?!like\ )
(?!r\d{6}) # subversion revision
(?!and\ ) (?!and\ )
(?!backported\ ) (?!backported\ )
(?!in\ ) (?!in\ )
@ -669,8 +679,10 @@ sub markup_trailing_attribution {
if ($parenthetical !~ /LUCENE-\d+/) { if ($parenthetical !~ /LUCENE-\d+/) {
my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s; my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s;
my @words = grep {/\S/} split /\s+/, $no_parens; my @words = grep {/\S/} split /\s+/, $no_parens;
if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= 4) { my $commas = $no_parens =~ s/,/,/g; # count commas
$subst = "\n<br /><span class=\"attrib\">$parenthetical</span>"; my $max_words = 4 + $commas;
if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= $max_words) {
$subst = "\n${extra_newline}<span class=\"attrib\">$parenthetical</span>";
} }
} }
$subst . $trailing_period_and_or_issue; $subst . $trailing_period_and_or_issue;

38
solr/CHANGES.txt
View File

@ -188,6 +188,11 @@ Other Changes
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
NOTE: Solr 5.0 only supports creating and removing SolrCloud collections through
the collections API, unlike previous versions. While not using the
collections API may still work in 5.0, it is unsupported, not recommended,
and the behavior will change in a 5.x release.
Versions of Major Components Versions of Major Components
--------------------- ---------------------
Apache Tika 1.7 Apache Tika 1.7
@ -197,11 +202,6 @@ Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6 Apache ZooKeeper 3.4.6
Jetty 9.2.6.v20141205 Jetty 9.2.6.v20141205
NOTE: Solr 5.0 only supports creating and removing SolrCloud collections through
the collections API, unlike previous versions. While not using the
collections API may still work in 5.0, it is unsupported, not recommended,
and the behavior will change in a 5.x release.
Upgrading from Solr 4.x Upgrading from Solr 4.x
---------------------- ----------------------
@ -670,10 +670,10 @@ Bug Fixes
of all "keys" found in the request parameters, resulting in some key=value param pairs of all "keys" found in the request parameters, resulting in some key=value param pairs
being duplicated. This was noticeably affecting some areas of the code where iteration being duplicated. This was noticeably affecting some areas of the code where iteration
was done over the set of all params: was done over the set of all params:
* literal.* in ExtractingRequestHandler - literal.* in ExtractingRequestHandler
* facet.* in FacetComponent - facet.* in FacetComponent
* spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent - spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent
* olap.* in AnalyticsComponent - olap.* in AnalyticsComponent
(Alexandre Rafalovitch & hossman) (Alexandre Rafalovitch & hossman)
* SOLR-6920: A replicated index can end up corrupted when small files end up with the same * SOLR-6920: A replicated index can end up corrupted when small files end up with the same
@ -821,7 +821,7 @@ Other Changes
* SOLR-6751: Exceptions thrown in the analysis chain in DirectUpdateHandler2 * SOLR-6751: Exceptions thrown in the analysis chain in DirectUpdateHandler2
should return a BAD_REQUEST status (Alan Woodward) should return a BAD_REQUEST status (Alan Woodward)
* SOLR-6792 : deprecate AdminHandlers, Clean up solrconfig.xml of * SOLR-6792: deprecate AdminHandlers, Clean up solrconfig.xml of
unnecessary plugin definitions, implicit registration of /replication, unnecessary plugin definitions, implicit registration of /replication,
/get and /admin/* handlers (Noble Paul) /get and /admin/* handlers (Noble Paul)
@ -3207,18 +3207,18 @@ Bug Fixes
* SOLR-4910: persisting solr.xml is broken. More stringent testing of persistence fixed * SOLR-4910: persisting solr.xml is broken. More stringent testing of persistence fixed
up a number of issues and several bugs with persistence. Among them are up a number of issues and several bugs with persistence. Among them are
> don't persisting implicit properties - don't persisting implicit properties
> should persist zkHost in the <solr> tag (user's list) - should persist zkHost in the <solr> tag (user's list)
> reloading a core that has transient="true" returned an error. reload should load - reloading a core that has transient="true" returned an error. reload should load
a transient core if it's not yet loaded. a transient core if it's not yet loaded.
> No longer persisting loadOnStartup or transient core properties if they were not - No longer persisting loadOnStartup or transient core properties if they were not
specified in the original solr.xml specified in the original solr.xml
> Testing flushed out the fact that you couldn't swap a core marked transient=true - Testing flushed out the fact that you couldn't swap a core marked transient=true
loadOnStartup=false because it hadn't been loaded yet. loadOnStartup=false because it hadn't been loaded yet.
> SOLR-4862, CREATE fails to persist schema, config, and dataDir - SOLR-4862, CREATE fails to persist schema, config, and dataDir
> SOLR-4363, not persisting coreLoadThreads in <solr> tag - SOLR-4363, not persisting coreLoadThreads in <solr> tag
> SOLR-3900, logWatcher properties not persisted - SOLR-3900, logWatcher properties not persisted
> SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched - SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched
(Erick Erickson) (Erick Erickson)
* SOLR-4923: Commits to non leaders as part of a request that also contain updates * SOLR-4923: Commits to non leaders as part of a request that also contain updates