Update databases/elasticsearch to 5.0.0.

* Now requires JDK 8.0.
* Use a different installation layout as some location are now impossible to
  change without patching the Java sources.

=== Breaking changes in 5.0 ===

Migration Plugin
- The elasticsearch-migration plugin (compatible with Elasticsearch 2.3.0
  and above) will help you to find issues that need to be addressed when
  upgrading to Elasticsearch 5.0.

Indices created before 5.0
- Elasticsearch 5.0 can read indices created in version 2.0 or above. An
  Elasticsearch 5.0 node will not start in the presence of indices created
  in a version of Elasticsearch before 2.0.
- Indices created in Elasticsearch 1.x or before will need to be reindexed
  with Elasticsearch 2.x in order to be readable by Elasticsearch 5.x. It is
  not sufficient to use the upgrade API.


=== Breaking changes

Aggregations::
- Remove size 0 options in aggregations

Aliases::
- make get alias expand to open and closed indices by default
- Remove deprecated indices.get_aliases

Allocation::
- Remove DisableAllocationDecider

Analysis::
- Remove `token_filter` in _analyze API
- Removes support for adding aliases to analyzers
- Analyze API : Rename filters/token_filters/char_filter in Analyze API in
  master

CAT API::
- Improve cat thread pool API
- Row-centric output for _cat/fielddata
- Add raw recovery progress to cat recovery API
- Remove host from cat nodes API
- Using the accept header in the request instead of content-type in _cat
  API.

CRUD::
- Fixed naming inconsistency for fields/stored_fields in the APIs
- Disallow creating indices starting with '-' or '+'
- Wait for changes to be visible by search
- Remove object notation for core types.

Cache::
- Remove deprecated query cache settings

Cluster::
- Persistent Node Ids
- Remove validation errors from cluster health response
- Remove memory section

Core::
- Remove ignore system bootstrap checks
- Remove minimum master nodes bootstrap check
- Keep input time unit when parsing TimeValues
- Remove cluster name from data path
- Add max number of processes check
- Add mlockall bootstrap check
- One log

Engine::
- Optimize indexing for the autogenerated ID append-only case
- Remove `index.compound_on_flush` setting and default to `true`

Exceptions::
- Die with dignity

Fielddata::
- Remove "uninverted" and "binary" fielddata support for numeric and boolean
  fields.

Geo::
- Deprecate GeoDistance enums and remove geo distance script helpers

Index APIs::
- Removes write consistency level across replication action APIs in favor of
  wait_for_active_shards
- Remove `GET` option for /_forcemerge
- Remove /_optimize REST API endpoint

Indexed Scripts/Templates::
- Store indexed scripts in the cluster state instead of the `.scripts` index

Inner Hits::
- Also do not serialize `_index` key in search response for parent/child
  inner hits
- Don't include `_id`, `_type` and `_index` keys in search response for
  inner hits
- Nested inner hits shouldn't use relative paths
- Drop top level inner hits in favour of inner hits defined in the query dsl

Internal::
- `_flush` should block by default
- Actually bound the generic thread pool
- Remove support for pre 2.0 indices

Logging::
- Introduce Log4j 2

Mapping::
- Remove `_timestamp` and `_ttl` on 5.x indices.
- Add a soft limit on the mapping depth.
- Disable fielddata on text fields by defaults.
- Add limit to total number of fields in mapping
- Change the field mapping index time boost into a query time boost.
- Deprecate string in favor of text/keyword.
- Term vector APIs should no longer update mappings
- Remove the `format` option of the `_source` field.
- Remove transform

Packaging::
- Rename service.bat to elasticsearch-service.bat
- Remove -D handling in args for windows plugin script
- Set default min heap equal to default max heap
- Remove allow running as root
- Require /bin/bash in packaging
- Remove plugin script parsing of system properties
- Add JVM options configuration file

Parent/Child::
- Removed `total` score mode in favour for `sum` score mode.
- Removed pre 2.x parent child implementation

Percolator::
- Remove `.percolator` type in favour of `percolator` field type
- Change the percolate api to not dynamically add fields to mapping

Plugin Delete By Query::
- Remove Delete-By-Query plugin

Plugin Lang Painless::
- Remove all date 'now' methods from Painless
- Make Painless the Default Language

Plugins::
- Plugins cleanup
- Rename bin/plugin in bin/elasticsearch-plugin
- Change the inner structure of the plugins zip
- Remove multicast plugin
- Plugins: Remove site plugins

Query DSL::
- Lessen leniency of the query dsl.
- Function score query: remove deprecated support for boost_factor
- Remove support for deprecated queries.

REST::
- Change separator for shards preference
- Parameter improvements to Cluster Health API wait for shards
- Switch indices.exists_type from `{index}/{type}` to
  `{index}/_mapping/{type}`.
- Only use `PUT` for index creation, not POST.
- Remove camelCase support
- Remove 'case' parameter from rest apis
- Disallow unquoted field names
- Limit the accepted length of the _id

Scripting::
- Hardcode painless as the default scripting lang and add legacy script
  default for stored scripts
- Remove deprecated 1.x script and template syntax
- Allow only a single extension for a scripting engine
- Remove 'sandbox' option for script settings, allow only registering a
  single language.

Search::
- Rename `fields` to `stored_fields` and add `docvalue_fields`
- Remove only node preference
- Add search preference to prefer multiple nodes
- Add a soft limit on the number of shards that can be queried in a single
  search request.
- Remove deprecated reverse option from sorting
- Remove some deprecations
- Remove search exists api
- Remove the scan and count search types.

Search Refactoring::
- Remove deprecated parameter from field sort builder.
- Remove "query" query and fix related parsing bugs

Settings::
- Default max local storage nodes to one
- Persistent Node Names
- Remove support for properties
- Rename boostrap.mlockall to bootstrap.memory_lock
- Register `indices.query.bool.max_clause_count` setting
- Remove settings and system properties entanglement
- Remove `action.get.realtime` setting
- Remove ability to specify arbitrary node attributes with `node.` prefix
- Enforce `discovery.zen.minimum_master_nodes` is set when bound to a public
  ip
- Prevent index level setting from being configured on a node level
- Remove support for node.client setting
- Remove es.max-open-files flag
- Enforce node level limits if node is started in production env
- Make settings validation strict
- Remove the ability to fsync on every operation and only schedule fsync
  task if really needed
- Script settings
- Remove index.flush_on_close entirely
- Restore chunksize of 512kb on recovery and remove configurability
- Remove ancient deprecated and alternative recovery settings

Similarities::
- Renames `default` similarity into `classic`

Snapshot/Restore::
- Change the default of `include_global_state` from true to false for
  snapshot restores
- Fail closing or deleting indices during a full snapshot

Stats::
- Modify load average format
- Reintroduce five-minute and fifteen-minute load averages on Linux
- Add system CPU percent to OS stats

Term Vectors::
- Remove DFS support from TermVector API

Translog::
- Drop support for simple translog and hard-wire buffer to 8kb
- Simplify translog-based flush settings

Warmers::
- Remove query warmers and the warmer API.


=== Breaking Java changes

Aggregations::
- getKeyAsString and key_as_string should be the same for terms aggregation
  on boolean field

Allocation::
- Move parsing of allocation commands into REST and remove support for
  plugins to register allocation commands
- Simplify shard balancer interface

Analysis::
- Simplify Analysis registration and configuration

CRUD::
- Removing isCreated and isFound from the Java API

Cache::
- Refactor IndicesRequestCache to make it testable.
- Fold IndexCacheModule into IndexModule

Core::
- Remove ability to plug-in TransportService
- Register thread pool settings
- Bootstrap does not set system properties
- Remove es.useLinkedTransferQueue

Discovery::
- Introduce node handshake
- Include pings from client nodes in master election

Highlighting::
- Register Highlighter instances instead of classes

Internal::
- Remove TransportService#registerRequestHandler leniency
- Consolidate search parser registries
- Move all FetchSubPhases to o.e.search.fetch.subphase
- Squash the rest of o.e.rest.action
- Clean up BytesReference
- Cleanup ClusterService dependencies and detached from Guice
- Simplify SubFetchPhase interface
- Simplify FetchSubPhase registration and detach it from Guice
- Remove duplicate getters from DiscoveryNode and DiscoveryNodes
- Cli: Switch to jopt-simple
- Replace ContextAndHeaders with a ThreadPool based ThreadLocal
  implementation
- Remove NodeBuilder
- Fix IndexSearcherWrapper interface to not depend on the EngineConfig
- Cleanup query parsing and remove IndexQueryParserService
- Remove circular dependency between IndicesService and IndicesStore
- Remove guice injection from IndexStore and friends
- Replace IndicesLifecycle with a per-index IndexEventListener
- Simplify similarity module and friends
- Refactor SearchRequest to be parsed on the coordinating node

Java API::
- Add a dedicated client/transport project for transport-client
- Remove setRefresh
- Remove the count api
- IdsQueryBuilder to accept only non null ids and types

Mapping::
- [Mapping] Several MappingService cleanups

Network::
- Factor out abstract TCPTransport* classes to reduce the netty footprint
- Remove ability to disable Netty gathering writes

Parent/Child::
- Cleanup ParentFieldMapper
- Several other parent/child cleanups

Percolator::
- Move the percolator from core to its own module
- Remove percolator cache

Plugins::
- Cleanup sub fetch phase extension point
- Remove IndexTemplateFilter
- Switch custom ShardsAllocators to pull based model
- Make custom allocation deciders use pull based extensions
- Migrate query registration from push to pull
- Add components getter as bridge between guice and new plugin init world
- Remove CustomNodeAttributes extension point
- Add RepositoryPlugin interface for registering snapshot repositories
- Simplified repository api for snapshot/restore
- Switch most search extensions from push to pull
- Move RestHandler registration to ActionModule and ActionPlugin
- Pull actions from plugins
- Switch analysis from push to pull
- Remove guice from Mapper plugins
- Fail to start if plugin tries broken onModule
- Simplify ScriptModule and script registration
- Cut over settings registration to a pull model
- Enforce isolated mode for all plugins
- Don't use guice for QueryParsers
- Remove guice from the index level
- Remove shard-level injector

Query DSL::
- Remove the MissingQueryBuilder which was deprecated in 2.2.0.
- Remove NotQueryBuilder

Scripting::
- Remove o.e.script.Template class and move template query to lang-mustache
  module
- Move search template to lang-mustache module
- Remove LeafSearchScript.runAsFloat(): Nothing calls it.

Search::
- Remove FetchSubPhaseParseElement
- Refactor of query profile classes to make way for other profile
  implementations
- Query refactoring: split parse phase into fromXContent and toQuery for all
  queries

Search Refactoring::
- Refactored inner hits parsing and intoduced InnerHitBuilder
- Remove support for query_binary and filter_binary
- Validate query api: move query parsing to the coordinating node

Settings::
- Remove `node.mode` and `node.local` settings
- Remove Settings.settingsBuilder.
- Move remaining settings in NettyHttpServerTransport to the new infra
- Replace IndexSettings annotation with a full-fledged class
- Fix ping timeout settings inconsistencies

Snapshot/Restore::
- Removes extra writeBlob method in BlobContainer

Store::
- Standardize state format type for global and index level metadata

Suggesters::
- Remove suggest threadpool
- Remove suggest transport action


=== Deprecations

CRUD::
- Deprecate found and created in delete and index rest responses

Plugin Discovery Azure Classic::
- Deprecate discovery-azure and rename it to discovery-azure-classic

Plugin Mapper Attachment::
- Deprecate mapper-attachments plugin

Query DSL::
- Deprecate Indices query
- Deprecate mlt, in and geo_bbox query name shortcuts

Query Refactoring::
- Splits `phrase` and `phrase_prefix` in match query into
  `MatchPhraseQueryBuilder` and `MatchPhrasePrefixQueryBuilder`

