This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a change to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/solr.git


    from 82f00f105a3 Documented V2 API Conventions (#4826)
     add 73b96ed949e SOLR-18297 Upgrade Jetty to 12.1.10 (#4574)
     add 2eb701c6172 SOLR-18297: documentation: don't say "embedded" Jetty 
(#4664)
     add 4507807d282 SOLR-18297: Upgrade Jetty to 12.1.14 (#5059)

No new revisions were added by this update.

Summary of changes:
 .../unreleased/SOLR-18297-update-jetty-12.1.yml    |  7 ++
 gradle/libs.versions.toml                          |  2 +-
 solr/api/gradle.lockfile                           | 38 ++++++-----
 solr/benchmark/gradle.lockfile                     | 38 ++++++-----
 solr/core/gradle.lockfile                          | 38 ++++++-----
 .../src/java/org/apache/solr/core/SolrCore.java    |  4 +-
 .../java/org/apache/solr/handler/CatStream.java    |  4 +-
 .../container/JettyBridgeResponseWriter.java       |  5 +-
 .../org/apache/solr/servlet/HttpSolrProxy.java     | 20 +++++-
 .../solr/cloud/TestGracefulJettyShutdown.java      | 19 ++++--
 solr/cross-dc-manager/gradle.lockfile              | 50 +++++++-------
 solr/licenses/jetty-alpn-client-12.0.34.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-client-12.1.14.jar.sha1   |  1 +
 .../jetty-alpn-java-client-12.0.34.jar.sha1        |  1 -
 .../jetty-alpn-java-client-12.1.14.jar.sha1        |  1 +
 .../jetty-alpn-java-server-12.0.34.jar.sha1        |  1 -
 .../jetty-alpn-java-server-12.1.14.jar.sha1        |  1 +
 solr/licenses/jetty-alpn-server-12.0.34.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-server-12.1.14.jar.sha1   |  1 +
 solr/licenses/jetty-client-12.0.34.jar.sha1        |  1 -
 solr/licenses/jetty-client-12.1.14.jar.sha1        |  1 +
 .../jetty-compression-common-12.1.14.jar.sha1      |  1 +
 .../jetty-compression-gzip-12.1.14.jar.sha1        |  1 +
 solr/licenses/jetty-deploy-12.0.34.jar.sha1        |  1 -
 solr/licenses/jetty-deploy-12.1.14.jar.sha1        |  1 +
 solr/licenses/jetty-ee-12.0.34.jar.sha1            |  1 -
 solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1     |  1 +
 solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1  |  1 -
 solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1  |  1 +
 solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 |  1 -
 solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 |  1 +
 solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1   |  1 -
 solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1   |  1 +
 solr/licenses/jetty-http-12.0.34.jar.sha1          |  1 -
 solr/licenses/jetty-http-12.1.14.jar.sha1          |  1 +
 solr/licenses/jetty-http2-client-12.0.34.jar.sha1  |  1 -
 solr/licenses/jetty-http2-client-12.1.14.jar.sha1  |  1 +
 .../jetty-http2-client-transport-12.0.34.jar.sha1  |  1 -
 .../jetty-http2-client-transport-12.1.14.jar.sha1  |  1 +
 solr/licenses/jetty-http2-common-12.0.34.jar.sha1  |  1 -
 solr/licenses/jetty-http2-common-12.1.14.jar.sha1  |  1 +
 solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1   |  1 -
 solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1   |  1 +
 solr/licenses/jetty-http2-server-12.0.34.jar.sha1  |  1 -
 solr/licenses/jetty-http2-server-12.1.14.jar.sha1  |  1 +
 solr/licenses/jetty-io-12.0.34.jar.sha1            |  1 -
 solr/licenses/jetty-io-12.1.14.jar.sha1            |  1 +
 solr/licenses/jetty-jmx-12.0.34.jar.sha1           |  1 -
 solr/licenses/jetty-jmx-12.1.14.jar.sha1           |  1 +
 solr/licenses/jetty-rewrite-12.0.34.jar.sha1       |  1 -
 solr/licenses/jetty-rewrite-12.1.14.jar.sha1       |  1 +
 solr/licenses/jetty-security-12.0.34.jar.sha1      |  1 -
 solr/licenses/jetty-security-12.1.14.jar.sha1      |  1 +
 solr/licenses/jetty-server-12.0.34.jar.sha1        |  1 -
 solr/licenses/jetty-server-12.1.14.jar.sha1        |  1 +
 solr/licenses/jetty-session-12.0.34.jar.sha1       |  1 -
 solr/licenses/jetty-session-12.1.14.jar.sha1       |  1 +
 solr/licenses/jetty-start-12.0.34-shaded.jar.sha1  |  1 -
 solr/licenses/jetty-start-12.1.14-shaded.jar.sha1  |  1 +
 solr/licenses/jetty-util-12.0.34.jar.sha1          |  1 -
 solr/licenses/jetty-util-12.1.14.jar.sha1          |  1 +
 solr/licenses/jetty-xml-12.0.34.jar.sha1           |  1 -
 solr/licenses/jetty-xml-12.1.14.jar.sha1           |  1 +
 solr/modules/analysis-extras/gradle.lockfile       | 38 ++++++-----
 solr/modules/clustering/gradle.lockfile            | 38 ++++++-----
 solr/modules/cross-dc/gradle.lockfile              | 38 ++++++-----
 solr/modules/cuvs/gradle.lockfile                  | 38 ++++++-----
 solr/modules/extraction/gradle.lockfile            | 38 ++++++-----
 solr/modules/gcs-repository/gradle.lockfile        | 38 ++++++-----
 solr/modules/jwt-auth/gradle.lockfile              | 38 ++++++-----
 solr/modules/langid/gradle.lockfile                | 38 ++++++-----
 solr/modules/language-models/gradle.lockfile       | 38 ++++++-----
 solr/modules/ltr/gradle.lockfile                   | 38 ++++++-----
 solr/modules/opentelemetry/gradle.lockfile         | 38 ++++++-----
 solr/modules/s3-repository/gradle.lockfile         | 38 ++++++-----
 solr/modules/scripting/gradle.lockfile             | 38 ++++++-----
 solr/modules/sql/gradle.lockfile                   | 38 ++++++-----
 solr/packaging/test/test_start_solr.bats           | 14 ++++
 solr/server/contexts/solr-jetty-context.xml        | 51 --------------
 solr/server/etc/jetty.xml                          | 77 ++++++++++++----------
 solr/server/gradle.lockfile                        | 52 ++++++++-------
 solr/solr-ref-guide/gradle.lockfile                | 38 ++++++-----
 .../pages/major-changes-in-solr-10.adoc            |  8 +++
 solr/solrj-jetty/gradle.lockfile                   | 38 ++++++-----
 .../HttpJettySolrClientCompatibilityTest.java      | 15 +++--
 solr/solrj-streaming/gradle.lockfile               | 38 ++++++-----
 solr/solrj-zookeeper/gradle.lockfile               | 38 ++++++-----
 solr/solrj/gradle.lockfile                         | 44 +++++++------
 solr/test-framework/gradle.lockfile                | 38 ++++++-----
 solr/webapp/gradle.lockfile                        | 50 +++++++-------
 90 files changed, 687 insertions(+), 623 deletions(-)
 create mode 100644 changelog/unreleased/SOLR-18297-update-jetty-12.1.yml
 delete mode 100644 solr/licenses/jetty-alpn-client-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-client-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-server-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-server-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-client-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-client-12.1.14.jar.sha1
 create mode 100644 solr/licenses/jetty-compression-common-12.1.14.jar.sha1
 create mode 100644 solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-deploy-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-deploy-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-ee-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http2-client-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http2-client-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http2-common-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http2-common-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-http2-server-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-http2-server-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-io-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-io-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-jmx-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-jmx-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-rewrite-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-rewrite-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-security-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-security-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-server-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-server-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-session-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-session-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-start-12.0.34-shaded.jar.sha1
 create mode 100644 solr/licenses/jetty-start-12.1.14-shaded.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-util-12.1.14.jar.sha1
 delete mode 100644 solr/licenses/jetty-xml-12.0.34.jar.sha1
 create mode 100644 solr/licenses/jetty-xml-12.1.14.jar.sha1
 delete mode 100644 solr/server/contexts/solr-jetty-context.xml

Reply via email to