CVS commit: pkgsrc/databases/apache-solr

["Jean-Yves Migeon" <jym%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jym
Date:           Sat Dec 18 15:34:20 UTC 2021

Modified Files:
        pkgsrc/databases/apache-solr: Makefile PLIST distinfo
        pkgsrc/databases/apache-solr/patches: patch-solr-bin

Log Message:
Upgrade apache-solr to 8.11.1.

Please consult the Solr Upgrade notes for details and links specified below:

    https://github.com/apache/solr/blob/main/solr/solr-ref-guide/src/solr-upgrade-notes.adoc

====================================================================

Changelog:

Solr 8.11

See the 8.11 Release Notes for an overview of the main new features of Solr 8.11.

When upgrading to 8.11.x users should be aware of the following major changes from 8.10.

Support for Multiple Authentication Schemes

Two new authentication and authorization plugins provide support for configuring multiple authentication schemes.

The MultiAuthPlugin allows combining two or more authentication approaches, such as JWT and Basic authentication.

The MultiAuthRuleBasedAuthorizationPlugin is used when the MultiAuthPlugin is also in use, and combines the various roles defined for all plugins to determine the proper role assignment for the user 
account.

For information on configuring these plugins, see the following sections:

    Combining Basic Authentication with Other Schemes

    Multiple Authorization Plugins

ZooKeeper chroot

It’s now possible to create the ZooKeeper chroot at startup if it does not already exist. See the section Using the -z Parameter with bin/solr for an example.

Other Changes

A few other minor changes are worth noting:

    The config-read pre-defined permission now correctly governs access for various configuration-related APIs. See also Predefined Permissions.

    The S3BackupRepository supports configuring the AWS Profile, if necessary. See also S3BackupRepository.

    Additionally, backups will now properly succeed after SPLITSHARD operations, and will correctly handle incremental backup purges.

    SolrJ now supports uploading configsets.

Solr 8.10

See the 8.10 Release Notes for an overview of the main new features of Solr 8.10.

When upgrading to 8.10.x users should be aware of the following major changes from 8.9.

Schema Designer UI

A new screen has been added to the Admin UI that allows you to interactively design a Solr schema using your documents.

The designer screen provides a safe environment for you to:

    Upload or paste sample documents to identify fields.

    Get a "first" guess at what Solr thinks the field types in the fields should be.

    Edit fields, field types, dynamic fields, and supporting files.

    See how a field’s analysis will impact your text.

    Test how schema changes will impact query-time behavior.

    Save your changes to a configset to use with a new collection.

See the section Schema Designer for full details.

Backups in S3

Following the redesign of backups in Solr 8.8 that allowed storage of incremental backups in Google Cloud environments, Solr 8.10 provides support for storing backups in Amazon S3 buckets.

See the section S3BackupRepository for how to configure.

Security Admin UI

Solr’s Admin UI also got a new screen to support management of users, roles, and permissions.

The new UI works when authentication and/or authorization has been enabled with bin/solr auth or by manually installing a security.json file. Before this, it provides a warning that your Solr 
instance is unsecured.

See the section Security UI for details.

Solr SQL Improvements

A number of improvements have been made in Solr’s SQL functionality:

    Support added for LIKE, IS NOT NULL, IS NULL, and wildcards (for simplistic LIKE functionality).

    Two new aggregation functions, COUNT(DISTINCT field) and APPROX_COUNT_DISTINCT(field), have been added.

    Queries using an ORDER BY clause can support OFFSET and FETCH operations.

    Multi-valued fields can now be returned.

    User permissions have been simplified so access to query endpoints /sql, /select, and /export is sufficient for full access for all SQL queries.

shards.preference

A new option for the shards.preference parameter allows selection of nodes based on whether or not the replica is a leader. Now adding shards.preference=replica.leader:false will limit queries only 
to replicas which are not currently their shard’s leader.

See the section shards.preference Parameter for details and examples.

Metrics & Prometheus Exporter

A new expr option in the Metrics API allows for more advanced filtering of metrics based on regular expressions. See the section Metrics API for examples.

The Prometheus Exporter’s default solr-exporter.config has been improved to use the new expr option in the Metrics API to get a smaller set of metrics. The default metrics exported still include most 
metrics, but the configuration will be easier to trim as needed. This should help provide performance improvements in busy clusters being monitored by Prometheus.

ZooKeeper Credentials

ZooKeeper credentials can now be stored in a file whose location is defined with a system property instead of being passed in plain-text. See Out of the Box Credential Implementations for how to set 
this up.
Solr 8.9

See the 8.9 Release Notes for an overview of the main new features of Solr 8.9.

When upgrading to 8.9.x users should be aware of the following major changes from 8.8.

Backup and Restore

Solr 8.9 introduces extensive changes to Solr’s backup and restore support.

A new backup format has been introduced in Solr 8.9 which replaces the previous snapshot-based backup. This new format enables ‘incremental’ backups. Repeated backups to a given location will take 
advantage of the data stored by their predecessors and will only operate on files that have changed since the previous backup. This is supported by default, simply by storing each backup file in the 
same location.

The old and new formats are not compatible, although backups in the old format, a full snapshot of all files, can still be used to restore to Solr for the time-being. The old format is officially 
deprecated, and support for it is likely to be removed in Solr 9.0.

For the time-being the old format can be created by defining a parameter incremental=false. Again, though, this support is likely to be removed in Solr 9.0.

More documentation on backups is available at Backup and Restore.

New Collections API commands for backups:

    LISTBACKUP: Lists information about each backup stored at the specified repository location. See List Backups for more details.

    DELETEBACKUP: Deletes specified backups from the repository. See Delete Backups for more details.

A new option for backup repository is also available in 8.9, which is to use Google Cloud Storage (GCS). This is a contrib (located in contrib/gcs-repository). See GCSBackupRepository for 
configuration details. The Solr community is working to add support for S3 buckets in the near future.

Nested Docs

Child Doc Transformer’s childFilter parameter no longer applies query syntax escaping because it’s inconsistent with the rest of Solr and was limiting. This refers to [child 
childFilter='field:value']. There was no escaping here prior to 8.0 either.

Collapse and Expand

    BlockCollapse: If documents have been (or could be) indexed in a way where documents with the same collapse key have been indexed contiguously in the index, a new "block collapse" provides a 
significant speed improvement over traditional collapse.

    See Block Collapsing for details.

    Expand Null Groups: A new parameter expand.nullGroup allows an expanded group to be returned containing document with no value in the expanded field. See Expand Component for details.

In-Place Updates

A new request parameter update.partial.requireInPlace=true allows telling Solr to "fail fast" if all of the necessary conditions are not satisfied to allow an in-place update to succeed. See also 
In-Place Updates.

Metrics History

The Metrics History feature, which allowed long-term storage and aggregation of Solr’s metrics, has been deprecated and will be removed in 9.0.

Embedded Solr Server

When using EmbeddedSolrServer, it will no longer close CoreContainer instances that were passed to it.
Solr 8.8

When upgrading to 8.8.x users should be aware of the following major changes from 8.7.

Nested Documents

    When doing atomic/partial updates to a child document:

        Supply the _root_ field (the ID of the root document) so that Solr understands you are manipulating a child document and not a root document. In its absence, Solr looks at the _route_ 
parameter but this may change in the future because it’s not an ideal substitute. If neither are present, Solr assumes you are updating a root document. If this assumption is false, Solr will do a 
cheap check that usually detects the problem and will throw an exception to alert you of the need to specify the Root ID. This backwards incompatible change was done to increase performance and 
robustness.

        This feature no longer requires stored=true or docValues=true on the _root_ field. You might have it for other purposes though (e.g., for uniqueBlock(…​)).

        This feature no longer requires the _nest_path_ field, although you probably ought to continue to define it as it’s useful for other things.

Removed Contribs

    The search results clustering contrib (Carrot2) has been removed from 8.x Solr due to lack of Java 1.8 compatibility in the dependency that provides online clustering of search results. The 
contrib will be re-introduced in Solr 9.0.

Learning to Rank

    Interleaving support has been added to Learning to Rank (LTR). Currently only the Team Draft Interleaving algorithm is supported. For examples using this feature, see the section Running a Rerank 
Query Interleaving Two Models.

Metrics

    Two metrics have been added for SolrCloud’s Overseer:

        solr_metrics_overseer_stateUpdateQueueSize

        solr_metrics_overseer_collectionWorkQueueSize

Prometheus Exporter

    The ./bin scripts included with the Prometheus Exporter contrib now allow use of custom java options with environment variables. See the section Environment Variable Options for more details.

    The default Grafana dashboards now include panels for query performance monitoring. The default Prometheus Exporter configuration includes metrics like queries-per-second (QPS) and 95th 
percentiles (P95) to populate the new panels.

    The default Prometheus Exporter configuration also includes the two new metrics mentioned in the Metrics above.

Solr Home

    The internal logic for identifying 'Solr Home' (solr.solr.home) has been refactored to make testing less error prone. Plugin developers using SolrPaths.locateSolrHome() or 'new 
`SolrResourceLoader’ should check deprecation warnings as existing some existing functionality will be removed in 9.0. SOLR-14934 has more technical details about this change for those concerned.

base_url removed from stored state

As of Solr 8.8.0, the base_url property was removed from the stored state for replicas (SOLR-12182). If you’re able to upgrade SolrJ to 8.8.x for all of your client applications, then you can set 
-Dsolr.storeBaseUrl=false (introduced in Solr 8.8.1) to better align the stored state in ZooKeeper with future versions of Solr. However, if you are not able to upgrade SolrJ to 8.8.x for all client 
applications, then leave the default -Dsolr.storeBaseUrl=true so that Solr will continue to store the base_url in ZooKeeper.

You may also see some NPE in collection state updates during a rolling upgrade to 8.8.0 from a previous version of Solr. After upgrading all nodes in your cluster to 8.8.0, collections should fully 
recover. Trigger another rolling restart if there are any replicas that do not recover after the upgrade to re-elect leaders.
Solr 8.7

See the 8.7 Release Notes for an overview of the main new features of Solr 8.7.

When upgrading to 8.7.x users should be aware of the following major changes from 8.6.

Autoscaling

    If upgrading from 8.6.0, please see the 8.6.1 Upgrade notes below for information on performance degradations introduced in 8.6.0 that require some intervention to resolve. If you are already on 
8.6.1 or higher, you can ignore these instructions.

Deprecations

    The autoscaling framework is now formally deprecated and will be removed in Solr 9.0. The Solr community is working on pluggable API to replace this functionality, with the goal for it to be 
ready by the time 9.0 is released. Deprecations include: autoscaling policy, triggers, withCollection support, simulation framework, autoscaling suggestions tab in the UI, autoAddReplicas and 
UTILIZENODE command.

    Similarly, rule-based replica placement strategy has been deprecated and will be replaced in Solr 9.0 by APIs for replica placement and cluster events, with plugin-based implementations.

    Support for detecting spinning disks has been removed in LUCENE-9576. Corresponding spins metrics in Solr still exist but now they always return false and will be removed in Solr 9.0.

User-Managed Cluster Terminology Updated

    Solr has replaced the terms "master" and "slave" in the codebase and all documentation with "leader" and "follower".

    This functionality has only changed in terms of parameter names changed, and we do not expect any back-compatibility issues on upgrade to 8.7 or even 9.0 later.

    However, users should update their solrconfig.xml files after completing the upgrade on all nodes of a cluster. Comparing your configuration to the updated configuration examples in Index 
Replication will show examples of what needs to change, but here are the main changes:

        On the replication leader, in the definition of the /replication request handler:

            Replace "master" with "leader".

            Replace "slave" with "follower" if the former term is used in the name of any follower solrconfig.xml file definitions. This file can be named anything, so you can change it to whatever 
you’d like to call it if you’d like.

            Replace "slave" with "follower" if the former term is used in a replication repeater configuration.

        On the replication follower, in the definition of the /replication request handler:

            Replace "masterUrl" with "leaderUrl".

            Replace "slave" with "follower" if the former term is used in a repeater configuration.

JSON Facets

    Performance enhancements for the relatedness() statistics function are included with 8.7. These yield the highest benefits with high-cardinality fields and can be disabled if working with lower 
cardinality fields with a new sweep_collection parameter. See the section relatedness() Options for details.

solr.in.sh / solr.in.cmd

    Solr has relied on the SOLR_STOP_WAIT parameter defined in solr.in.sh or solr.in.cmd to determine how long to wait on startup. A new parameter SOLR_START_WAIT allows defining how long Solr should 
wait for start up to complete.

    If the time set by this parameter is exceeded, Solr will exit the startup process and return the last few lines of the solr.log file to the terminal.

    By default, this parameter is set to the same value as SOLR_STOP_WAIT.

    The default ZooKeeper client timeout (ZK_CLIENT_TIMEOUT) is now 30 seconds (30000 milliseconds) instead of 15.

Configsets

    It’s now possible to overwrite an existing configset when uploading changes by supplying the overwrite=true parameter to the Configset API.

    A related parameter is cleanup=true, which allows deleting any files from the old configset that are left behind after the overwrite.

    The default for both of these parameters is false.

    When deleting a collection that has an automatically created configset (i.e., the configset was copied from the _default collection when the collection was created), the configset will also be 
deleted if it is not in use by any other collection.

Logging

    A request ID (rid) is now logged for all distributed search requests (in SolrCloud) which can be used to correlate query events across the system. A parameter disableRequestId=true can be added 
to disable this if desired.

Solr 8.6.1

See the 8.6.1 Release Notes for an overview of the fixes included in Solr 8.6.1.

When upgrading to 8.6.1 users should be aware of the following major changes from 8.6.0.

Autoscaling

    As mentioned in the 8.6 upgrade notes, a default autoscaling policy was provided starting in 8.6.0. This default autoscaling policy resulted in increasingly slow collection creation calls in 
large clusters (50+ collections).

    In 8.6.1 the default autoscaling policy has been removed, and clusters will not use autoscaling unless a policy has explicitly been created. If your cluster is running 8.6.0 and not using an 
explicit autoscaling policy, upgrade to 8.6.1 and remove the default cluster policy and preferences via the following command.

    Replace localhost:8983 with your Solr endpoint.

    curl -X POST -H 'Content-type:application/json'  -d '{set-cluster-policy : [], set-cluster-preferences : []}' http://localhost:8983/api/cluster/autoscaling

    This information is only relevant for users upgrading from 8.6.0. If upgrading from an earlier version to 8.6.1+, this warning can be ignored.

Solr 8.6

See the 8.6 Release Notes for an overview of the main new features of Solr 8.6.

When upgrading to 8.6.x users should be aware of the following major changes from 8.5.

Support for Block-Max WAND

Lucene added support for Block-Max WAND in 8.0, and 8.6 makes this available for Solr also.

This can provide significant performance enhancements by not calculating the score for results which are not likely to appear in the top set of results.

It is enabled when using a new query parameter minExactCount. This parameter tells Solr to accurately count the number of hits accurately until at least this value. Once this value is reached, Solr 
can skip over documents that don’t have a score high enough to be in the top set of documents, which has the potential for greatly speeding up searches.

It’s important to note that when using this parameter, the hit count of searches may not be accurate. It is guaranteed that the hit count is accurate up to the value of minExactCount, but any 
returned hit count higher than that may be an approximation.

A new boolean attribute numFoundExact is included in all responses to indicate if the hit count in the response is expected to be exact or not.

More information about this new feature is available in the section minExactCount Parameter.

Autoscaling

    NOTE: The default autoscaling policy has been removed as of 8.6.1

    Solr now includes a default autoscaling policy. This policy can be overridden with your custom rules or by specifying an empty policy to replace the default.

    The ComputePlan action now supports a collection selector to identify collections based on collection properties to determine which collections should be operated on.

Security

    Prior to Solr 8.6 Solr APIs which take a file system location, such as core creation, backup, restore, and others, did not validate the path and Solr would allow any absolute or relative path. 
Starting in 8.6 only paths that are relative to SOLR_HOME, SOLR_DATA_HOME and coreRootDir are allowed by default.

    If you need to create a core or store a backup outside the default paths, you will need to tell Solr which paths to allow. A new element in solr.xml called allowPaths takes a comma-separated list 
of allowed paths.

    When using the solr.xml file that ships with 8.6, you can configure the list of paths to allow through the system property solr.allowPaths. Please see bin/solr.in.sh or bin\solr.in.cmd for 
example usage. Using the value * will allow any path as in earlier versions.

    For more on this, see the section Solr.xml Parameters.

    Windows SMB shares on the UNC format, such as \\myhost\myshare\mypath are now always disallowed. Please use drive letter mounts instead, i.e., S:\mypath.

    A new authorization plugin ExternalRoleRuleBasedAuthorizationPlugin is now available. This plugin allows an authentication plugin (such as JWT) to supply a user’s roles instead of maintaining a 
user-to-role mapping inside Solr.

    When authentication is enabled, the Admin UI Dashboard (main screen) now includes a panel that shows the authentication and authorization plugins in use, the logged in username, and the roles 
assigned to this user. A new link will also appear in the left-hand navigation to allow a user to log out.

Streaming Expressions

    The /export handler now supports streaming expressions to allow limiting the output of the export to only matching documents.

    For more information about how to use this, see the section Specifying the Local Streaming Expression.

    The stats, facet, and timeseries expressions now support percentiles and standard deviation aggregations.

Highlighting

For the Unified Highlighter: The setting hl.fragsizeIsMinimum now defaults to false because true was found to be a significant performance regression when highlighting lots of text. This will yield 
longer highlights on average compared to Solr 8.5 but relatively unchanged compared to previous releases. Furthermore, if your application highlights lots of text, you may want to experiment with 
lowering hl.fragAlignRatio to trade ideal fragment alignment for better performance.

Deprecations

A primary focus of the community is improving Solr’s stability and supportability. With the addition of the package manager system in 8.4, we now have the ability to move some features into plugins 
maintained by third-parties with the expertise to properly develop and support them. Our goal is to make running Solr easier and less prone to outages and other headaches. In this spirit, the 
following features have been deprecated and are slated to be removed in Solr 9.0.

    Cross Data Center Replication (CDCR), in its current form, is deprecated and is scheduled to be removed in 9.0. This feature is unlikely to be replaced by an identical plugin. However, the 
community is working on figuring out a replacement feature for disaster recovery and failover.

    The Data Import Handler (DIH) is deprecated and is scheduled to be removed in 9.0. Work to replace DIH with a community-supported plugin is underway and may be available soon.

    Support to store indexes and backups in HDFS is deprecated and is scheduled to be removed in 9.0. A community-supported version of this may be available as a plugin in the future. For more 
details, please see SOLR-14021.

Users interested in maintaining a feature as a plugin are encouraged to join the developer mailing list to find out more about how to help.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/apache-solr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/apache-solr/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/apache-solr/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/apache-solr/patches/patch-solr-bin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/apache-solr/Makefile
diff -u pkgsrc/databases/apache-solr/Makefile:1.3 pkgsrc/databases/apache-solr/Makefile:1.4
--- pkgsrc/databases/apache-solr/Makefile:1.3   Fri Jul  3 11:50:57 2020
+++ pkgsrc/databases/apache-solr/Makefile       Sat Dec 18 15:34:19 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/07/03 11:50:57 yyamano Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/18 15:34:19 jym Exp $
 
 DISTNAME=      solr-${SOLR_VER}
 PKGNAME=       apache-solr-${SOLR_VER}
-SOLR_VER=      8.5.2
+SOLR_VER=      8.11.1
 CATEGORIES=    databases textproc
 MASTER_SITES=  ${MASTER_SITE_APACHE:=lucene/solr/${SOLR_VER}/}
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/databases/apache-solr/PLIST
diff -u pkgsrc/databases/apache-solr/PLIST:1.2 pkgsrc/databases/apache-solr/PLIST:1.3
--- pkgsrc/databases/apache-solr/PLIST:1.2      Thu Jun 11 15:41:23 2020
+++ pkgsrc/databases/apache-solr/PLIST  Sat Dec 18 15:34:19 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/06/11 15:41:23 jym Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/12/18 15:34:19 jym Exp $
 bin/solr
 share/doc/solr/CHANGES.txt
 share/doc/solr/LICENSE.txt
@@ -15,9 +15,6 @@ share/examples/solr/example/example-DIH/
 share/examples/solr/example/example-DIH/solr/atom/conf/synonyms.txt
 share/examples/solr/example/example-DIH/solr/atom/conf/url_types.txt
 share/examples/solr/example/example-DIH/solr/atom/core.properties
-share/examples/solr/example/example-DIH/solr/db/conf/clustering/carrot2/kmeans-attributes.xml
-share/examples/solr/example/example-DIH/solr/db/conf/clustering/carrot2/lingo-attributes.xml
-share/examples/solr/example/example-DIH/solr/db/conf/clustering/carrot2/stc-attributes.xml
 share/examples/solr/example/example-DIH/solr/db/conf/currency.xml
 share/examples/solr/example/example-DIH/solr/db/conf/db-data-config.xml
 share/examples/solr/example/example-DIH/solr/db/conf/elevate.xml
@@ -77,9 +74,6 @@ share/examples/solr/example/example-DIH/
 share/examples/solr/example/example-DIH/solr/db/core.properties
 share/examples/solr/example/example-DIH/solr/db/lib/derby-10.9.1.0.jar
 share/examples/solr/example/example-DIH/solr/db/lib/hsqldb-2.4.0.jar
-share/examples/solr/example/example-DIH/solr/mail/conf/clustering/carrot2/kmeans-attributes.xml
-share/examples/solr/example/example-DIH/solr/mail/conf/clustering/carrot2/lingo-attributes.xml
-share/examples/solr/example/example-DIH/solr/mail/conf/clustering/carrot2/stc-attributes.xml
 share/examples/solr/example/example-DIH/solr/mail/conf/currency.xml
 share/examples/solr/example/example-DIH/solr/mail/conf/elevate.xml
 share/examples/solr/example/example-DIH/solr/mail/conf/lang/contractions_ca.txt
@@ -138,9 +132,6 @@ share/examples/solr/example/example-DIH/
 share/examples/solr/example/example-DIH/solr/mail/conf/xslt/updateXml.xsl
 share/examples/solr/example/example-DIH/solr/mail/core.properties
 share/examples/solr/example/example-DIH/solr/solr.xml
-share/examples/solr/example/example-DIH/solr/solr/conf/clustering/carrot2/kmeans-attributes.xml
-share/examples/solr/example/example-DIH/solr/solr/conf/clustering/carrot2/lingo-attributes.xml
-share/examples/solr/example/example-DIH/solr/solr/conf/clustering/carrot2/stc-attributes.xml
 share/examples/solr/example/example-DIH/solr/solr/conf/currency.xml
 share/examples/solr/example/example-DIH/solr/solr/conf/elevate.xml
 share/examples/solr/example/example-DIH/solr/solr/conf/lang/contractions_ca.txt
@@ -311,77 +302,98 @@ solr/contrib/analysis-extras/lib/icu4j-6
 solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.5.jar
 solr/contrib/analysis-extras/lib/morfologik-polish-2.1.5.jar
 solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.5.jar
-solr/contrib/analysis-extras/lib/morfologik-ukrainian-search-3.9.0.jar
-solr/contrib/analysis-extras/lib/opennlp-tools-1.9.1.jar
+solr/contrib/analysis-extras/lib/morfologik-ukrainian-search-4.9.1.jar
+solr/contrib/analysis-extras/lib/opennlp-tools-1.9.2.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-${PKGVERSION}.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-${PKGVERSION}.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-opennlp-${PKGVERSION}.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-${PKGVERSION}.jar
 solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-${PKGVERSION}.jar
-solr/contrib/clustering/README.txt
-solr/contrib/clustering/lib/attributes-binder-1.3.3.jar
-solr/contrib/clustering/lib/carrot2-guava-18.0.jar
-solr/contrib/clustering/lib/carrot2-mini-3.16.0.jar
-solr/contrib/clustering/lib/jackson-annotations-2.10.1.jar
-solr/contrib/clustering/lib/jackson-databind-2.10.1.jar
-solr/contrib/clustering/lib/simple-xml-safe-2.7.1.jar
 solr/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar
 solr/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar
 solr/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar
 solr/contrib/dataimporthandler/README.txt
 solr/contrib/extraction/README.txt
+solr/contrib/extraction/lib/SparseBitSet-1.2.jar
 solr/contrib/extraction/lib/apache-mime4j-core-0.8.3.jar
 solr/contrib/extraction/lib/apache-mime4j-dom-0.8.3.jar
 solr/contrib/extraction/lib/aspectjrt-1.8.0.jar
-solr/contrib/extraction/lib/bcmail-jdk15on-1.64.jar
-solr/contrib/extraction/lib/bcpkix-jdk15on-1.64.jar
-solr/contrib/extraction/lib/bcprov-jdk15on-1.64.jar
+solr/contrib/extraction/lib/bcmail-jdk15on-1.69.jar
+solr/contrib/extraction/lib/bcpkix-jdk15on-1.69.jar
+solr/contrib/extraction/lib/bcprov-jdk15on-1.69.jar
 solr/contrib/extraction/lib/boilerpipe-1.1.0.jar
-solr/contrib/extraction/lib/commons-collections4-4.2.jar
-solr/contrib/extraction/lib/commons-compress-1.19.jar
-solr/contrib/extraction/lib/commons-csv-1.7.jar
+solr/contrib/extraction/lib/commons-collections4-4.4.jar
+solr/contrib/extraction/lib/commons-compress-1.21.jar
+solr/contrib/extraction/lib/commons-csv-1.8.jar
 solr/contrib/extraction/lib/curvesapi-1.06.jar
 solr/contrib/extraction/lib/dec-0.1.2.jar
-solr/contrib/extraction/lib/fontbox-2.0.17.jar
+solr/contrib/extraction/lib/fontbox-2.0.24.jar
 solr/contrib/extraction/lib/icu4j-62.1.jar
-solr/contrib/extraction/lib/isoparser-1.1.22.jar
+solr/contrib/extraction/lib/isoparser-1.9.41.2.jar
 solr/contrib/extraction/lib/jackcess-3.0.1.jar
 solr/contrib/extraction/lib/jackcess-encrypt-3.0.0.jar
-solr/contrib/extraction/lib/java-libpst-0.8.1.jar
+solr/contrib/extraction/lib/java-libpst-0.9.3.jar
 solr/contrib/extraction/lib/jdom2-2.0.6.jar
 solr/contrib/extraction/lib/jempbox-1.8.16.jar
 solr/contrib/extraction/lib/jmatio-1.5.jar
 solr/contrib/extraction/lib/juniversalchardet-1.0.3.jar
-solr/contrib/extraction/lib/metadata-extractor-2.11.0.jar
+solr/contrib/extraction/lib/metadata-extractor-2.13.0.jar
 solr/contrib/extraction/lib/parso-2.0.11.jar
-solr/contrib/extraction/lib/pdfbox-2.0.17.jar
-solr/contrib/extraction/lib/pdfbox-tools-2.0.17.jar
-solr/contrib/extraction/lib/poi-4.1.1.jar
-solr/contrib/extraction/lib/poi-ooxml-4.1.1.jar
-solr/contrib/extraction/lib/poi-ooxml-schemas-4.1.1.jar
-solr/contrib/extraction/lib/poi-scratchpad-4.1.1.jar
+solr/contrib/extraction/lib/pdfbox-2.0.24.jar
+solr/contrib/extraction/lib/pdfbox-tools-2.0.24.jar
+solr/contrib/extraction/lib/poi-4.1.2.jar
+solr/contrib/extraction/lib/poi-ooxml-4.1.2.jar
+solr/contrib/extraction/lib/poi-ooxml-schemas-4.1.2.jar
+solr/contrib/extraction/lib/poi-scratchpad-4.1.2.jar
 solr/contrib/extraction/lib/rome-1.12.2.jar
 solr/contrib/extraction/lib/rome-utils-1.12.2.jar
 solr/contrib/extraction/lib/tagsoup-1.2.1.jar
-solr/contrib/extraction/lib/tika-core-1.23.jar
-solr/contrib/extraction/lib/tika-java7-1.23.jar
-solr/contrib/extraction/lib/tika-parsers-1.23.jar
-solr/contrib/extraction/lib/tika-xmp-1.23.jar
+solr/contrib/extraction/lib/tika-core-1.27.jar
+solr/contrib/extraction/lib/tika-java7-1.27.jar
+solr/contrib/extraction/lib/tika-parsers-1.27.jar
+solr/contrib/extraction/lib/tika-xmp-1.27.jar
 solr/contrib/extraction/lib/vorbis-java-core-0.8.jar
 solr/contrib/extraction/lib/vorbis-java-tika-0.8.jar
 solr/contrib/extraction/lib/xercesImpl-2.12.0.jar
 solr/contrib/extraction/lib/xml-apis-1.4.01.jar
 solr/contrib/extraction/lib/xmlbeans-3.1.0.jar
-solr/contrib/extraction/lib/xmpcore-5.1.3.jar
+solr/contrib/extraction/lib/xmpcore-shaded-6.1.10.jar
 solr/contrib/extraction/lib/xz-1.8.jar
+solr/contrib/gcs-repository/lib/api-common-1.8.1.jar
+solr/contrib/gcs-repository/lib/error_prone_annotations-2.9.0.jar
+solr/contrib/gcs-repository/lib/gax-1.45.0.jar
+solr/contrib/gcs-repository/lib/gax-httpjson-0.62.0.jar
+solr/contrib/gcs-repository/lib/google-api-client-1.32.1.jar
+solr/contrib/gcs-repository/lib/google-api-services-storage-v1-rev20210127-1.31.0.jar
+solr/contrib/gcs-repository/lib/google-auth-library-credentials-0.15.0.jar
+solr/contrib/gcs-repository/lib/google-auth-library-oauth2-http-0.15.0.jar
+solr/contrib/gcs-repository/lib/google-cloud-core-1.77.0.jar
+solr/contrib/gcs-repository/lib/google-cloud-core-http-1.77.0.jar
+solr/contrib/gcs-repository/lib/google-cloud-nio-0.122.11.jar
+solr/contrib/gcs-repository/lib/google-cloud-storage-1.113.14.jar
+solr/contrib/gcs-repository/lib/google-http-client-1.39.2.jar
+solr/contrib/gcs-repository/lib/google-http-client-appengine-1.39.2.jar
+solr/contrib/gcs-repository/lib/google-http-client-jackson2-1.39.2.jar
+solr/contrib/gcs-repository/lib/google-oauth-client-1.32.1.jar
+solr/contrib/gcs-repository/lib/grpc-context-1.19.0.jar
+solr/contrib/gcs-repository/lib/gson-2.7.jar
+solr/contrib/gcs-repository/lib/j2objc-annotations-1.1.jar
+solr/contrib/gcs-repository/lib/jackson-core-2.12.3.jar
+solr/contrib/gcs-repository/lib/opencensus-api-0.21.0.jar
+solr/contrib/gcs-repository/lib/opencensus-contrib-http-util-0.21.0.jar
+solr/contrib/gcs-repository/lib/proto-google-common-protos-1.16.0.jar
+solr/contrib/gcs-repository/lib/proto-google-iam-v1-0.12.0.jar
+solr/contrib/gcs-repository/lib/protobuf-java-3.11.0.jar
+solr/contrib/gcs-repository/lib/protobuf-java-util-3.11.0.jar
+solr/contrib/gcs-repository/lib/threetenbp-1.3.3.jar
 solr/contrib/jaegertracer-configurator/README.txt
-solr/contrib/jaegertracer-configurator/lib/jaeger-core-1.1.0.jar
-solr/contrib/jaegertracer-configurator/lib/jaeger-thrift-1.1.0.jar
-solr/contrib/jaegertracer-configurator/lib/libthrift-0.13.0.jar
+solr/contrib/jaegertracer-configurator/lib/jaeger-core-1.6.0.jar
+solr/contrib/jaegertracer-configurator/lib/jaeger-thrift-1.6.0.jar
+solr/contrib/jaegertracer-configurator/lib/libthrift-0.14.1.jar
 solr/contrib/langid/README.txt
 solr/contrib/langid/lib/jsonic-1.2.7.jar
 solr/contrib/langid/lib/langdetect-1.1-20120112.jar
-solr/contrib/langid/lib/opennlp-tools-1.9.1.jar
+solr/contrib/langid/lib/opennlp-tools-1.9.2.jar
 solr/contrib/ltr/README.txt
 solr/contrib/prometheus-exporter/README.txt
 solr/contrib/prometheus-exporter/bin/solr-exporter
@@ -389,76 +401,102 @@ solr/contrib/prometheus-exporter/bin/sol
 solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
 solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml
 solr/contrib/prometheus-exporter/lib/argparse4j-0.8.1.jar
-solr/contrib/prometheus-exporter/lib/jackson-annotations-2.10.1.jar
-solr/contrib/prometheus-exporter/lib/jackson-core-2.10.1.jar
-solr/contrib/prometheus-exporter/lib/jackson-databind-2.10.1.jar
+solr/contrib/prometheus-exporter/lib/jackson-annotations-2.12.3.jar
+solr/contrib/prometheus-exporter/lib/jackson-core-2.12.3.jar
+solr/contrib/prometheus-exporter/lib/jackson-databind-2.12.3.jar
 solr/contrib/prometheus-exporter/lib/jackson-jq-0.0.8.jar
-solr/contrib/prometheus-exporter/lib/log4j-api-2.11.2.jar
-solr/contrib/prometheus-exporter/lib/log4j-core-2.11.2.jar
-solr/contrib/prometheus-exporter/lib/log4j-slf4j-impl-2.11.2.jar
+solr/contrib/prometheus-exporter/lib/log4j-api-2.16.0.jar
+solr/contrib/prometheus-exporter/lib/log4j-core-2.16.0.jar
+solr/contrib/prometheus-exporter/lib/log4j-slf4j-impl-2.16.0.jar
 solr/contrib/prometheus-exporter/lib/simpleclient-0.2.0.jar
 solr/contrib/prometheus-exporter/lib/simpleclient_common-0.2.0.jar
 solr/contrib/prometheus-exporter/lib/simpleclient_httpserver-0.2.0.jar
 solr/contrib/prometheus-exporter/lib/slf4j-api-1.7.24.jar
 solr/contrib/prometheus-exporter/lucene-libs/lucene-analyzers-common-${PKGVERSION}.jar
-solr/contrib/velocity/lib/commons-lang3-3.9.jar
-solr/contrib/velocity/lib/velocity-engine-core-2.0.jar
-solr/contrib/velocity/lib/velocity-tools-generic-3.0.jar
-solr/contrib/velocity/lib/velocity-tools-view-3.0.jar
-solr/contrib/velocity/lib/velocity-tools-view-jsp-3.0.jar
+solr/contrib/s3-repository/lib/annotations-2.17.63.jar
+solr/contrib/s3-repository/lib/apache-client-2.17.63.jar
+solr/contrib/s3-repository/lib/arns-2.17.63.jar
+solr/contrib/s3-repository/lib/auth-2.17.63.jar
+solr/contrib/s3-repository/lib/aws-core-2.17.63.jar
+solr/contrib/s3-repository/lib/aws-query-protocol-2.17.63.jar
+solr/contrib/s3-repository/lib/aws-xml-protocol-2.17.63.jar
+solr/contrib/s3-repository/lib/http-client-spi-2.17.63.jar
+solr/contrib/s3-repository/lib/ion-java-1.0.2.jar
+solr/contrib/s3-repository/lib/joda-time-2.9.9.jar
+solr/contrib/s3-repository/lib/json-utils-2.17.63.jar
+solr/contrib/s3-repository/lib/metrics-spi-2.17.63.jar
+solr/contrib/s3-repository/lib/profiles-2.17.63.jar
+solr/contrib/s3-repository/lib/protocol-core-2.17.63.jar
+solr/contrib/s3-repository/lib/reactive-streams-1.0.3.jar
+solr/contrib/s3-repository/lib/regions-2.17.63.jar
+solr/contrib/s3-repository/lib/s3-2.17.63.jar
+solr/contrib/s3-repository/lib/sdk-core-2.17.63.jar
+solr/contrib/s3-repository/lib/stax2-api-4.2.1.jar
+solr/contrib/s3-repository/lib/third-party-jackson-core-2.17.63.jar
+solr/contrib/s3-repository/lib/utils-2.17.63.jar
+solr/contrib/s3-repository/lib/woodstox-core-6.2.4.jar
+solr/contrib/velocity/lib/commons-lang3-3.10.jar
+solr/contrib/velocity/lib/velocity-engine-core-2.3.jar
+solr/contrib/velocity/lib/velocity-tools-generic-3.1.jar
+solr/contrib/velocity/lib/velocity-tools-view-3.1.jar
+solr/contrib/velocity/lib/velocity-tools-view-jsp-3.1.jar
 solr/dist/solr-analysis-extras-${PKGVERSION}.jar
 solr/dist/solr-analytics-${PKGVERSION}.jar
 solr/dist/solr-cell-${PKGVERSION}.jar
-solr/dist/solr-clustering-${PKGVERSION}.jar
 solr/dist/solr-core-${PKGVERSION}.jar
 solr/dist/solr-dataimporthandler-${PKGVERSION}.jar
 solr/dist/solr-dataimporthandler-extras-${PKGVERSION}.jar
+solr/dist/solr-gcs-repository-${PKGVERSION}.jar
 solr/dist/solr-jaegertracer-configurator-${PKGVERSION}.jar
 solr/dist/solr-langid-${PKGVERSION}.jar
 solr/dist/solr-ltr-${PKGVERSION}.jar
 solr/dist/solr-prometheus-exporter-${PKGVERSION}.jar
+solr/dist/solr-s3-repository-${PKGVERSION}.jar
 solr/dist/solr-solrj-${PKGVERSION}.jar
 solr/dist/solr-test-framework-${PKGVERSION}.jar
 solr/dist/solr-velocity-${PKGVERSION}.jar
-solr/dist/solrj-lib/commons-io-2.6.jar
+solr/dist/solrj-lib/commons-io-2.8.0.jar
+solr/dist/solrj-lib/commons-lang-2.6.jar
 solr/dist/solrj-lib/commons-math3-3.6.1.jar
-solr/dist/solrj-lib/http2-client-9.4.24.v20191120.jar
-solr/dist/solrj-lib/http2-common-9.4.24.v20191120.jar
-solr/dist/solrj-lib/http2-hpack-9.4.24.v20191120.jar
-solr/dist/solrj-lib/http2-http-client-transport-9.4.24.v20191120.jar
-solr/dist/solrj-lib/httpclient-4.5.10.jar
-solr/dist/solrj-lib/httpcore-4.4.12.jar
-solr/dist/solrj-lib/httpmime-4.5.10.jar
+solr/dist/solrj-lib/http2-client-9.4.44.v20210927.jar
+solr/dist/solrj-lib/http2-common-9.4.44.v20210927.jar
+solr/dist/solrj-lib/http2-hpack-9.4.44.v20210927.jar
+solr/dist/solrj-lib/http2-http-client-transport-9.4.44.v20210927.jar
+solr/dist/solrj-lib/httpclient-4.5.13.jar
+solr/dist/solrj-lib/httpcore-4.4.14.jar
+solr/dist/solrj-lib/httpmime-4.5.13.jar
 solr/dist/solrj-lib/jcl-over-slf4j-1.7.24.jar
-solr/dist/solrj-lib/jetty-alpn-client-9.4.24.v20191120.jar
-solr/dist/solrj-lib/jetty-alpn-java-client-9.4.24.v20191120.jar
-solr/dist/solrj-lib/jetty-client-9.4.24.v20191120.jar
-solr/dist/solrj-lib/jetty-http-9.4.24.v20191120.jar
-solr/dist/solrj-lib/jetty-io-9.4.24.v20191120.jar
-solr/dist/solrj-lib/jetty-util-9.4.24.v20191120.jar
-solr/dist/solrj-lib/netty-buffer-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-codec-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-common-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-handler-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-resolver-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-transport-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-transport-native-epoll-4.1.29.Final.jar
-solr/dist/solrj-lib/netty-transport-native-unix-common-4.1.29.Final.jar
+solr/dist/solrj-lib/jetty-alpn-client-9.4.44.v20210927.jar
+solr/dist/solrj-lib/jetty-alpn-java-client-9.4.44.v20210927.jar
+solr/dist/solrj-lib/jetty-client-9.4.44.v20210927.jar
+solr/dist/solrj-lib/jetty-http-9.4.44.v20210927.jar
+solr/dist/solrj-lib/jetty-io-9.4.44.v20210927.jar
+solr/dist/solrj-lib/jetty-util-9.4.44.v20210927.jar
+solr/dist/solrj-lib/netty-buffer-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-codec-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-common-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-handler-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-resolver-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-transport-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-transport-native-epoll-4.1.68.Final.jar
+solr/dist/solrj-lib/netty-transport-native-unix-common-4.1.68.Final.jar
 solr/dist/solrj-lib/slf4j-api-1.7.24.jar
-solr/dist/solrj-lib/stax2-api-3.1.4.jar
-solr/dist/solrj-lib/woodstox-core-asl-4.4.1.jar
-solr/dist/solrj-lib/zookeeper-3.5.5.jar
-solr/dist/solrj-lib/zookeeper-jute-3.5.5.jar
+solr/dist/solrj-lib/snappy-java-1.1.7.6.jar
+solr/dist/solrj-lib/stax2-api-4.2.1.jar
+solr/dist/solrj-lib/woodstox-core-6.2.4.jar
+solr/dist/solrj-lib/zookeeper-3.6.2.jar
+solr/dist/solrj-lib/zookeeper-jute-3.6.2.jar
 solr/dist/test-framework/README.txt
 solr/dist/test-framework/lib/ant-1.8.2.jar
 solr/dist/test-framework/lib/hamcrest-core-1.3.jar
-solr/dist/test-framework/lib/junit-4.12.jar
+solr/dist/test-framework/lib/junit-4.13.1.jar
 solr/dist/test-framework/lib/junit4-ant-2.7.2.jar
 solr/dist/test-framework/lib/opentracing-mock-0.33.0.jar
 solr/dist/test-framework/lib/randomizedtesting-runner-2.7.2.jar
 solr/dist/test-framework/lucene-libs/lucene-test-framework-${PKGVERSION}.jar
 solr/server/README.txt
 solr/server/contexts/solr-jetty-context.xml
+solr/server/etc/jetty-gzip.xml
 solr/server/etc/jetty-http.xml
 solr/server/etc/jetty-https.xml
 solr/server/etc/jetty-https8.xml
@@ -471,36 +509,38 @@ solr/server/etc/webdefault.xml
 solr/server/lib/ext/disruptor-3.4.2.jar
 solr/server/lib/ext/jcl-over-slf4j-1.7.24.jar
 solr/server/lib/ext/jul-to-slf4j-1.7.24.jar
-solr/server/lib/ext/log4j-1.2-api-2.11.2.jar
-solr/server/lib/ext/log4j-api-2.11.2.jar
-solr/server/lib/ext/log4j-core-2.11.2.jar
-solr/server/lib/ext/log4j-slf4j-impl-2.11.2.jar
-solr/server/lib/ext/log4j-web-2.11.2.jar
+solr/server/lib/ext/log4j-1.2-api-2.16.0.jar
+solr/server/lib/ext/log4j-api-2.16.0.jar
+solr/server/lib/ext/log4j-core-2.16.0.jar
+solr/server/lib/ext/log4j-layout-template-json-2.16.0.jar
+solr/server/lib/ext/log4j-slf4j-impl-2.16.0.jar
+solr/server/lib/ext/log4j-web-2.16.0.jar
 solr/server/lib/ext/slf4j-api-1.7.24.jar
-solr/server/lib/http2-common-9.4.24.v20191120.jar
-solr/server/lib/http2-hpack-9.4.24.v20191120.jar
-solr/server/lib/http2-server-9.4.24.v20191120.jar
+solr/server/lib/http2-common-9.4.44.v20210927.jar
+solr/server/lib/http2-hpack-9.4.44.v20210927.jar
+solr/server/lib/http2-server-9.4.44.v20210927.jar
 solr/server/lib/javax.servlet-api-3.1.0.jar
-solr/server/lib/jetty-alpn-java-server-9.4.24.v20191120.jar
-solr/server/lib/jetty-alpn-server-9.4.24.v20191120.jar
-solr/server/lib/jetty-continuation-9.4.24.v20191120.jar
-solr/server/lib/jetty-deploy-9.4.24.v20191120.jar
-solr/server/lib/jetty-http-9.4.24.v20191120.jar
-solr/server/lib/jetty-io-9.4.24.v20191120.jar
-solr/server/lib/jetty-jmx-9.4.24.v20191120.jar
-solr/server/lib/jetty-rewrite-9.4.24.v20191120.jar
-solr/server/lib/jetty-security-9.4.24.v20191120.jar
-solr/server/lib/jetty-server-9.4.24.v20191120.jar
-solr/server/lib/jetty-servlet-9.4.24.v20191120.jar
-solr/server/lib/jetty-servlets-9.4.24.v20191120.jar
-solr/server/lib/jetty-util-9.4.24.v20191120.jar
-solr/server/lib/jetty-webapp-9.4.24.v20191120.jar
-solr/server/lib/jetty-xml-9.4.24.v20191120.jar
-solr/server/lib/metrics-core-4.1.2.jar
-solr/server/lib/metrics-graphite-4.1.2.jar
-solr/server/lib/metrics-jetty9-4.1.2.jar
-solr/server/lib/metrics-jmx-4.1.2.jar
-solr/server/lib/metrics-jvm-4.1.2.jar
+solr/server/lib/jetty-alpn-java-server-9.4.44.v20210927.jar
+solr/server/lib/jetty-alpn-server-9.4.44.v20210927.jar
+solr/server/lib/jetty-continuation-9.4.44.v20210927.jar
+solr/server/lib/jetty-deploy-9.4.44.v20210927.jar
+solr/server/lib/jetty-http-9.4.44.v20210927.jar
+solr/server/lib/jetty-io-9.4.44.v20210927.jar
+solr/server/lib/jetty-jmx-9.4.44.v20210927.jar
+solr/server/lib/jetty-rewrite-9.4.44.v20210927.jar
+solr/server/lib/jetty-security-9.4.44.v20210927.jar
+solr/server/lib/jetty-server-9.4.44.v20210927.jar
+solr/server/lib/jetty-servlet-9.4.44.v20210927.jar
+solr/server/lib/jetty-servlets-9.4.44.v20210927.jar
+solr/server/lib/jetty-util-9.4.44.v20210927.jar
+solr/server/lib/jetty-webapp-9.4.44.v20210927.jar
+solr/server/lib/jetty-xml-9.4.44.v20210927.jar
+solr/server/lib/metrics-core-4.1.5.jar
+solr/server/lib/metrics-graphite-4.1.5.jar
+solr/server/lib/metrics-jetty9-4.1.5.jar
+solr/server/lib/metrics-jmx-4.1.5.jar
+solr/server/lib/metrics-jvm-4.1.5.jar
+solr/server/modules/gzip.mod
 solr/server/modules/http.mod
 solr/server/modules/https.mod
 solr/server/modules/https8.mod
@@ -514,21 +554,24 @@ solr/server/scripts/cloud-scripts/snapsh
 solr/server/scripts/cloud-scripts/zkcli.bat
 solr/server/scripts/cloud-scripts/zkcli.sh
 solr/server/solr-webapp/webapp/WEB-INF/lib/antlr4-runtime-4.5.1-1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/asm-7.2.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/asm-commons-7.2.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.13.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.8.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-core-1.18.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-linq4j-1.18.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-cli-1.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/apiguardian-api-1.1.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/asm-8.0.1.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/asm-commons-8.0.1.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.18.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.9.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-core-1.27.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-linq4j-1.27.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/checker-qual-3.10.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-cli-1.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.13.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections4-4.4.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-compiler-3.0.9.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-configuration2-2.1.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-exec-1.3.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.3.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-io-2.6.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang3-3.9.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-io-2.8.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang-2.6.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang3-3.10.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-math3-3.6.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-text-1.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/curator-client-2.13.0.jar
@@ -536,32 +579,33 @@ solr/server/solr-webapp/webapp/WEB-INF/l
 solr/server/solr-webapp/webapp/WEB-INF/lib/curator-recipes-2.13.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/disruptor-3.4.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/eigenbase-properties-1.1.5.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/esri-geometry-api-2.2.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/guava-25.1-jre.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-annotations-3.2.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-auth-3.2.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-3.2.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-client-3.2.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-annotations-3.2.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-auth-3.2.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-3.2.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-client-3.2.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/hppc-0.8.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/htrace-core4-4.1.0-incubating.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/http2-client-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/http2-common-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/http2-hpack-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/http2-http-client-transport-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.5.10.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.12.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.5.10.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.10.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.10.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.10.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.10.1.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/http2-client-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/http2-common-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/http2-hpack-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/http2-http-client-transport-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.5.13.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.14.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.5.13.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.12.3.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.12.3.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.12.3.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.12.3.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/janino-3.0.9.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/java-semver-0.9.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-client-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-java-client-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-client-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-http-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-io-9.4.24.v20191120.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-util-9.4.24.v20191120.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-client-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-java-client-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-client-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-http-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-io-9.4.44.v20210927.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-util-9.4.44.v20210927.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jose4j-0.6.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/json-path-2.4.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/kerb-core-1.0.1.jar
@@ -588,31 +632,30 @@ solr/server/solr-webapp/webapp/WEB-INF/l
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-${PKGVERSION}.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-${PKGVERSION}.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-${PKGVERSION}.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-buffer-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-codec-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-common-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-handler-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-resolver-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-epoll-4.1.29.Final.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-unix-common-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-buffer-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-codec-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-common-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-handler-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-resolver-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-epoll-4.1.68.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-unix-common-4.1.68.Final.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-api-0.33.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-noop-0.33.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-util-0.33.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.4.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.4.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-3.11.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/re2j-1.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/rrd4j-3.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/s2-geometry-library-java-1.0.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/snappy-java-1.1.7.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-${PKGVERSION}.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-${PKGVERSION}.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/spatial4j-0.7.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/stax2-api-3.1.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/stax2-api-4.2.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/t-digest-3.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-asl-4.4.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.5.5.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-jute-3.5.5.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-6.2.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.6.2.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-jute-3.6.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/web.xml
 solr/server/solr-webapp/webapp/css/angular/analysis.css
 solr/server/solr-webapp/webapp/css/angular/angular-csp.css
@@ -637,7 +680,9 @@ solr/server/solr-webapp/webapp/css/angul
 solr/server/solr-webapp/webapp/css/angular/plugins.css
 solr/server/solr-webapp/webapp/css/angular/query.css
 solr/server/solr-webapp/webapp/css/angular/replication.css
+solr/server/solr-webapp/webapp/css/angular/schema-designer.css
 solr/server/solr-webapp/webapp/css/angular/schema.css
+solr/server/solr-webapp/webapp/css/angular/security.css
 solr/server/solr-webapp/webapp/css/angular/segments.css
 solr/server/solr-webapp/webapp/css/angular/stream.css
 solr/server/solr-webapp/webapp/css/angular/suggestions.css
@@ -793,6 +838,11 @@ solr/server/solr-webapp/webapp/img/ico/i
 solr/server/solr-webapp/webapp/img/ico/information-white.png
 solr/server/solr-webapp/webapp/img/ico/information.png
 solr/server/solr-webapp/webapp/img/ico/jar.png
+solr/server/solr-webapp/webapp/img/ico/key.png
+solr/server/solr-webapp/webapp/img/ico/keyplus.png
+solr/server/solr-webapp/webapp/img/ico/lock.png
+solr/server/solr-webapp/webapp/img/ico/lockplus.png
+solr/server/solr-webapp/webapp/img/ico/logout.png
 solr/server/solr-webapp/webapp/img/ico/magnifier.png
 solr/server/solr-webapp/webapp/img/ico/mail.png
 solr/server/solr-webapp/webapp/img/ico/memory.png
@@ -805,9 +855,9 @@ solr/server/solr-webapp/webapp/img/ico/n
 solr/server/solr-webapp/webapp/img/ico/network-status.png
 solr/server/solr-webapp/webapp/img/ico/network.png
 solr/server/solr-webapp/webapp/img/ico/node-design.png
-solr/server/solr-webapp/webapp/img/ico/node-master.png
+solr/server/solr-webapp/webapp/img/ico/node-follower.png
+solr/server/solr-webapp/webapp/img/ico/node-leader.png
 solr/server/solr-webapp/webapp/img/ico/node-select.png
-solr/server/solr-webapp/webapp/img/ico/node-slave.png
 solr/server/solr-webapp/webapp/img/ico/node.png
 solr/server/solr-webapp/webapp/img/ico/pencil-small.png
 solr/server/solr-webapp/webapp/img/ico/pencil.png
@@ -824,6 +874,8 @@ solr/server/solr-webapp/webapp/img/ico/r
 solr/server/solr-webapp/webapp/img/ico/script-code.png
 solr/server/solr-webapp/webapp/img/ico/server-cast.png
 solr/server/solr-webapp/webapp/img/ico/server.png
+solr/server/solr-webapp/webapp/img/ico/shield--exclamation.png
+solr/server/solr-webapp/webapp/img/ico/shield.png
 solr/server/solr-webapp/webapp/img/ico/sitemap.png
 solr/server/solr-webapp/webapp/img/ico/slash.png
 solr/server/solr-webapp/webapp/img/ico/status-away.png
@@ -847,6 +899,7 @@ solr/server/solr-webapp/webapp/img/ico/u
 solr/server/solr-webapp/webapp/img/ico/ui-radio-button-uncheck.png
 solr/server/solr-webapp/webapp/img/ico/ui-radio-button.png
 solr/server/solr-webapp/webapp/img/ico/ui-text-field-select.png
+solr/server/solr-webapp/webapp/img/ico/useradd.png
 solr/server/solr-webapp/webapp/img/ico/users.png
 solr/server/solr-webapp/webapp/img/ico/wooden-box.png
 solr/server/solr-webapp/webapp/img/ico/zone.png
@@ -879,7 +932,9 @@ solr/server/solr-webapp/webapp/js/angula
 solr/server/solr-webapp/webapp/js/angular/controllers/plugins.js
 solr/server/solr-webapp/webapp/js/angular/controllers/query.js
 solr/server/solr-webapp/webapp/js/angular/controllers/replication.js
+solr/server/solr-webapp/webapp/js/angular/controllers/schema-designer.js
 solr/server/solr-webapp/webapp/js/angular/controllers/schema.js
+solr/server/solr-webapp/webapp/js/angular/controllers/security.js
 solr/server/solr-webapp/webapp/js/angular/controllers/segments.js
 solr/server/solr-webapp/webapp/js/angular/controllers/stream.js
 solr/server/solr-webapp/webapp/js/angular/controllers/threads.js
@@ -895,7 +950,7 @@ solr/server/solr-webapp/webapp/libs/angu
 solr/server/solr-webapp/webapp/libs/chosen.jquery.min.js
 solr/server/solr-webapp/webapp/libs/d3.js
 solr/server/solr-webapp/webapp/libs/highlight.js
-solr/server/solr-webapp/webapp/libs/jquery-3.4.1.min.js
+solr/server/solr-webapp/webapp/libs/jquery-3.5.1.min.js
 solr/server/solr-webapp/webapp/libs/jquery-ui.min.js
 solr/server/solr-webapp/webapp/libs/jstree.min.js
 solr/server/solr-webapp/webapp/libs/ngtimeago.js
@@ -918,7 +973,9 @@ solr/server/solr-webapp/webapp/partials/
 solr/server/solr-webapp/webapp/partials/plugins.html
 solr/server/solr-webapp/webapp/partials/query.html
 solr/server/solr-webapp/webapp/partials/replication.html
+solr/server/solr-webapp/webapp/partials/schema-designer.html
 solr/server/solr-webapp/webapp/partials/schema.html
+solr/server/solr-webapp/webapp/partials/security.html
 solr/server/solr-webapp/webapp/partials/segments.html
 solr/server/solr-webapp/webapp/partials/stream.html
 solr/server/solr-webapp/webapp/partials/threads.html
@@ -971,10 +1028,6 @@ solr/server/solr/configsets/_default/con
 solr/server/solr/configsets/sample_techproducts_configs/conf/_rest_managed.json
 solr/server/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_stopwords_english.json
 solr/server/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_synonyms_english.json
-solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/README.txt
-solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/kmeans-attributes.xml
-solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/lingo-attributes.xml
-solr/server/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/stc-attributes.xml
 solr/server/solr/configsets/sample_techproducts_configs/conf/currency.xml
 solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml
 solr/server/solr/configsets/sample_techproducts_configs/conf/lang/contractions_ca.txt
@@ -1030,8 +1083,6 @@ solr/server/solr/configsets/sample_techp
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/README.txt
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/browse.vm
-solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
-solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster_results.vm
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/debug.vm
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/error.vm

Index: pkgsrc/databases/apache-solr/distinfo
diff -u pkgsrc/databases/apache-solr/distinfo:1.4 pkgsrc/databases/apache-solr/distinfo:1.5
--- pkgsrc/databases/apache-solr/distinfo:1.4   Tue Oct 26 10:09:14 2021
+++ pkgsrc/databases/apache-solr/distinfo       Sat Dec 18 15:34:19 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:09:14 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/12/18 15:34:19 jym Exp $
 
-BLAKE2s (solr-8.5.2.tgz) = b5343920817024a0855a3aa7071b24d1453b1f05ed162df4e10d859f58b910ac
-SHA512 (solr-8.5.2.tgz) = 02b9b90468f399701dba26695c9af6cd205f47916a06e26838613fe238594e9902de6ef3b42ec8257d195e37589adf8427d9b7962557731e91949fbef06bb544
-Size (solr-8.5.2.tgz) = 190485345 bytes
-SHA1 (patch-solr-bin) = 2f6a915ebf57b33ae8bc4e4f1c7109ed0f058b29
+SHA1 (solr-8.11.1.tgz) = 4ebc3ff1f5dc6cbe70f3f41989f27873aeffca74
+RMD160 (solr-8.11.1.tgz) = f0aee47281ccb147d8a6874bbfecb7604b3c8977
+SHA512 (solr-8.11.1.tgz) = 4893f836aec84b03d7bfe574e59e305c03b5ede4a48020034fbe81440b8feee79e55fd9ead230e5b89b3f25124e9b56c1ddc4bb5c7f631cf4e846b9cab5f9a45
+Size (solr-8.11.1.tgz) = 218076598 bytes
+SHA1 (patch-solr-bin) = 69990d68ada63b6c70d3df83fbaea22b9559cb04

Index: pkgsrc/databases/apache-solr/patches/patch-solr-bin
diff -u pkgsrc/databases/apache-solr/patches/patch-solr-bin:1.1 pkgsrc/databases/apache-solr/patches/patch-solr-bin:1.2
--- pkgsrc/databases/apache-solr/patches/patch-solr-bin:1.1     Tue Jun  9 22:20:01 2020
+++ pkgsrc/databases/apache-solr/patches/patch-solr-bin Sat Dec 18 15:34:20 2021
@@ -1,8 +1,6 @@
-$NetBSD: patch-solr-bin,v 1.1 2020/06/09 22:20:01 jym Exp $
+$NetBSD: patch-solr-bin,v 1.2 2021/12/18 15:34:20 jym Exp $
 
-Use paths more suitable with a pkgsrc install.
-
---- bin/solr.orig      2020-04-08 05:03:49.000000000 +0000
+--- bin/solr.orig      2021-12-08 01:01:00.000000000 +0000
 +++ bin/solr
 @@ -85,6 +85,7 @@ if [ -z "$SOLR_INCLUDE" ]; then
                 /usr/share/solr/solr.in.sh \
@@ -12,22 +10,13 @@ Use paths more suitable with a pkgsrc in
                 /opt/solr/solr.in.sh; do
      if [ -r "$include" ]; then
          SOLR_INCLUDE="$include"
-@@ -1942,7 +1943,7 @@ fi
- if [ -z "$SOLR_LOGS_DIR" ]; then
-   SOLR_LOGS_DIR="$SOLR_SERVER_DIR/logs"
- fi
--EXAMPLE_DIR="$SOLR_TIP/example"
-+EXAMPLE_DIR="@SOLR_EXAMPLE@"
- if [ "${SOLR_HOME:0:${#EXAMPLE_DIR}}" = "$EXAMPLE_DIR" ]; then
-   LOG4J_PROPS="$DEFAULT_SERVER_DIR/resources/log4j2.xml"
-   SOLR_LOGS_DIR="$SOLR_HOME/../logs"
-@@ -2236,13 +2237,13 @@ function start_solr() {
+@@ -2289,13 +2290,13 @@ function start_solr() {
        echo ""
      fi
      # no lsof on cygwin though
 -    if lsof -v 2>&1 | grep -q revision; then
 +    if @PREFIX@/sbin/lsof -v 2>&1 | grep -q revision; then
-       echo -n "Waiting up to $SOLR_STOP_WAIT seconds to see Solr running on port $SOLR_PORT"
+       echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT"
        # Launch in a subshell to show the spinner
        (loops=0
        while true
@@ -36,4 +25,4 @@ Use paths more suitable with a pkgsrc in
 +        running=$(@PREFIX@/sbin/lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN)
          if [ -z "$running" ]; then
          slept=$((loops * 2))
-           if [ $slept -lt $SOLR_STOP_WAIT ]; then
+           if [ $slept -lt $SOLR_START_WAIT ]; then