Scripting::
- Deprecate Groovy, Python, and Javascript

Search::
- Deprecate fuzzy query

Templates::
- Deprecate template query


=== New features

Aggregations::
- Split regular histograms from date histograms.
- Adds aggregation profiling to the profile API
- New Matrix Stats Aggregation module

Aliases::
- Add an alias action to delete an index

Allocation::
- Add API to explain why a shard is or isn't assigned

Analysis::
- Exposing lucene 6.x minhash filter.
- Add `fingerprint` token filter and `fingerprint` analyzer

Circuit Breakers::
- Circuit break on aggregation bucket numbers with request breaker

Discovery::
- Add two phased commit to Cluster State publishing

Geo::
- Cut over geo_point field and queries to new LatLonPoint type

Index APIs::
- Add rollover API to switch index aliases given some predicates

Ingest::
- ingest-useragent plugin
- Add a Sort ingest processor
- Add date_index_name processor
- Merge feature/ingest branch into master branch

Java REST Client::
- Introduce async performRequest method
- Low level Rest Client

Mapping::
- Add `scaled_float`.
- Expose half-floats.
- Add a text field.
- Add a new `keyword` field.

Percolator::
- index the query terms from the percolator query

Plugin Analysis ICU::
- Adding support for customizing the rule file in ICU tokenizer

Plugin Discovery File::
- File-based discovery plugin

Plugin Ingest Attachment::
- Ingest: Add attachment processor

Plugin Mapper Attachment::
- Migrate mapper attachments plugin to main repository

Plugin Repository HDFS::
- HDFS Snapshot/Restore plugin

Plugin Repository S3::
- Add support for path_style_access

Query DSL::
- Adds a rewrite phase to queries on the shard level

Reindex API::
- Reindex from remote
- Port Delete By Query to Reindex infrastructure
- Merge reindex to master

Scripting::
- Exceptions and Infinite Loop Checking
- Added a new scripting language (PlanA)

Scroll::
- Add the ability to partition a scroll in multiple slices.

Search::
- Add the ability to disable the retrieval of the stored fields entirely
- Add `search_after` parameter in the SearchAPI

Settings::
- Add infrastructure to transactionally apply and reset dynamic settings

Snapshot/Restore::
- Add Google Cloud Storage repository plugin

Stats::
- Extend field stats to report searchable/aggregatable fields
- API for listing index file sizes

Store::
- Expose MMapDirectory.preLoad().
- Add primitive to shrink an index into a single shard

Suggesters::
- Add support for returning documents with completion suggester
- Add document-oriented completion suggester

Task Manager::
- Add task cancellation mechanism
- Make the Task object available to the action caller
- Task Management: Add framework for registering and communicating with
  tasks

Translog::
- Add `elasticsearch-translog` CLI tool with `truncate` command


=== Enhancements

Aggregations::
- Make the heuristic to compute the default shard size less aggressive.
- Add _bucket_count option to buckets_path
- Remove AggregationStreams
- Migrate serial_diff aggregation to NamedWriteable
- Migrate most remaining pipeline aggregations to NamedWriteable
- Migrate moving_avg pipeline aggregation to NamedWriteable
- Migrate matrix_stats to NamedWriteable
- Migrate derivative pipeline aggregation to NamedWriteable
- Migrate top_hits, histogram, and ip_range aggregations to NamedWriteable
- Migrate nested, reverse_nested, and children aggregations to
  NamedWriteable
- Migrate geohash_grid and geo_bounds aggregations to NamedWriteable
- Clean up significant terms aggregation results
- Migrate range, date_range, and geo_distance aggregations to NamedWriteable
- Migrate terms aggregation to NamedWriteable
- Migrate sampler and missing aggregations to NamedWriteable
- Migrate global, filter, and filters aggregation to NamedWriteable
- Migrate the cardinality, scripted_metric, and geo_centroid aggregations to
  NamedWriteable
- Use a static default precision for the cardinality aggregation.
- Migrate more aggregations to NamedWriteable
- Migrate stats and extended stats to NamedWriteable
- Migrate sum, min, and max aggregations over to NamedWriteable
- Start migration away from aggregation streams
- Automatically set the collection mode to breadth_first in the terms
  aggregation when the cardinality of the field is unknown or smaller than
  the requested size.
- Rename PipelineAggregatorBuilder to PipelineAggregationBuilder.
- AggregatorBuilder and PipelineAggregatorBuilder do not need generics.
- Rename AggregatorBuilder to AggregationBuilder
- Add the ability to use the breadth_first mode with nested aggregations
  (such as `top_hits`) which require access to score information.
- Make significant terms work on fields that are indexed with points.
- Add tests and documentation for using `time_zone` in date range
  aggregation
- Fixes serialisation of Ranges

Allocation::
- Verify AllocationIDs in replication actions
- Mark shard as stale on non-replicated write, not on node shutdown
- Add routing changes API to RoutingAllocation
- Primary shard allocator observes limits in forcing allocation
- Use primary terms as authority to fail shards
- Add recovery source to ShardRouting
- Allow `_shrink` to N shards if source shards is a multiple of N
- Only filter intial recovery (post API) when shrinking an index
- Estimate shard size for shrinked indices
- Only fail relocation target shard if failing source shard is a primary
- Simplify delayed shard allocation
- Limit retries of failed allocations per index
- Immutable ShardRouting
- Add the shard's store status to the explain API
- Write shard state metadata as soon as shard is created / initializing
- Reuse existing allocation id for primary shard allocation
- Remove version in ShardRouting (now obsolete)
- Prefer nodes that previously held primary shard for primary shard
  allocation
- Extend reroute with an option to force assign stale primary shard copies
- Allocate primary shards based on allocation IDs
- Persist currently started allocation IDs to index metadata
- Use ObjectParser to parse AllocationID
- Persist allocation ID with shard state metadata on nodes

Analysis::
- Stop using cached component in _analyze API
- Specify custom char_filters/tokenizer/token_filters in the analyze API
- Add a MultiTermAwareComponent marker interface to analysis factories.
- Add Flags Parameter for Char Filter
- Core: better error message when analyzer created without tokenizer or…
- Move AsciiFolding earlier in FingerprintAnalyzer filter chain
- Improve error message if resource files have illegal encoding

Benchmark::
- Add client-benchmark-noop-api-plugin to stress clients even more in
  benchmarks

CAT API::
- Add health status parameter to cat indices API
- Includes the index UUID in the _cat/indices API
- Add node name to Cat Recovery
- Add support for documented byte/size units and for micros as a time unit
  in _cat API
- Add _cat/tasks
- Cat health supports ts=0 option
- Expose http address in cat/nodes
- [cat/recovery] Make recovery time a TimeValue()
- :CAT API: remove space at the end of a line

CRUD::
- Renaming operation to result and reworking responses
- Adding _operation field to index, update, delete response.
- CRUD: Allow to get and set ttl as a time value/string

Cache::
- Enable option to use request cache for size > 0
- Cache FieldStats in the request cache
- Allow the query cache to be disabled.
- Enable the indices request cache by default

Circuit Breakers::
- Cluster Settings Updates should not trigger circuit breakers.
- Circuit break the number of inline scripts compiled per minute

Cluster::
- Add clusterUUID to RestMainAction output
- Batch process node left and node failure
- Index creation waits for write consistency shards
- Inline reroute with process of node join/master election
- Index creation does not cause the cluster health to go RED
- Cluster Health class improvements
- Adds tombstones to cluster state for index deletions
- Enable acked indexing
- Cluster Health should run on applied states, even if waitFor=0
- Resolve index names to Index instances early
- Remove DiscoveryNode#shouldConnectTo method
- Fail demoted primary shards and retry request
- Illegal shard failure requests
- Shard failure requests for non-existent shards
- Add handling of channel failures when starting a shard
- Wait for new master when failing shard
- Master should wait on cluster state publication when failing a shard
- Split cluster state update tasks into roles
- Add timeout mechanism for sending shard failures
- Add listener mechanism for failures to send shard failed

Core::
- Add production warning for pre-release builds
- Add serial collector bootstrap check
- Rename Netty TCP transports thread factories from http_* to transport_*
- Do not log full bootstrap checks exception
- Mark halting the virtual machine as privileged
- Makes index creation more friendly
- Clearer error when handling fractional time values
- Read Elasticsearch manifest via URL
- Throw if the local node is not set
- Bootstrap check for OnOutOfMemoryError and seccomp
- Log OS and JVM on startup
- Add GC overhead logging
- Refactor JvmGcMonitorService for testing
- Default to server VM and add client VM check
- Add system bootstrap checks escape hatch
- Avoid sliced locked contention in internal engine
- Add heap size bootstrap check
- Remove hostname from NetworkAddress.format
- Bootstrapping bootstrap checks
- Add max map count check
- Remove PROTOTYPE from BulkItemResponse.Failure
- Throw an exception if Writeable.Reader reads null
- Remove PROTOTYPE from RescorerBuilders
- Port Primary Terms to master
- Use index UUID to lookup indices on IndicesService
- Add -XX+AlwaysPreTouch JVM flag
- Add max size virtual memory check
- Use and test relative time in TransportBulkAction
- Bump Elasticsearch version to 5.0.0-SNAPSHOT
- Assert that we can write in all data-path on startup
- Add G1GC check on startup
- Shards with heavy indexing should get more of the indexing buffer
- Remove and ban ImmutableMap
- Finish banning ImmutableSet
- Removes and bans ImmutableSet
- Remove and ban ImmutableMap#entrySet
- Forbid ForwardingSet

Dates::
- Improve TimeZoneRoundingTests error messages
- Support full range of Java Long for epoch DateTime

Discovery::
- Do not log cluster service errors at after joining a master
- Log warning if minimum_master_nodes set to less than quorum
- Add a dedicate queue for incoming ClusterStates

Engine::
- Only try to read new segments info if we really flushed the index
- Use _refresh instead of reading from Translog in the RT GET case
- Remove writeLockTimeout from InternalEngine
- Don't guard IndexShard#refresh calls by a check to isRefreshNeeded
- Never call a listerner under lock in InternalEngine
- Use System.nanoTime() to initialize Engine.lastWriteNanos
- Flush big merges automatically if shard is inactive
- Remove Engine.Create
- Remove the disabled autogenerated id optimization from InternalEngine

Exceptions::
- Improve startup exception
- Make NotMasterException a first class citizen
- Do not catch throwable
- Make the index-too-old exception more explicit
- Add index name in IndexAlreadyExistsException default message
- Fix typos in exception/assert/log messages in core module.
- Add field names to several mapping errors
- Add serialization support for more important IOExceptions
- Adds exception objects to log messages.
- Add stack traces to logged exceptions where missing
- Remove reflection hacks from ElasticsearchException
- Rename QueryParsingException to a more generic ParsingException
- Add *Exception(Throwable cause) constructors/ call where appropriate

Expressions::
- improve date api for expressions/painless fields
- Support geo_point fields in lucene expressions
- Add support for .empty to expressions, and some docs improvements

Geo::
- GeoBoundingBoxQueryBuilder should throw IAE when topLeft and bottomRight
  are the same coordinate
- Enhanced lat/long error handling
- Fix a potential parsing problem in GeoDistanceSortParser
- Geo: Add validation of shapes to ShapeBuilders
- Make remaining ShapeBuilders implement Writeable
- Geo: Remove internal `translated` flag from LineStringBuilder
- Make PointBuilder, CircleBuilder & EnvelopeBuilder implement Writable
- Merging BaseLineString and BasePolygonBuilder with subclass
- Moving static factory methods to ShapeBuilders
- Remove InternalLineStringBuilder and InternalPolygonBuilder

Highlighting::
- Switch Highlighting to ObjectParser
- Use HighlightBuilder in SearchSourceBuilder
- Joint parsing of common global Hightlighter and subfield parameters
- Enable HighlightBuilder to create SearchContextHighlight
-  Add fromXContent method to HighlightBuilder

