!;
-sub wanted;
+my $credentials = '';
+if ($m2_credentials_prompt !~ /\A(?s:f(?:alse)?|no?)\z/) {
+ print $output_build_xml qq!
+
+ WARNING: ON SOME PLATFORMS YOUR PASSPHRASE WILL BE ECHOED BACK\!\!\!\!\!
+
+
+ \n!;
-File::Find::find({follow => 1, wanted => \&wanted}, $maven_dist_dir);
+ $credentials = q!
+
+ !;
+}
+
+for my $basepath (@basepaths) {
+ output_deploy_stanza($basepath);
+}
print $output_build_xml q!
@@ -72,7 +115,7 @@ close $output_build_xml;
print "Wrote '$output_build_xml_file' to stage $num_artifacts Maven artifacts.\n";
exit;
-sub wanted {
+sub find_poms {
/^(.*)\.pom\z/s && do {
my $pom_dir = $File::Find::dir;
if ($^O eq 'cygwin') { # Output windows-style paths on Windows
@@ -83,21 +126,36 @@ sub wanted {
my $basefile = $_;
$basefile =~ s/\.pom\z//;
my $basepath = "$pom_dir/$basefile";
- my $pom_file = "$basepath.pom";
- my $jar_file = "$basepath.jar";
- my $war_file = "$basepath.war";
+ push @basepaths, $basepath;
- if (-f $war_file) {
- print $output_build_xml qq!
+ if ($basefile =~ /grandparent/) {
+ $grandparent_pom = "$basepath.pom";
+ } elsif ($basefile =~ /parent/) {
+ push @parent_poms, "$basepath.pom";
+ }
+ }
+}
+
+sub output_deploy_stanza {
+ my $basepath = shift;
+ my $pom_file = "$basepath.pom";
+ my $jar_file = "$basepath.jar";
+ my $war_file = "$basepath.war";
+
+ if (-f $war_file) {
+ print $output_build_xml qq!
+ $parent_pom_targets
+ $credentials
\n!;
- } elsif (-f $jar_file) {
- print $output_build_xml qq!
+ } elsif (-f $jar_file) {
+ print $output_build_xml qq!
+ $parent_pom_targets
@@ -106,16 +164,18 @@ sub wanted {
+ $credentials
\n!;
- } else {
- print $output_build_xml qq!
+ } else {
+ print $output_build_xml qq!
+ $parent_pom_targets
+ $credentials
\n!;
- }
+ }
- ++$num_artifacts;
- };
+ ++$num_artifacts;
}
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8dbe8649d65..1f0f329f7e1 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -35,7 +35,7 @@ New Features
output for a single input. UpToTwoPositiveIntsOutputs was moved
from lucene/core to lucene/misc. (Mike McCandless)
-* LUCENE-3842: New AnalyzingCompletionLookup, for doing auto-suggest
+* LUCENE-3842: New AnalyzingSuggester, for doing auto-suggest
using an analyzer. This can create powerful suggesters: if the analyzer
remove stop words then "ghost chr..." could suggest "The Ghost of
Christmas Past"; if SynonymFilter is used to map wifi and wireless
@@ -83,6 +83,9 @@ Bug Fixes
romaji even for out-of-vocabulary kana cases (e.g. half-width forms).
(Robert Muir)
+* LUCENE-4504: Fix broken sort comparator in ValueSource.getSortField,
+ used when sorting by a function query. (Tom Shally via Robert Muir)
+
Optimizations
* LUCENE-4443: Lucene41PostingsFormat no longer writes unnecessary offsets
@@ -114,6 +117,10 @@ Optimizations
Build
+* Upgrade randomized testing to version 2.0.4: avoid hangs on shutdown
+ hooks hanging forever by calling Runtime.halt() in addition to
+ Runtime.exit() after a short delay to allow graceful shutdown (Dawid Weiss)
+
* LUCENE-4451: Memory leak per unique thread caused by
RandomizedContext.contexts static map. Upgrade randomized testing
to version 2.0.2 (Mike McCandless, Dawid Weiss)
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html
index 9935890da58..176d74d6718 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html
@@ -20,11 +20,6 @@
org.apache.lucene.analysis.payloads
-Provides various convenience classes for creating payloads on Tokens.
-
-
-
+Provides various convenience classes for creating payloads on Tokens.