Index APIs::
- Add date-math support to `_rollover`
- Add Shrink request source parser to parse create index request body
- Fail hot_threads in a better way if unsupported by JDK

Index Templates::
- Add "version" field to Templates
- Parse and validate mappings on index template creation

Ingest::
- Add "version" field to Pipelines
- Make it possible for Ingest Processors to access AnalysisRegistry
- add ignore_missing option to convert,trim,lowercase,uppercase,grok,rename
- Add support for parameters to the script ingest processor
- introduce the JSON Processor
- Allow rename processor to turn leaf fields into branch fields
- remove ability to set field value in script-processor configuration
- Add REST _ingest/pipeline to get all pipelines
- Show ignored errors in verbose simulate result
- update foreach processor to only support one applied processor.
- Skip the execution of an empty pipeline
- Add `ignore_failure` option to all ingest processors
- new ScriptProcessor for Ingest
- Expose underlying processor to blame for thrown exception within
  CompoundProcessor
- Avoid string concatentation in IngestDocument.FieldPath
- add ability to specify multiple grok patterns
- add ability to disable ability to override values of existing fields in
  set processor
- Streamline option naming for several processors
- add automatic type conversion support to ConvertProcessor
- Give the foreach processor access to the rest of the document
- Added ingest statistics to node stats API
- Add `ingest_took` to bulk response
- Add ingest info to node info API, which contains a list of available
  processors
- Use diffs for ingest metadata in cluster state
- hide null-valued metadata fields from WriteableIngestDocument#toXContent
- Ingest: use bulk thread pool for bulk request processing (was index
  before)
- Add foreach processor
- revert PipelineFactoryError handling with throwing
  ElasticsearchParseException in ingest pipeline creation
- Add processor tags to on_failure metadata in ingest pipeline
- catch processor/pipeline factory exceptions and return structured error
  responses
- Ingest: move get/put/delete pipeline methods to ClusterAdminClient
- Geoip processor: remove redundant latitude and longitude fields and make
  location an object with lat and lon subfields

Inner Hits::
- Change scriptFields member in InnerHitBuilder to set

Internal::
- Remove poor-mans compression in InternalSearchHit and friends
- Don't register SearchTransportService handlers more than once
- Unguice SearchModule
- Deguice SearchService and friends
- NodeStats classes to implement Writeable rather then Streamable
- More info classes to implement Writeable rather than Streamable
- Internal: Split disk threshold monitoring from decider
- Switching LockObtainFailedException over to ShardLockObtainFailedException
- update and delete by query requests to implement
  IndicesRequest.Replaceable
- VersionFetchSubPhase should not use Versions#loadDocIdAndVersion
- Remove useless PK lookup in IndicesTTLService
- ignore some docker craziness in seccomp environment checks
- Make Priority an enum
- Snapshot UUIDs in blob names
- Add RestController method for deprecating in one step
- Tighten ensure atomic move cleanup
- Enable checkstyle ModifierOrder
- Expose task information from NodeClient
- Changed rest handler interface to take NodeClient
- Deprecate ExceptionsHelper.detailedMessage
- Factor out ChannelBuffer from BytesReference
- Cleanup Compressor interface
- Hot methods redux
- Remove forked joda time BaseDateTime class
- Support optional ctor args in ConstructingObjectParser
- Remove thread pool from page cache recycler
- Do not automatically close XContent objects/arrays
- Remove use of a Fields class in snapshot responses
- Removes multiple toXContent entry points for SnapshotInfo
- Removes unused methods in the o/e/common/Strings class
- Determine content length eagerly in HttpServer
- Consolidate query generation in QueryShardContext
- Make reset in QueryShardContext private
- Remove Strings#splitStringToArray
- Add toString() to GetResponse
- ConstructingObjectParser adapts ObjectParser for ctor args
- Makes Script type writeable
- FiltersAggregatorBuilder: Don't create new context for inner parsing
- Clean up serialization on some stats
- 	Normalize registration for SignificanceHeuristics
- Make (read|write)NamedWriteable public
- Use try-with-resource when creating new parser instances where possible
- Don't pass XContentParser to ParseFieldRegistry#lookup
- Internal: Remove threadlocal from document parser
- Cut range aggregations to registerAggregation
- Remove ParseFieldMatcher from AbstractXContentParser
- Remove parser argument from methods where we already pass in a parse
  context
- Switch SearchAfterBuilder to writeGenericValue
- Remove StreamableReader
- Cleanup nested, has_child & has_parent query builders for inner hits
  construction
- Make AllocationCommands NamedWriteables
- Isolate StreamableReader
- Create registration methods for aggregations similar to those for queries
- Remove PROTOTYPEs from QueryBuilders
- Remove registerQueryParser
- ParseField#getAllNamesIncludedDeprecated to not return duplicate names
- Rework a query parser and improve registration
- Clean up QueryParseContext and don't hold it inside
  QueryRewrite/ShardContext
- Remove PROTOTYPE from MLT.Item
- Remove PROTOTYPE from VersionType
- Remove PROTOTYPEs from highlighting
- Remove PROTOTYPEs from ingest
- Start to rework query registration
- Factor out slow logs into Search and IndexingOperationListeners
- Remove PROTOTYPE from Suggesters
- Remove PROTOTYPE from SortBuilders
- Remove PROTOTYPE from ShapeBuilders
- Replace FieldStatsProvider with a method on MappedFieldType.
- Stop using PROTOTYPE in NamedWriteableRegistry
- Support scheduled commands in current context
- Thread limits
- Remove leniency from segments info integrity checks
- Rename SearchServiceTransportAction to SearchTransportService
- Decouple the TransportService and ClusterService
- Refactor bootstrap checks
- Add LifecycleRunnable
- Hot inlined methods in your area
- Move IndicesQueryCache and IndicesRequestCache into IndicesService
- Forbid use of java.security.MessageDigest#clone()
- Make IndicesWarmer a private class of IndexService
- Simplify IndicesFieldDataCache and detach from guice
- Uppercase ells ('L') in long literals
- ShardId equality and hash code inconsistency
- Ensure all resources are closed on Node#close()
- Make index uuid available in Index, ShardRouting & ShardId
- Move RefreshTask into IndexService and use since task per index
- Make IndexingMemoryController private to IndicesService
- Cleanup IndexingOperationListeners infrastructure
- Remove and forbid use of j.u.c.ThreadLocalRandom
- Fix IntelliJ query builder type inference issues
- Remove and forbid use of Collections#shuffle(List) and Random#<init>()
- Remove and forbid use of the type-unsafe empty Collections fields
- Move IndicesService.canDeleteShardContent to use IndexSettings
- Simplify MonitorService construction and detach from guice
- Use Supplier for StreamInput#readOptionalStreamable
- Add variable-length long encoding
- Extend usage of IndexSetting class
- Fold SimilarityModule into IndexModule
- Move to lucene BoostQuery
- Use built-in method for computing hash code of longs
- Refactor ShardFailure listener infrastructure
- Add methods for variable-length encoding integral arrays
- Fold IndexAliasesService into IndexService
- Remove unneeded Module abstractions
- Query refactoring: simplify IndexQueryParserService parse methods
- Remove and forbid use of com.google.common.collect.Iterators
- Remove and forbid use of com.google.common.collect.ImmutableCollection
- Remove and forbid use of com.google.common.io.Resources
- Remove and forbid use of com.google.common.hash.*
- Remove and forbid use of com.google.common.net.InetAddresses
- Remove and forbid use of com.google.common.collect.EvictingQueue
- Replace Guava cache with simple concurrent LRU cache
- Remove ClusterSerivce and IndexSettingsService dependency from IndexShard
- Start making RecoverySourceHandler unittestable
- Remove IndexService dep. from IndexShard
- Remove ES internal deletion policies in favour of Lucenes implementations
- Move ShardTermVectorService to be on indices level as TermVectorService
- Move ShardPercolateService creation into IndexShard
- Remove `ExpressionScriptCompilationException` and
  `ExpressionScriptExecutionException`
- Reduced the number of ClusterStateUpdateTask variants
- Add a BaseParser helper for stream parsing
- Remove and forbid use of com.google.common.primitives.Ints
- Remove and forbid use of com.google.common.math.LongMath
- Remove and forbid use of com.google.common.base.Joiner
- Replace and ban next batch of Guava classes
- Remove and forbid use of com.google.common.collect.Iterables
- Replace LoadingCache usage with a simple ConcurrentHashMap
- Use Supplier instead of Reflection
- Remove and forbid use of com.google.common.base.Preconditions
- Remove and forbid use of guava Function, Charsets, Collections2
- Remove and forbid use of com.google.common.collect.ImmutableSortedMap
- Remove and forbid use of several com.google.common.util. classes
- Cleanup SearchRequest & SearchRequestBuilder
- Remove and forbid use of com.google.common.collect.Queues
- Remove and forbid use of com.google.common.base.Preconditions#checkNotNull
- Remove and forbid use of com.google.common.collect.Sets
- Remove and forbid use of com.google.common.collect.Maps
- Remove use of underscore as an identifier
- Remove and forbid the use of com.google.common.base.Predicate(s)?
- This commit removes com.google.common.io

Java API::
- Ensure PutMappingRequest.buildFromSimplifiedDef input are pairs
- Start from a random node number so that clients do not overload the first
  node configured
- Switch QueryBuilders to new MatchPhraseQueryBuilder
- Improve adding clauses to `span_near` and `span_or` query
- QueryBuilder does not need generics.
- Remove copy constructors from request classes and TransportMessage type

Java REST Client::
- Add support for a RestClient path prefix
- Add "Async" to the end of each Async RestClient method
- Allow RestClient to send array-based headers
- Add response body to ResponseException error message
- Simplify Sniffer initialization and automatically create the default
  HostsSniffer
- Remove duplicate dependency declaration for http client
- Add callback to customize http client settings
- Rest Client: add short performRequest method variants without params
  and/or body

Logging::
- Ensure logging is initialized in CLI tools
- Give useful error message if log config is missing
- Complete Elasticsearch logger names
- Add node name to decider trace logging
- Logging shutdown hack
- Disable console logging
- Skip loading of jansi from log4j2
- Configure AWS SDK logging configuration
- Warn if unsupported logging configuration present
- Size limit deprecation logs
- Increase visibility of deprecation logger
- Add log message about enforcing bootstrap checks
- Improve logging for batched cluster state updates
- Send HTTP Warning Header(s) for any Deprecation Usage from a REST request
- Throw IllegalStateException when handshake fails due to version or cluster
  mismatch

Mapping::
- Automatically downgrade text and keyword to string on indexes imported
  from 2.x
- Do not parse numbers as both strings and numbers when not included in
  `_all`.
- Don't index the `_version` field
- The root object mapper should support updating `numeric_detection`,
  `date_detection` and `dynamic_date_formats`.
- Automatically upgrade analyzed string fields that have `index_options` or
  `position_increment_gap` set.
- Mappings: Support dots in field names in mapping parsing
- Save one utf8 conversion in KeywordFieldMapper.
- Do not parse the created version from the settings every time a field is
  parsed.
- Elasticsearch should reject dynamic templates with unknown
  `match_mapping_type`.
- Upgrade `string` fields to `text`/`keyword` even if `include_in_all` is
  set.
- Adds a methods to find (and dynamically create) the mappers for the
  parents of a field with dots in the field name
- Automatically upgrade analyzed strings with an analyzer to `text`.
- Support dots in field names when mapping already exists
- Use the new points API to index numeric fields.
- Simplify AllEntries, AllField and AllFieldMapper:
- Make `parseMultiField` part of `parseField`.
- Automatically add a sub keyword field to string dynamic mappings.
- Remove friction from the mapping changes in 5.0.
- Rework norms parameters for 5.0.
- Moved dynamic field handling in doc parsing to end of parsing
- Remove the MapperBuilders utility class.
- Make the `index` property a boolean.
- Remove the ability to enable doc values with the `fielddata.format`
  setting.
- Be stricter about parsing boolean values in mappings.
- Fix default doc values to be enabled when a field is not indexed.
- Dynamically map floating-point numbers as floats instead of doubles.
- Simplify MetaDataMappingService.
- Remove MergeMappingException.

Network::
- Avoid early initializing Netty
- Network: Allow to listen on virtual interfaces.
- Explicitly tell Netty to not use unsafe
- Enable Netty 4 extensions
- Modularize netty
- Simplify TcpTransport interface by reducing send code to a single send
  method
- Do not start scheduled pings until transport start

Packaging::
- Add quiet option to disable console logging
- Explicitly disable Netty key set replacement
- Remove explicit parallel new GC flag
- Use JAVA_HOME or java.exe in PATH like the Linux scripts do
- Don't mkdir directly in deb init script
- Increase default heap size to 2g
- Switch init.d scripts to use bash
- Switch scripts to use bash
- Further simplifications of plugin script
- Pass ES_JAVA_OPTS to JVM for plugins script
- Remove unnecessary sleep from init script restart
- Explicitly set packaging permissions
- rpm uses non-portable `--system` flag to `useradd`
- Adding JAVA_HOME to documents and env config file
- Added RPM metadata
- Elasticsearch ownership for data, logs, and configs
- Fail early on JDK with compiler bug
- Make security non-optional
- Remove RuntimePermission("accessDeclaredMembers")
- Remove Guava as a dependency
- Remove Guava as a dependency

Percolator::
- Also support query term extract for queries wrapped inside a
  FunctionScoreQuery
- Add support for synonym query to percolator query term extraction
- Add percolator query extraction support for dismax query
- Improve percolate query performance by not verifying certain candidate
  matches
- Improve percolator query term extraction
- PercolatorQueryBuilder cleanup by using MemoryIndex#fromDocument(...)
  helper
- Add scoring support to the percolator query
- Add query extract support for the blended term query and the common terms
  query
- Add support for several span queries in ExtractQueryTermsService
- Add support for TermsQuery in ExtractQueryTermsService
- Replace percolate APIs with a percolator query

Plugin Analysis Kuromoji::
- Add nbest options and NumberFilter

Plugin Discovery EC2::
- Use `DefaultAWSCredentialsProviderChain` AWS SDK class for credentials
- Support new Asia Pacific (Mumbai) ap-south-1 AWS region
- Add support for proxy authentication for s3 and ec2

Plugin Discovery GCE::
- Allow `_gce_` network when not using discovery gce

Plugin Ingest Attachment::
- Minor attachment processor improvements

Plugin Lang Painless::
- Disable regexes by default in painless
- Catch OutOfMemory and StackOverflow errors in Painless
- Change Painless Tree Structure for Variable/Method Chains
- Add replaceAll and replaceFirst
- Painless Initializers
- Add augmentation
- Infer lambda arguments/return type
- Fix explicit casts and improve tests.
- Add lambda captures
- improve Debugger to print code even if it hits exception
- Move semicolon hack into lexer
- Add flag support to regexes
- improve lambda syntax (allow single expression)
- Remove useless dropArguments in megamorphic cache
- non-capturing lambda support
- fix bugs in operators and more improvements for the dynamic case
- improve unary operators and cleanup tests
- Add support for the find operator (=~) and the match operator (==~)
- Remove casts and boxing for dynamic math
- Refactor def math
- Add support for /regex/
- Array constructor references
- Method references to user functions
- Add } as a delimiter.
- Add Lambda Stub Node
- Add capturing method references
- Add Functions to Painless
- Add Method to Get New MethodWriters
- Static For Each
- Method reference support
- Add support for the new Java 9 MethodHandles#arrayLength() factory
- Improve painless compile-time exceptions
- add java.time packages to painless whitelist
- Add Function Reference Stub to Painless
- improve painless whitelist coverage of java api
- Definition cleanup
- Made def variable casting consistent with invokedynamic rules
- Use Java 9 Indy String Concats, if available
- Add method overloading based on arity
- Refactor WriterUtils to extend ASM GeneratorAdapter
- Whitelist expansion
- Remove boxing when loading and storing values in "def" fields/arrays,
  remove boxing onsimple method calls of "def" methods
- Some cleanups
- Use isAssignableFrom instead of relying on ClassCastException
- Build descriptor of array and field load/store in code
- Rename the dynamic call site factory to DefBootstrap
- Cleanup of DynamicCallSite
- Improve exception stacktraces
- Make Line Number Available in Painless
- Remove input, support params instead
- Decouple ANTLR AST from Painless
- _value support in painess?
- Long priority over Float
- _score as double, not float
- Add 'ctx' keyword to painless.
- Painless doc access
- Retrieve _score directly from Scorer
- Implement needsScore() correctly.
- Add synthetic length property as alias to Lists, so they can be used like
  arrays
- Use better typing for dynamic method calls
- Array load/store and length with invokedynamic
- Switch painless dynamic calls to invokedynamic, remove perf hack/cheat
- Add fielddata accessors (.value/.values/.distance()/etc)
- painless: optimize/simplify dynamic field and method access
- Painless: Single-Quoted Strings
- Painless Clean Up
- Make Painless a Module
- Minor Clean up
- Remove Extra String Concat Token

Plugin Mapper Attachment::
- minor attachments cleanups: IDE test support and EPUB format

Plugin Mapper Size::
- Add doc values support to the _size field in the mapper-size plugin

Plugin Repository Azure::
- Support global `repositories.azure.` settings
- Add timeout settings (default to 5 minutes)
- Remove AbstractLegacyBlobContainer

Plugin Repository HDFS::
- merge current hdfs improvements to master

Plugin Repository S3::
- Extract AWS Key from KeyChain instead of using potential null value
- Check that S3 setting `buffer_size` is always lower than `chunk_size`

Plugins::
- Revert "Display plugins versions"
- Provide error message when plugin id is missing
- Print message when removing plugin with config
- Plugins: Update official plugin location with unified release
- Allow plugins to upgrade global custom metadata on startup
- Switch aggregations from push to pull
- Display plugins versions
- Add ScriptService to dependencies available for plugin components
- Make NamedWriteableRegistry immutable and add extension point for named
  writeables
- Log one plugin info per line
- Make rest headers registration pull based
- Add resource watcher to services available for plugin components
- Add some basic services to createComponents for plugins
- Make plugins closeable
- Plugins: Add status bar on download
- Add did-you-mean for plugin cli
- Plugins: Remove name() and description() from api
- Emit nicer error message when trying to install unknown plugin
- Add plugin information for Verbose mode
- Cli: Improve output for usage errors
- Cli: Add verbose output with zip url when installing plugin
- PluginManager: Add xpack as official plugin
- CliTool: Cleanup and document Terminal
- Plugin cli: Improve maven coordinates detection
- Enforce plugin zip does not contain zip entries outside of the plugin dir
- CliTool: Allow unexpected exceptions to propagate
- Reduce complexity of plugin cli
- Remove Plugin.onIndexService.
- Open up QueryCache and SearcherWrapper extension points

Query DSL::
- Throw exception when multiple field names are provided as part of query
  short syntax
- Query parsers to throw exception when multiple field names are provided
- Allow empty json object in request body in `_count` API
- Treat zero token in `common` terms query as MatchNoDocsQuery
- Handle empty query bodies at parse time and remove EmptyQueryBuilder
- Enforce MatchQueryBuilder#maxExpansions() to be strictly positive
- Don't allow `fuzziness` for `multi_match` types `cross_fields`, `phrase`
  and `phrase_prefix`
- Add MatchNoDocsQuery, a query that matches no documents and prints the
  reason why in the toString method.
- Adds `ignore_unmapped` option to geo queries
- Adds `ignore_unmapped` option to nested and P/C queries
- SimpleQueryParser should call MappedFieldType.termQuery when appropriate.
- An `exists` query on an object should query a single term.
- Function Score Query: make parsing stricter
- Parsers should throw exception on unknown objects
- UNICODE_CHARACTER_CLASS fix

Query Refactoring::
- Add infrastructure to rewrite query builders
- Switch geo validation to enum

REST::
- Add a REST spec for the create API
- Add response params to REST params did you mean
- Add did you mean to strict REST params
- Add exclusion support to response filtering
- Only write forced_refresh if we forced a refresh
- Add Location header to the index, update, and create APIs
- Add support for `wait_for_events` to the `_cluster/health` REST endpoint
- Rename Search Template REST spec names
- Adding status field in _msearch error request bodies
- Add semicolon query string parameter delimiter
- Enable HTTP compression by default with compression level 3
- Allow JSON with unquoted field names by enabling system property
- More robust handling of CORS HTTP Access Control
- Add option to exclude based on paths in XContent

Recovery::
- Pass on maxUnsafeAutoIdTimestamp on recovery / relocation
- Non-blocking primary relocation hand-off
- index shard should be able to cancel check index on close.
- TransportNodesListGatewayStartedShards should fall back to disk based
  index metadata if not found in cluster state
- Recover broken IndexMetaData as closed
- Relocation source should be marked as relocating before starting recovery
  to primary relocation target
- Operation counter for IndexShard
- Primary relocation handoff
- Remove recovery threadpools and throttle outgoing recoveries on the master
- Refactor StoreRecoveryService to be a simple package private util class

Reindex API::
- Only ask for `_version` we need it
- Use fewer threads when reindexing-from-remote
- Support authentication with reindex-from-remote
- Support requests_per_second=-1 to mean no throttling in reindex
- Implement ctx.op = "delete" on _update_by_query and _reindex
- Make Reindex cancellation tests more uniform
- Makes DeleteByQueryRequest implements IndicesRequest
- Teach reindex to retry on search failures
- Remove ReindexResponse in favor of BulkIndexByScrollResponse
- Stricter validation of Reindex's requests_per_second
- Properly mark reindex's child tasks as child tasks
- Make reindex throttling dynamic
- Throttling support for reindex
- Add ingest pipeline support to reindex

Scripting::
- Parse script on storage instead of on retrieval
- Migrate elasticsearch native script examples to the main repo
- Remove ClusterState from compile api
- Mustache: Render Map as JSON
-  Compile each Groovy script in its own classloader
- Include script field even if it value is null
- Skipping hidden files compilation for script service
- Rename Plan A to Painless
- Add plumbing for script compile-time parameters
- Factor mustache -> modules/lang-mustache

Scroll::
- Add an index setting to limit the maximum number of slices allowed in a
  scroll request.

Search::
- Limit batch size when scrolling
- Record method counts while profiling query components
- Change default similarity to BM25
- Add a parameter to cap the number of searches the msearch api will
  concurrently execute
- Introduces GeoValidationMethod to GeoDistanceSortBuilder
- Switches from empty boolean query to matchNoDocs
- Allow binary sort values.
- Fail query if it contains very large rescores
- Type filters should not have a performance impact when there is a single
  type.
- Store _all payloads on 1 byte instead of 4.
- Refuse to load fields from _source when using the `fields` option and
  support wildcards.
- Add response into ClearScrollResponse
- Shuffle shards for _only_nodes + support multiple specifications like
  cluster API

Search Refactoring::
- Removes the now obsolete SearchParseElement implementations
- Remove RescoreParseElement
- Remove HighlighterParseElement
- Move top level parsing of sort element to SortBuilder
- Switch to using refactored SortBuilder instead of using BytesReference in
  serialization
- Add build() method to SortBuilder implementations
- Refactoring of Suggestions
- Move sort `order` field up into SortBuilder
- Moves SortParser:parse(...) to only require QueryShardContext
- Change internal representation of suggesters
- Make GeoDistanceSortBuilder serializable, 2nd try
- Move missing() from SortBuilder interface to class
- Remove deprecated parameters from ScriptSortBuilder
- Refactor GeoSortBuilder
- Refactor FieldSortBuilder
- Make sort order enum writable.
- Make DistanceUnit writable.
- RescoreBuilder: Add parsing and creating of RescoreSearchContext
- Make RescoreBuilder and nested QueryRescorer Writable
- Explain api: move query parsing to the coordinating node
- Switch query parsers to use ParseField
- Refactoring of Aggregations

Sequence IDs::
- Persist sequence number checkpoints
- Add sequence numbers to cat shards API

Settings::
- Add precise logging on unknown or invalid settings
- Make `action.auto_create_index` setting a dynamic cluster setting
- Removes space between # and the setting in elasticsearch.yml
- Validates new dynamic settings from the current state
- Improve error message if a setting is not found
- Cleanup placeholder replacement
- Switch to registered Settings for all IndexingMemoryController settings
- Add guard against null-valued settings
- Useful error message for null property placeholder
- Archive cluster level settings if unknown or broken
- Improve error message if setting is not found
- Improve upgrade experience of node level index settings
- Settings with complex matchers should not overlap
- Moves GCE settings to the new infra
- Add filtering support within Setting class
- Migrate AWS settings to new settings infrastructure
- Remove `gateway.initial_meta` and always rely on min master nodes
- Rewrite SettingsFilter to be immutable
- Simplify azure settings
- Convert PageCacheRecycler settings
- Monitor settings
- Cut over tribe node settings to new settings infra
- Convert multcast plugin settings to the new infra
- Convert `request.headers.*` to the new settings infra
- Migrate Azure settings to new settings infrastructure
- Validate logger settings and allow them to be reset via API
- Switch NodeEnvironment's settings to new settings
- Simplify AutoCreateIndex and add more tests
- Convert several pending settings
- Migrate query caching settings to the new settings infra.
- Convert `action.auto_create_index` and `action.master.force_local` to the
  new settings infra
- Convert `cluster.routing.allocation.type` and `processors` to the new
  settings infra.
- Validate tribe node settings on startup
- Move node.client, node.data, node.master, node.local and node.mode to new
  settings infra
- Moved http settings to the new settings infrastructure
- Migrate network service to the new infra
- Convert client.transport settings to new infra
- Move discovery.* settings to new Setting infrastructure
- Change over to o.e.common.settings.Setting for http settings
- Convert "path.*" and "pidfile" to new settings infra
- Migrate repository settings to the new settings API
- Convert "indices.*" settings to new infra.
- Migrate gateway settings to the new settings API.
- Convert several node and test level settings
- Run Metadata upgrade tool on every version
- Check for invalid index settings on metadata upgrade
- Validate the settings key if it's simple chars separated by `.`
- Validate known global settings on startup
- Cut over all index scope settings to the new setting infrastrucuture
- Remove updatability of `index.flush_on_close`
- Move all dynamic settings and their config classes to the index level
- Always require units for bytes and time settings
- Make MetaData parsing less lenient.
- Move async translog sync logic into IndexService
- Remove `index.merge.scheduler.notify_on_failure` and default to `true`
- Remove cache concurrency level settings that no longer apply

Similarities::
- Defining a global default similarity

Snapshot/Restore::
- Delete differing files in the store before restoring
- Adds ignoreUnavailable option to the snapshot status API
- Check restores in progress before deleting a snapshot
- Snapshot repository cleans up empty index folders
- BlobContainer#writeBlob no longer can overwrite a blob
- More resilient blob handling in snapshot repositories
- Adding repository index generational files
- Raised IOException on deleteBlob
- Adds UUIDs to snapshots
- Clarify the semantics of the BlobContainer interface
- Change BlobPath.buildAsString() method
- Remove the Snapshot class in favor of using SnapshotInfo

Stats::
- Add mem section back to cluster stats
- Add network types to cluster stats
- Add missing field type in the FieldStats response.
- Expose the ClusterInfo object in the allocation explain output
- Add total_indexing_buffer/_in_bytes to nodes info API
- Allow FieldStatsRequest to disable cache
- Remove index_writer_max_memory stat from segment stats
- Move DocStats under Engine to get more accurate numbers
- Do not return fieldstats information for fields that exist in the mapping
  but not in the index.
- Add whether the shard state fetch is pending to the allocation explain API
- Add Failure Details to every NodesResponse
- Add I/O statistics on Linux
- Add points to SegmentStats.
- Remove FieldStats.Float.
- Show configured and remaining delay for an unassigned shard.
- indexing stats now contain indexing ops from recovery  [ISSUE]
- Normalize unavailable load average
- Add load averages to OS stats on FreeBSD
- Expose pending cluster state queue size in node stats

Store::
- Use `mmapfs` by default.
- Remove support for legacy checksums
- Rename index folder to index_uuid

Suggesters::
- Move SuggestUtils methods to their respective caller classes
- Remove payload option from completion suggester
- Add bwc support for reading  pre-5.0 completion index

Task Manager::
- Rename Task Persistence into Storing Task Results
- Fetch result when wait_for_completion
- Create get task API that falls back to the .tasks index
- Add ability to store results for long running tasks
- Move parentTaskId into TransportRequest
- Shorten the serialization of the empty TaskId
- Expose whether a task is cancellable in the _tasks list API
- Add ability to group tasks by common parent
- Add start time and duration to tasks
- Combine node name and task id into single string task id
- Add task status
- Extend tracking of parent tasks to master node, replication and broadcast
  actions

Translog::
- Fsync documents in an async fashion
- Add checksumming and versions to the Translog's Checkpoint files
- Beef up Translog testing with random channel exceptions
- Do not replay into translog on local recovery
- FSync translog outside of the writers global lock
- Remove ChannelReference and simplify Views
- Simplify TranslogWriter to always write to a stream
- Remove TranslogService and fold it into synchronous IndexShard API


=== Bug fixes

Aggregations::
- Fixed writeable name from range to geo_distance
- Fix date_range aggregation to not cache if now is used
- The `top_hits` aggregation should compile scripts only once.
- Fix agg profiling when using breadth_first collect mode
- Throw exception when maxBounds greater than minBounds
- Undeprecates `aggs` in the search request
- Change how `nested` and `reverse_nested` aggs know about their nested
  depth level
- Make ExtendedBounds immutable
- Aggregations fix: support include/exclude strings for IP and dates
- Fix xcontent rendering of ip terms aggs.
- Improving parsing of sigma param for Extended Stats Bucket Aggregation
- Fixes NPE when no window is specified in moving average request
- Fixes Filter and FiltersAggregation to work with empty query
- Fixes the defaults for `keyed` in the percentiles aggregations
- Correct typo in class name of StatsAggregator

Allocation::
- Keep a shadow replicas' allocation id when it is promoted to primary
- IndicesClusterStateService should clean local started when re-assigns an
  initializing shard with the same aid
- IndexRoutingTable.initializeEmpty shouldn't override supplied primary
  RecoverySource
- Update incoming recoveries stats when shadow replica is reinitialized
- `index.routing.allocation.initial_recovery` limits replica allocation
- Upon being elected as master, prefer joins' node info to existing cluster
  state
- Fix NPE when initializing replica shard has no UnassignedInfo
- Make shard store fetch less dependent on the current cluster state, both
  on master and non data nodes
- Fix recovery throttling to properly handle relocating non-primary shards
- Replica shards must be failed before primary shards

Analysis::
- Named analyzer should close the analyzer that it wraps
- Can load non-PreBuiltTokenFilter in Analyze API
- Fix analyzer alias processing

Bulk::
- Add not-null precondition check in BulkRequest

CAT API::
- Fixes cat tasks operation in detailed mode
- Add index pattern wildcards support to _cat/shards

CRUD::
- GET operations should not extract fields from `_source`.
- Squash a race condition in RefreshListeners
- Prevent TransportReplicationAction to route request based on stale local
  routing table
- Resolves the conflict between alias routing and parent routing by applying
  the alias routing and ignoring the parent routing.

Cache::
- Prevent requests that use scripts or now() from being cached
- Serialize index boost and phrase suggest collation keys in a consistent
  order

Circuit Breakers::
- Never trip circuit breaker in liveness request
- Free bytes reserved on request breaker

Cluster::
- Fixes issue with dangling index being deleted instead of re-imported
- Allow routing table to be filtered by index pattern
- Use executor's describeTasks method to log task information in cluster
  service
- Acknowledge index deletion requests based on standard cluster state
  acknowledgment
- Dangling indices are not imported if a tombstone for the index exists
- Fix issue with tombstones matching active indices in cluster state
- Shard state action channel exceptions

Core::
- Makes `m` case sensitive in TimeValue
- Guard against negative result from FileStore.getUsableSpace when picking
  data path for a new shard
- Handle rejected execution exception on reschedule
- Fix concurrency bug in IMC that could cause it to check too infrequently
- Iterables.flatten should not pre-cache the first iterator
- Avoid race while retiring executors
- Refactor UUID-generating methods out of Strings
- Node names cleanup
- NullPointerException from IndexingMemoryController when a version conflict
  happens during recovery
- Handle RejectedExecution gracefully in TransportService during shutdown

Discovery::
- Update discovery nodes after cluster state is published
- Add current cluster state version to zen pings and use them in master
  election

Engine::
- Take refresh IOExceptions into account when catching ACE in InternalEngine
- Don't suppress AlreadyClosedException

Expressions::
- replace ScriptException with a better one

Geo::
- Incomplete results when using geo_distance for large distances [ISSUE]
- Fix multi-field support for GeoPoint types
- Enforce distance in distance query is > 0 [ISSUE]

Highlighting::
- Enable BoostingQuery with FVH highlighter

Index APIs::
- Fixes active shard count check in the case of `all` shards
- Add zero-padding to auto-generated rollover index name increment

Ingest::
- no null values in ingest configuration error messages
- JSON Processor was not properly added
- Don't rebuild pipeline on every cluster state update
- Add dotexpander processor
- Fix NPE when simulating a pipeline with no id
- Change foreach processor to use ingest metadata for array element
- No other processors should be executed after on_failure is called
- rethrow script compilation exceptions into ingest configuration exceptions
- Rename from `ingest-useragent` plugin to `ingest-user-agent` and its
  processor from `useragent` to `user_agent`
- Fix ignore_failure behavior in _simulate?verbose and more cleanup
- Pipeline Stats: Fix concurrent modification exception
- Validate properties values according to database type
- Ingest does not close its factories
- Handle regex parsing errors in Gsub and Grok Processors
- add on_failure exception metadata to ingest document for verbose simulate
- The IngestDocument copy constructor should make a deep copy

Inner Hits::
- Ensure that that InnerHitBuilder uses rewritten queries

Internal::
- Prevent AbstractArrays from release bytes more than once
- IndicesAliasesRequest should not implement CompositeIndicesRequest
- Ensure elasticsearch doesn't start with unuspported indices
- Remove ListTasksResponse#setDiscoveryNodes()
- Priority values should be unmodifiable
- Extract AbstractBytesReferenceTestCase
- Add XPointValues
- Fix BulkItemResponse.Failure.toString
- Enable unmap hack for java 9
- Fix issues with failed cache loads
- Allow parser to move on the START_OBJECT token when parsing search source
- Ensure searcher is release if wrapping fails
- Avoid deadlocks in Cache#computeIfAbsent

Java API::
- fix IndexResponse#toString to print out shards info
- Add NamedWriteables from plugins to TransportClient
- Fix potential NPE in SearchSourceBuilder

Java REST Client::
- Rest Client: add slash to log line when missing between host and uri
- Rest Client: HostsSniffer to set http as default scheme

Logging::
- Fix logger when you can not create an azure storage client
- Avoid unnecessary creation of prefix loggers
- Fix logging hierarchy configs
- Fix prefix logging
- Hack around Log4j bug rendering exceptions
- Avoid prematurely triggering logger initialization
- Only log running out of slots when out of slots

Mapping::
- Allow position_gap_increment for fields in indices created prior to 5.0
- Validate blank field name
- Better error message when mapping configures null
- Make doc_values accessible for _type
- Fix and test handling of `null_value`.
- Fail automatic string upgrade if the value of `index` is not recognized.
- Fix dynamic check to properly handle parents
- Fix array parsing to remove its context when finished parsing
- Disallow fielddata loading on text fields that are not indexed.
- Make dynamic template parsing less lenient.
- Fix dynamic mapper when its parent already has an update
- Fix copy_to when the target is a dynamic object field.
- Preserve existing mappings on batch mapping updates

Network::
- Fix connection close header handling
- Ensure port range is readable in the exception message
- Fix expect 100 continue header handling
- Fixes netty4 module's CORS config to use defaults
- Fix various concurrency issues in transport
- Verify lower level transport exceptions don't bubble up on disconnects

Packaging::
- [Packaging] Do not remove scripts directory on upgrade
- [Package] Remove bin/lib/modules directories on RPM uninstall/upgrade
- Fix handling of spaces for jvm.options on Windows
- Disable service in pre-uninstall
- Remove extra bin/ directory in bin folder
- Filter client/server VM options from jvm.options
- Preserve config files from RPM install
- Fix typo in message for variable setup ES_MAX_MEM
- Don't run `mkdir` when $DATA_DIR contains a comma-separated list
- Fix exit code
- Set MAX_OPEN_FILES to 65536
- [windows] Service command still had positional start command
- Do not pass double-dash arguments on startup

Parent/Child::
-  Make sure that no `_parent#null` gets introduces as default _parent
   mapping

Percolator::
- Fail indexing percolator queries containing either a has_child or
  has_parent query
- Add support for MatchNoDocsQuery in percolator's query terms extract
  service
- Let PercolatorQuery's explain use the two phase iterator

Plugin Discovery Azure Classic::
- Make discovery-azure plugin work again

Plugin Discovery EC2::
- Fix EC2 discovery settings
- Add TAG_SETTING to list of allowed tags for the ec2 discovery plugin.
- Fix EC2 Discovery settings

Plugin Discovery GCE::
- Fix NPE when GCE region is empty

Plugin Ingest Attachment::
- Adds content-length as number

Plugin Ingest GeoIp::
- [ingest-geoip] update geoip to not include null-valued results from

Plugin Lang Painless::
- Fix String Concatenation Bug In Painless
- Fix break bug in for/foreach loops.
- Fix compound assignment with string concats
- Fix horrible capture
- Fix Casting Bug
- Remove Grammar Ambiguities
- Remove if/else ANTLR ambiguity.
- Fix insanely slow compilation
- Fix Bug in Painless Assignment
- Fix bracket shortcuts

Plugin Repository Azure::
- Register group setting for repository-azure accounts
- Fix azure files removal

Plugin Repository S3::
- Fixes leading forward slash in S3 repository base_path
- Add missing permission to repository-s3
- Fix repository S3 Settings and add more tests

Plugin Store SMB::
- Fix calling ensureOpen() on the wrong directory (master forwardport)

Plugins::
- Use sysprop like with es.path.home to pass conf dir
- Quote path to java binary
- CliTool: Messages printed in Terminal should have percent char escaped

Query DSL::
- Fixes MultiMatchQuery so that it doesn't provide a null context
- Fix silently accepting malformed queries
- query_string_query should take term length into consideration when
  fuzziness is auto
- Throw ParsingException if a query is wrapped in an array
- Restore parameter name auto_generate_phrase_queries
- Resolve string dates and date math to millis before evaluating for rewrite
  in range query
- `constant_score` query should throw error on more than one filter
- Single IPv4 addresses in IP field term queries
- Make strategy optional in GeoShapeQueryBuilder readFrom and writeTo

Query Refactoring::
- Query refactoring: set has_parent & has_child types context properly
- Make sure equivalent geohashCellQueries are equal after toQuery called

REST::
- Remove lenient URL parameter parsing
- Fixes CORS handling so that it uses the defaults
- Get XContent params from request in Nodes rest actions
- Fixes reading of CORS pre-flight headers and methods

Recovery::
- Fix concurrency issues between cancelling a relocation and marking shard
  as relocated
- Move `reset recovery` into RecoveriesCollection
- Fix replica-primary inconsistencies when indexing during primary
  relocation with ongoing replica recoveries
- Invoke `IndexingOperationListeners` also when recovering from store or
  remote
- Prevent interruption while store checks lucene files for consistency
- Mark shard as recovering on the cluster state thread

Reindex API::
- Fix reindex with transport client
- Fix a race condition in reindex's rethrottle
- Reindex should never report negative throttled_until
- Reindex should gracefully handle when _source is disabled

Scripting::
- Add support for booleans in scripts
- Fix Javascript OOM build Failure
- Fix propagating the default value for script settings
- Catch and wrap AssertionError and NoClassDefFoundError in groovy scripts

Search::
- Do not cache script queries.
- Throw error when trying to fetch fields from source and source is disabled
- Source filtering should keep working when the source contains numbers
  greater than `Long.MAX_VALUE`.
- Fix NPE when running a range query on a `scaled_float` with no upper
  bound.
- Fix NPE during search with source filtering if the source is disabled.
- Restore assignment of time value when deserializing a scroll instance
- Fix explain output for dfs query
- Don't recursively count children profile timings
- fix explain in function_score if no function filter matches
- Fix NPEs due to disabled source
- Require timeout units when parsing query body
- Close SearchContext if query rewrite failed
- Fix parsing single `rescore` element in SearchSourceBuilder
- Fail queries on not indexed fields.
- Fix for search after
- Do not be lenient when parsing CIDRs

Settings::
- Fix Setting.timeValue() method
- Add a hard limit for `index.number_of_shard`
- Include complex settings in settings requests
- Fix filter cache setting to allow percentages
- Move cluster.routing.allocation.same_shard.host setting to new settings
  infrastructure
- Validate settings against dynamic updaters on the master
- Register "cloud.node.auto_attributes" setting in EC2 discovery plugin
- Use object equality to compare versions in IndexSettings
- fix exists method for list settings when using numbered setting format
- convert settings for ResourceWatcherService to new infrastructure
- Register bootstrap settings
- Add settings filtering to node info requests
- Ban write access to system properties

Snapshot/Restore::
- Better handling of an empty shard's segments_N file
- Fix race condition in snapshot initialization
- Fix the semantics for the BlobContainer interface

Stats::
- Fix FieldStats deserialization of `ip` field
- Fix serialization bug in allocation explain API.
- Allocation explain: Also serialize `includeDiskInfo` field
- Add missing builder.endObject() in FsInfo

Store::
- Tighten up concurrent store metadata listing and engine writes
- Make static Store access shard lock aware
- Catch assertion errors on commit and turn it into a real exception

Task Manager::
- Shard level tasks in Bulk Action lose reference to their parent tasks
- Take filterNodeIds into consideration while sending task requests to nodes

Term Vectors::
- Fix calculation of took time of term vectors request

Translog::
- Fix RAM usage estimation of LiveVersionMap.
- Fix translog replay multiple operations same doc
- Snapshotting and sync could cause a dead lock TranslogWriter
- Move translog recover outside of the engine
- Mark shard active during recovery; push settings after engine finally
  inits


=== Regressions

Highlighting::
- Handle SynonymQuery extraction for the FastVectorHighlighter

=== Upgrades

Core::
- Upgrade to Lucene 6.2.0
- Update to jackson 2.8.1
- Upgrade to Lucene 6.1.0.
- Upgrade to lucene-6.1.0-snapshot-3a57bea.
- Upgrade to Lucene 6.0.1.
- Upgrade to lucene 6 release
- Upgrade to lucene-6.0.0-f0aa4fc.
- upgrade to lucene 6.0.0-snapshot-bea235f
- Upgrade to Jackson 2.7.1

Ingest::
- Update MaxMind geoip2 version to 2.6

Internal::
- Bump master (3.0-snapshot) to java 8

Network::
- Upgrade to Netty 4.1.5
- Dependencies: Upgrade to netty 4.1.4
- Introduce Netty 4

Packaging::
- Upgrade JNA to 4.2.2 and remove optionality

Plugin Discovery EC2::
- Update aws sdk to 1.10.69 and add use_throttle_retries repository setting

Scripting::
- Dependencies: Updates to mustache 0.9.3

Search Templates::
- Update mustache.java to version 0.9.1

10 files changed, 185 insertions, 137 deletions

diff --git a/databases/elasticsearch/Makefile b/databases/elasticsearch/Makefile
index 1a284fb58a1..63beacfd6df 100644
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2016/10/26 13:56:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.20 2016/11/08 09:18:00 fhajny Exp $
 
-DISTNAME=	elasticsearch-2.4.1
+DISTNAME=	elasticsearch-5.0.0
 CATEGORIES=	textproc
-MASTER_SITES=	https://download.elasticsearch.org/elasticsearch/elasticsearch/
+MASTER_SITES=	https://artifacts.elastic.co/downloads/elasticsearch/
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://www.elasticsearch.org/
@@ -11,30 +11,29 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
 USE_JAVA=	run
-USE_JAVA2=	yes
+USE_JAVA2=	8
+USE_TOOLS+=	bash:run pax
 NO_BUILD=	yes
 
 PKG_SYSCONFSUBDIR=	elasticsearch
 EGDIR=			${PREFIX}/share/examples/elasticsearch
 
-CONFS=	elasticsearch.yml logging.yml
+CONFS=		elasticsearch.yml jvm.options log4j2.properties
 .for f in ${CONFS}
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 DOCS=		LICENSE.txt NOTICE.txt README.textile
-BINS=		elasticsearch elasticsearch.in.sh plugin
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	ES_USER ES_GROUP ES_DBDIR ES_LOGDIR ES_PIDDIR ES_TMPDIR
+BUILD_DEFS+=	ES_USER ES_GROUP ES_DBDIR ES_LOGDIR ES_PIDDIR
 
 ES_USER?=	elasticsearch
 ES_GROUP?=	${ES_USER}
-ES_LIBDIR?=	${PREFIX}/lib/elasticsearch
+ES_BASEDIR?=	${PREFIX}/lib/elasticsearch
 ES_DBDIR?=	${VARBASE}/db/elasticsearch
 ES_LOGDIR?=	${VARBASE}/log/elasticsearch
 ES_PIDDIR?=	${VARBASE}/run
-ES_TMPDIR?=	${VARBASE}/tmp/elasticsearch
 
 PKG_USERS_VARS+=	ES_USER
 PKG_GROUPS_VARS+=	ES_GROUP
@@ -42,25 +41,26 @@ PKG_GROUPS=		${ES_GROUP}
 PKG_USERS=		${ES_USER}:${ES_GROUP}
 
 FILES_SUBST+=		JAVA_HOME=${PKG_JAVA_HOME} ES_USER=${ES_USER}	\
-			ES_GROUP=${ES_GROUP} ES_LIBDIR=${ES_LIBDIR}	\
+			ES_GROUP=${ES_GROUP} ES_BASEDIR=${ES_BASEDIR}	\
 			ES_LOGDIR=${ES_LOGDIR} ES_PIDDIR=${ES_PIDDIR}	\
-			ES_DBDIR=${ES_DBDIR} ES_TMPDIR=${ES_TMPDIR}	\
+			ES_DBDIR=${ES_DBDIR} 				\
 			DISTNAME=${DISTNAME}
 
 RCD_SCRIPTS=		elasticsearch
 
-OWN_DIRS+=		${ES_LIBDIR}/plugins
+OWN_DIRS+=		${ES_BASEDIR}/plugins
 OWN_DIRS_PERMS+=	${ES_LOGDIR} ${ES_USER} ${ES_GROUP} 0700
 OWN_DIRS_PERMS+=	${ES_DBDIR} ${ES_USER} ${ES_GROUP} 0700
-OWN_DIRS_PERMS+=	${ES_TMPDIR} ${ES_USER} ${ES_GROUP} 0700
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/scripts
-INSTALLATION_DIRS+=	${ES_LIBDIR} ${PREFIX}/libexec/elasticsearch
+
+REPLACE_BASH+=		bin/elasticsearch bin/elasticsearch.in.sh bin/elasticsearch-plugin
+INSTALLATION_DIRS+=	bin ${ES_BASEDIR}/bin
 INSTALLATION_DIRS+=	${EGDIR} ${PREFIX}/share/doc/elasticsearch
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	bin/plugin config/elasticsearch.yml
-SUBST_VARS.paths=	PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX ES_DBDIR ES_LIBDIR ES_LOGDIR ES_TMPDIR
+SUBST_FILES.paths=	bin/elasticsearch bin/elasticsearch-plugin config/elasticsearch.yml
+SUBST_VARS.paths=	PKG_JAVA_HOME PKG_SYSCONFDIR ES_DBDIR ES_BASEDIR ES_LOGDIR
 
 do-install:
 .for f in ${CONFS}
@@ -70,11 +70,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f}	\
 		${DESTDIR}${PREFIX}/share/doc/elasticsearch
 .endfor
-.for f in ${BINS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f}	\
-		${DESTDIR}${PREFIX}/libexec/elasticsearch
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DESTDIR}${ES_LIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/elasticsearch ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/elasticsearch-plugin ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/elasticsearch.in.sh ${DESTDIR}${ES_BASEDIR}/bin
+	cd ${WRKSRC} && ${PAX} -rw -pp lib modules ${DESTDIR}${ES_BASEDIR}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/elasticsearch/PLIST b/databases/elasticsearch/PLIST
index e52ea5e3eda..3eb4f5f6779 100644
--- a/databases/elasticsearch/PLIST
+++ b/databases/elasticsearch/PLIST
@@ -1,46 +1,96 @@
-@comment $NetBSD: PLIST,v 1.12 2016/09/19 12:28:31 fhajny Exp $
-lib/elasticsearch/HdrHistogram-2.1.6.jar
-lib/elasticsearch/apache-log4j-extras-1.2.17.jar
-lib/elasticsearch/commons-cli-1.3.1.jar
-lib/elasticsearch/compiler-0.8.13.jar
-lib/elasticsearch/compress-lzf-1.0.2.jar
-lib/elasticsearch/${PKGNAME}.jar
-lib/elasticsearch/guava-18.0.jar
-lib/elasticsearch/hppc-0.7.1.jar
-lib/elasticsearch/jackson-core-2.8.1.jar
-lib/elasticsearch/jackson-dataformat-cbor-2.8.1.jar
-lib/elasticsearch/jackson-dataformat-smile-2.8.1.jar
-lib/elasticsearch/jackson-dataformat-yaml-2.8.1.jar
-lib/elasticsearch/jna-4.1.0.jar
-lib/elasticsearch/joda-convert-1.2.jar
-lib/elasticsearch/joda-time-2.9.4.jar
-lib/elasticsearch/jsr166e-1.1.0.jar
-lib/elasticsearch/jts-1.13.jar
-lib/elasticsearch/log4j-1.2.17.jar
-lib/elasticsearch/lucene-analyzers-common-5.5.2.jar
-lib/elasticsearch/lucene-backward-codecs-5.5.2.jar
-lib/elasticsearch/lucene-core-5.5.2.jar
-lib/elasticsearch/lucene-grouping-5.5.2.jar
-lib/elasticsearch/lucene-highlighter-5.5.2.jar
-lib/elasticsearch/lucene-join-5.5.2.jar
-lib/elasticsearch/lucene-memory-5.5.2.jar
-lib/elasticsearch/lucene-misc-5.5.2.jar
-lib/elasticsearch/lucene-queries-5.5.2.jar
-lib/elasticsearch/lucene-queryparser-5.5.2.jar
-lib/elasticsearch/lucene-sandbox-5.5.2.jar
-lib/elasticsearch/lucene-spatial-5.5.2.jar
-lib/elasticsearch/lucene-spatial3d-5.5.2.jar
-lib/elasticsearch/lucene-suggest-5.5.2.jar
-lib/elasticsearch/netty-3.10.6.Final.jar
-lib/elasticsearch/securesm-1.0.jar
-lib/elasticsearch/snakeyaml-1.15.jar
-lib/elasticsearch/spatial4j-0.5.jar
-lib/elasticsearch/t-digest-3.0.jar
-libexec/elasticsearch/elasticsearch
-libexec/elasticsearch/elasticsearch.in.sh
-libexec/elasticsearch/plugin
+@comment $NetBSD: PLIST,v 1.13 2016/11/08 09:18:00 fhajny Exp $
+bin/elasticsearch
+bin/elasticsearch-plugin
+lib/elasticsearch/bin/elasticsearch.in.sh
+lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
+lib/elasticsearch/lib/${PKGNAME}.jar
+lib/elasticsearch/lib/hppc-0.7.1.jar
+lib/elasticsearch/lib/jackson-core-2.8.1.jar
+lib/elasticsearch/lib/jackson-dataformat-cbor-2.8.1.jar
+lib/elasticsearch/lib/jackson-dataformat-smile-2.8.1.jar
+lib/elasticsearch/lib/jackson-dataformat-yaml-2.8.1.jar
+lib/elasticsearch/lib/jna-4.2.2.jar
+lib/elasticsearch/lib/joda-convert-1.2.jar
+lib/elasticsearch/lib/joda-time-2.9.4.jar
+lib/elasticsearch/lib/jopt-simple-5.0.2.jar
+lib/elasticsearch/lib/jts-1.13.jar
+lib/elasticsearch/lib/log4j-1.2-api-2.6.2.jar
+lib/elasticsearch/lib/log4j-api-2.6.2.jar
+lib/elasticsearch/lib/log4j-core-2.6.2.jar
+lib/elasticsearch/lib/lucene-analyzers-common-6.2.0.jar
+lib/elasticsearch/lib/lucene-backward-codecs-6.2.0.jar
+lib/elasticsearch/lib/lucene-core-6.2.0.jar
+lib/elasticsearch/lib/lucene-grouping-6.2.0.jar
+lib/elasticsearch/lib/lucene-highlighter-6.2.0.jar
+lib/elasticsearch/lib/lucene-join-6.2.0.jar
+lib/elasticsearch/lib/lucene-memory-6.2.0.jar
+lib/elasticsearch/lib/lucene-misc-6.2.0.jar
+lib/elasticsearch/lib/lucene-queries-6.2.0.jar
+lib/elasticsearch/lib/lucene-queryparser-6.2.0.jar
+lib/elasticsearch/lib/lucene-sandbox-6.2.0.jar
+lib/elasticsearch/lib/lucene-spatial-6.2.0.jar
+lib/elasticsearch/lib/lucene-spatial-extras-6.2.0.jar
+lib/elasticsearch/lib/lucene-spatial3d-6.2.0.jar
+lib/elasticsearch/lib/lucene-suggest-6.2.0.jar
+lib/elasticsearch/lib/securesm-1.1.jar
+lib/elasticsearch/lib/snakeyaml-1.15.jar
+lib/elasticsearch/lib/spatial4j-0.6.jar
+lib/elasticsearch/lib/t-digest-3.0.jar
+lib/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-${PKGVERSION}.jar
+lib/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties
+lib/elasticsearch/modules/ingest-common/ingest-common-${PKGVERSION}.jar
+lib/elasticsearch/modules/ingest-common/jcodings-1.0.12.jar
+lib/elasticsearch/modules/ingest-common/joni-2.1.6.jar
+lib/elasticsearch/modules/ingest-common/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
+lib/elasticsearch/modules/lang-expression/asm-5.0.4.jar
+lib/elasticsearch/modules/lang-expression/asm-commons-5.0.4.jar
+lib/elasticsearch/modules/lang-expression/asm-tree-5.0.4.jar
+lib/elasticsearch/modules/lang-expression/lang-expression-${PKGVERSION}.jar
+lib/elasticsearch/modules/lang-expression/lucene-expressions-6.2.0.jar
+lib/elasticsearch/modules/lang-expression/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-expression/plugin-security.policy
+lib/elasticsearch/modules/lang-groovy/groovy-2.4.6-indy.jar
+lib/elasticsearch/modules/lang-groovy/lang-groovy-${PKGVERSION}.jar
+lib/elasticsearch/modules/lang-groovy/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-groovy/plugin-security.policy
+lib/elasticsearch/modules/lang-mustache/compiler-0.9.3.jar
+lib/elasticsearch/modules/lang-mustache/lang-mustache-${PKGVERSION}.jar
+lib/elasticsearch/modules/lang-mustache/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-mustache/plugin-security.policy
+lib/elasticsearch/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
+lib/elasticsearch/modules/lang-painless/asm-debug-all-5.1.jar
+lib/elasticsearch/modules/lang-painless/lang-painless-${PKGVERSION}.jar
+lib/elasticsearch/modules/lang-painless/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-painless/plugin-security.policy
+lib/elasticsearch/modules/percolator/percolator-${PKGVERSION}.jar
+lib/elasticsearch/modules/percolator/plugin-descriptor.properties
+lib/elasticsearch/modules/reindex/commons-codec-1.10.jar
+lib/elasticsearch/modules/reindex/commons-logging-1.1.3.jar
+lib/elasticsearch/modules/reindex/httpasyncclient-4.1.2.jar
+lib/elasticsearch/modules/reindex/httpclient-4.5.2.jar
+lib/elasticsearch/modules/reindex/httpcore-4.4.5.jar
+lib/elasticsearch/modules/reindex/httpcore-nio-4.4.5.jar
+lib/elasticsearch/modules/reindex/plugin-descriptor.properties
+lib/elasticsearch/modules/reindex/reindex-${PKGVERSION}.jar
+lib/elasticsearch/modules/reindex/rest-${PKGVERSION}.jar
+lib/elasticsearch/modules/transport-netty3/netty-3.10.6.Final.jar
+lib/elasticsearch/modules/transport-netty3/plugin-descriptor.properties
+lib/elasticsearch/modules/transport-netty3/plugin-security.policy
+lib/elasticsearch/modules/transport-netty3/transport-netty3-${PKGVERSION}.jar
+lib/elasticsearch/modules/transport-netty4/netty-buffer-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-codec-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-codec-http-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-common-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-handler-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-resolver-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-transport-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/plugin-descriptor.properties
+lib/elasticsearch/modules/transport-netty4/plugin-security.policy
+lib/elasticsearch/modules/transport-netty4/transport-netty4-${PKGVERSION}.jar
 share/doc/elasticsearch/LICENSE.txt
 share/doc/elasticsearch/NOTICE.txt
 share/doc/elasticsearch/README.textile
 share/examples/elasticsearch/elasticsearch.yml
-share/examples/elasticsearch/logging.yml
+share/examples/elasticsearch/jvm.options
+share/examples/elasticsearch/log4j2.properties
diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index a421a40b913..86a2f1b4ee2 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2016/10/26 13:56:30 fhajny Exp $
+$NetBSD: distinfo,v 1.21 2016/11/08 09:18:00 fhajny Exp $
 
-SHA1 (elasticsearch-2.4.1.tar.gz) = 6a6acfc7bf7b4354dc6136daea54db1c844d632f
-RMD160 (elasticsearch-2.4.1.tar.gz) = b8accded2531c9d472ce7ce992b901fa5a9f50fd
-SHA512 (elasticsearch-2.4.1.tar.gz) = 69b22d5c2fc93e9bc83c5da415e110105d4d977aa98633041f51f8c55ba9e6045803584965367f6e1f962122ad81a8e07fefcc5a01c5381057ec921d65bc1751
-Size (elasticsearch-2.4.1.tar.gz) = 27364109 bytes
-SHA1 (patch-bin_elasticsearch.in.sh) = b97658a7aa8867f2428dcaae6e7c4a191d13e612
-SHA1 (patch-bin_plugin) = 5ddd9b55797305c2c1e77b174ae410c00ecb7b89
-SHA1 (patch-config_elasticsearch.yml) = 7729dfb1ed106f0a34e6daaf7a46d0352d42f1f1
+SHA1 (elasticsearch-5.0.0.tar.gz) = d25f6547bccec9f0b5ea7583815f96a6f50849e0
+RMD160 (elasticsearch-5.0.0.tar.gz) = 1faf172c058d3ca11487938520adee88464889ac
+SHA512 (elasticsearch-5.0.0.tar.gz) = a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd
+Size (elasticsearch-5.0.0.tar.gz) = 32968292 bytes
+SHA1 (patch-bin_elasticsearch) = 5360818fb870c0005e23f0fb247efa247a909f47
+SHA1 (patch-bin_elasticsearch-plugin) = 56db071765b91a4846e1529b5fe8be2c549b449d
+SHA1 (patch-config_elasticsearch.yml) = 8a59f9123b8bc1c40d17131dc51c361fa210c17c
diff --git a/databases/elasticsearch/files/elasticsearch.sh b/databases/elasticsearch/files/elasticsearch.sh
index eba90e6d385..e2f683772bf 100644
--- a/databases/elasticsearch/files/elasticsearch.sh
+++ b/databases/elasticsearch/files/elasticsearch.sh
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: elasticsearch.sh,v 1.3 2015/11/12 15:37:07 fhajny Exp $
+# $NetBSD: elasticsearch.sh,v 1.4 2016/11/08 09:18:01 fhajny Exp $
 #
 # PROVIDE: elasticsearch
 # REQUIRE: DAEMON
@@ -22,12 +22,12 @@ start_precmd="elasticsearch_precmd"
 : ${elasticsearch_props:=""}
 : ${elasticsearch_fdlimit:="768"}
 
-ES_CLASSPATH="@ES_LIBDIR@/@DISTNAME@.jar:@ES_LIBDIR@/*"
+ES_CLASSPATH="@ES_BASEDIR@/lib/@DISTNAME@.jar:@ES_BASEDIR@/lib/*"
 
 command="@PKG_JAVA_HOME@/bin/java"
 # flags taken from bin/elasticsearch and bin/elasticsearch.in.sh
 command_args="	-Delasticsearch					\
-		-Des.path.home=@PREFIX@				\
+		-Des.path.home=@ES_BASEDIR@			\
 		-Des.path.conf=@PKG_SYSCONFDIR@			\
 		-Des.pidfile=${pidfile}				\
 		-Dfile.encoding=UTF-8				\
@@ -45,7 +45,7 @@ command_args="	-Delasticsearch					\
 		-cp ${ES_CLASSPATH}				\
 		${elasticsearch_props}				\
 		org.elasticsearch.bootstrap.Elasticsearch	\
-		start >/dev/null &"
+		>/dev/null &"
 
 # ElasticSearch is fd hungry, default limit leads to write locks
 SOFT_FDLIMIT=`ulimit -S -n`
diff --git a/databases/elasticsearch/files/smf/manifest.xml b/databases/elasticsearch/files/smf/manifest.xml
index 8f83760664e..695f3de34e2 100644
--- a/databases/elasticsearch/files/smf/manifest.xml
+++ b/databases/elasticsearch/files/smf/manifest.xml
@@ -13,21 +13,21 @@
     <dependent name='elasticsearch' restart_on='none' grouping='optional_all'>
       <service_fmri value='svc:/milestone/multi-user' />
     </dependent>
-    <method_context working_directory='@ES_TMPDIR@'>
+    <method_context working_directory='@ES_DBDIR@'>
       <method_credential user='@ES_USER@' group='@ES_GROUP@' />
       <method_environment>
         <envvar name='PATH' value='@PREFIX@/bin:@PREFIX@/sbin:/usr/bin:/usr/sbin' />
         <envvar name='JAVA_HOME' value='@PKG_JAVA_HOME@' />
       </method_environment>
     </method_context>
-    <exec_method name='start' type='method' exec='@PKG_JAVA_HOME@/bin/java -Delasticsearch -Des.path.home=@PREFIX@ -Des.path.conf=@PKG_SYSCONFDIR@ -Des.pidfile=@ES_PIDDIR@/elasticsearch.pid -Des.index.store.type=%{store_type} %{java_opts} -Xms%{min_heap} -Xmx%{max_heap} -cp %{class_path} org.elasticsearch.bootstrap.Elasticsearch start' timeout_seconds='3600' />
+    <exec_method name='start' type='method' exec='@PKG_JAVA_HOME@/bin/java -Delasticsearch -Des.path.home=@ES_BASEDIR@ -Des.path.conf=@PKG_SYSCONFDIR@ -Des.pidfile=@ES_PIDDIR@/elasticsearch.pid -Des.index.store.type=%{store_type} %{java_opts} -Xms%{min_heap} -Xmx%{max_heap} -cp %{class_path} org.elasticsearch.bootstrap.Elasticsearch' timeout_seconds='3600' />
     <exec_method type='method' name='stop' exec=':kill' timeout_seconds='60' />
     <exec_method type='method' name='refresh' exec=':kill -HUP' timeout_seconds='60' />
     <property_group name='application' type='application'>
       <propval name='min_heap' type='astring' value='256m' />
       <propval name='max_heap' type='astring' value='1g' />
       <propval name='store_type' type='astring' value='niofs' />
-      <propval name='class_path' type='astring' value='@ES_LIBDIR@/@DISTNAME@.jar:@ES_LIBDIR@/*' />
+      <propval name='class_path' type='astring' value='@ES_BASEDIR@/lib/@DISTNAME@.jar:@ES_BASEDIR@/lib/*' />
       <property name='java_opts' type='astring'>
         <astring_list>
           <value_node value='-Dfile.encoding=UTF-8'/>
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch b/databases/elasticsearch/patches/patch-bin_elasticsearch
new file mode 100644
index 00000000000..b694be39d75
--- /dev/null
+++ b/databases/elasticsearch/patches/patch-bin_elasticsearch
@@ -0,0 +1,21 @@
+$NetBSD: patch-bin_elasticsearch,v 1.1 2016/11/08 09:18:01 fhajny Exp $
+
+Default paths.
+
+--- bin/elasticsearch.orig	2016-10-26 04:35:54.000000000 +0000
++++ bin/elasticsearch
+@@ -104,8 +104,13 @@ while [ -h "$SCRIPT" ] ; do
+   fi
+ done
+ 
++#set default JAVA_HOME
++if [ -z "$JAVA_HOME" ]; then
++  JAVA_HOME="@PKG_JAVA_HOME@"
++fi
++
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++ES_HOME="@ES_BASEDIR@"
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin b/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin
new file mode 100644
index 00000000000..7c764b6de5d
--- /dev/null
+++ b/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin
@@ -0,0 +1,30 @@
+$NetBSD: patch-bin_elasticsearch-plugin,v 1.1 2016/11/08 09:18:01 fhajny Exp $
+
+Default paths.
+
+--- bin/elasticsearch-plugin.orig	2016-10-26 04:35:54.000000000 +0000
++++ bin/elasticsearch-plugin
+@@ -15,8 +15,13 @@ while [ -h "$SCRIPT" ] ; do
+   fi
+ done
+ 
++#set default JAVA_HOME
++if [ -z "$JAVA_HOME" ]; then
++  JAVA_HOME="@PKG_JAVA_HOME@"
++fi
++
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++ES_HOME="@ES_BASEDIR@"
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+@@ -23,7 +29,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
+ 
+ # Sets the default values for elasticsearch variables used in this script
+ if [ -z "$CONF_DIR" ]; then
+-  CONF_DIR="$ES_HOME/config"
++  CONF_DIR="@PKG_SYSCONFDIR@"
+ fi
+ 
+ # The default env file is defined at building/packaging time.
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
deleted file mode 100644
index a31efbff99e..00000000000
--- a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bin_elasticsearch.in.sh,v 1.7 2016/10/26 13:56:30 fhajny Exp $
-
-Fix paths.
-
---- bin/elasticsearch.in.sh.orig	2015-10-21 08:41:12.000000000 +0000
-+++ bin/elasticsearch.in.sh
-@@ -10,7 +10,7 @@ EOF
-     exit 1
- fi
- 
--ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.1.jar:$ES_HOME/lib/*"
-+ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.4.1.jar:@ES_LIBDIR@/*"
- 
- if [ "x$ES_MIN_MEM" = "x" ]; then
-     ES_MIN_MEM=256m
diff --git a/databases/elasticsearch/patches/patch-bin_plugin b/databases/elasticsearch/patches/patch-bin_plugin
deleted file mode 100644
index 8e3bcd74560..00000000000
--- a/databases/elasticsearch/patches/patch-bin_plugin
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bin_plugin,v 1.2 2015/11/12 15:37:08 fhajny Exp $
-
-Fix paths and improve portability.
-
---- bin/plugin.orig	2015-10-21 13:32:03.000000000 +0000
-+++ bin/plugin
-@@ -16,8 +16,13 @@ while [ -h "$SCRIPT" ] ; do
-   fi
- done
- 
-+#set default JAVA_HOME
-+if [ -z "$JAVA_HOME" ]; then
-+  JAVA_HOME="@PKG_JAVA_HOME@"
-+fi
-+
- # determine elasticsearch home
--ES_HOME=`dirname "$SCRIPT"`/..
-+ES_HOME="@PREFIX@"
- 
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
-@@ -25,7 +30,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
- 
- # Sets the default values for elasticsearch variables used in this script
- if [ -z "$CONF_DIR" ]; then
--  CONF_DIR="$ES_HOME/config"
-+  CONF_DIR="@PKG_SYSCONFDIR@"
- fi
- 
- # The default env file is defined at building/packaging time.
-@@ -105,4 +110,4 @@ fi
- HOSTNAME=`hostname | cut -d. -f1`
- export HOSTNAME
- 
--eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"$ES_HOME/lib/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args
-+eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"@ES_LIBDIR@/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args
diff --git a/databases/elasticsearch/patches/patch-config_elasticsearch.yml b/databases/elasticsearch/patches/patch-config_elasticsearch.yml
index c77b86783f2..f9340a9a1bd 100644
--- a/databases/elasticsearch/patches/patch-config_elasticsearch.yml
+++ b/databases/elasticsearch/patches/patch-config_elasticsearch.yml
@@ -1,23 +1,22 @@
-$NetBSD: patch-config_elasticsearch.yml,v 1.4 2015/11/12 15:37:08 fhajny Exp $
+$NetBSD: patch-config_elasticsearch.yml,v 1.5 2016/11/08 09:18:01 fhajny Exp $
 
 Define various paths
 
---- config/elasticsearch.yml.orig	2015-10-21 08:41:12.000000000 +0000
+--- config/elasticsearch.yml.orig	2016-10-26 04:35:54.000000000 +0000
 +++ config/elasticsearch.yml
-@@ -31,10 +31,16 @@
+@@ -31,10 +31,15 @@
  # Path to directory where to store the data (separate multiple locations by comma):
  #
- # path.data: /path/to/data
+ #path.data: /path/to/data
 +path.data: @ES_DBDIR@
  #
  # Path to log files:
  #
- # path.logs: /path/to/logs
+ #path.logs: /path/to/logs
 +path.logs: @ES_LOGDIR@
-+
++#
++# Path to config files
 +path.conf: @PKG_SYSCONFDIR@
-+path.plugins: @ES_LIBDIR@/plugins
-+path.work: @ES_TMPDIR@
  #
  # ----------------------------------- Memory -----------------------------------
  #