You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2023/12/09 00:08:03 UTC

(solr) branch branch_9_4 updated (b14505c19a7 -> f45a7ed2d63)

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

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


    from b14505c19a7 Revert "SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (#1743)"
     new 9772b62ea5b Update org.eclipse.jetty*:* to v10.0.18 (#2065)
     new 3597acc9f83 Update io.netty:* to v4.1.101.Final (#2134)
     new 8ac3e878104 Update dependency org.apache.commons:commons-lang3 to v3.14.0 (#2139)
     new f45a7ed2d63 Update dependency org.apache.commons:commons-compress to v1.25.0 (#2138)

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 solr/licenses/commons-compress-1.24.0.jar.sha1     |  1 -
 solr/licenses/commons-compress-1.25.0.jar.sha1     |  1 +
 solr/licenses/commons-lang3-3.13.0.jar.sha1        |  1 -
 solr/licenses/commons-lang3-3.14.0.jar.sha1        |  1 +
 solr/licenses/http2-client-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-client-10.0.18.jar.sha1        |  1 +
 solr/licenses/http2-common-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-common-10.0.18.jar.sha1        |  1 +
 solr/licenses/http2-hpack-10.0.17.jar.sha1         |  1 -
 solr/licenses/http2-hpack-10.0.18.jar.sha1         |  1 +
 .../http2-http-client-transport-10.0.17.jar.sha1   |  1 -
 .../http2-http-client-transport-10.0.18.jar.sha1   |  1 +
 solr/licenses/http2-server-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-alpn-client-10.0.17.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-client-10.0.18.jar.sha1   |  1 +
 .../jetty-alpn-java-client-10.0.17.jar.sha1        |  1 -
 .../jetty-alpn-java-client-10.0.18.jar.sha1        |  1 +
 .../jetty-alpn-java-server-10.0.17.jar.sha1        |  1 -
 .../jetty-alpn-java-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-alpn-server-10.0.17.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-server-10.0.18.jar.sha1   |  1 +
 solr/licenses/jetty-client-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-client-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-deploy-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-deploy-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-http-10.0.17.jar.sha1          |  1 -
 solr/licenses/jetty-http-10.0.18.jar.sha1          |  1 +
 solr/licenses/jetty-io-10.0.17.jar.sha1            |  1 -
 solr/licenses/jetty-io-10.0.18.jar.sha1            |  1 +
 solr/licenses/jetty-jmx-10.0.17.jar.sha1           |  1 -
 solr/licenses/jetty-jmx-10.0.18.jar.sha1           |  1 +
 solr/licenses/jetty-rewrite-10.0.17.jar.sha1       |  1 -
 solr/licenses/jetty-rewrite-10.0.18.jar.sha1       |  1 +
 solr/licenses/jetty-security-10.0.17.jar.sha1      |  1 -
 solr/licenses/jetty-security-10.0.18.jar.sha1      |  1 +
 solr/licenses/jetty-server-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-servlet-10.0.17.jar.sha1       |  1 -
 solr/licenses/jetty-servlet-10.0.18.jar.sha1       |  1 +
 solr/licenses/jetty-servlets-10.0.17.jar.sha1      |  1 -
 solr/licenses/jetty-servlets-10.0.18.jar.sha1      |  1 +
 solr/licenses/jetty-start-10.0.17-shaded.jar.sha1  |  1 -
 solr/licenses/jetty-start-10.0.18-shaded.jar.sha1  |  1 +
 solr/licenses/jetty-util-10.0.17.jar.sha1          |  1 -
 solr/licenses/jetty-util-10.0.18.jar.sha1          |  1 +
 solr/licenses/jetty-webapp-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-webapp-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-xml-10.0.17.jar.sha1           |  1 -
 solr/licenses/jetty-xml-10.0.18.jar.sha1           |  1 +
 solr/licenses/netty-buffer-4.1.100.Final.jar.sha1  |  1 -
 solr/licenses/netty-buffer-4.1.101.Final.jar.sha1  |  1 +
 solr/licenses/netty-codec-4.1.100.Final.jar.sha1   |  1 -
 solr/licenses/netty-codec-4.1.101.Final.jar.sha1   |  1 +
 .../netty-codec-http-4.1.100.Final.jar.sha1        |  1 -
 .../netty-codec-http-4.1.101.Final.jar.sha1        |  1 +
 .../netty-codec-http2-4.1.100.Final.jar.sha1       |  1 -
 .../netty-codec-http2-4.1.101.Final.jar.sha1       |  1 +
 .../netty-codec-socks-4.1.100.Final.jar.sha1       |  1 -
 .../netty-codec-socks-4.1.101.Final.jar.sha1       |  1 +
 solr/licenses/netty-common-4.1.100.Final.jar.sha1  |  1 -
 solr/licenses/netty-common-4.1.101.Final.jar.sha1  |  1 +
 solr/licenses/netty-handler-4.1.100.Final.jar.sha1 |  1 -
 solr/licenses/netty-handler-4.1.101.Final.jar.sha1 |  1 +
 .../netty-handler-proxy-4.1.100.Final.jar.sha1     |  1 -
 .../netty-handler-proxy-4.1.101.Final.jar.sha1     |  1 +
 .../licenses/netty-resolver-4.1.100.Final.jar.sha1 |  1 -
 .../licenses/netty-resolver-4.1.101.Final.jar.sha1 |  1 +
 .../netty-transport-4.1.100.Final.jar.sha1         |  1 -
 .../netty-transport-4.1.101.Final.jar.sha1         |  1 +
 ...-transport-classes-epoll-4.1.100.Final.jar.sha1 |  1 -
 ...-transport-classes-epoll-4.1.101.Final.jar.sha1 |  1 +
 ...ative-epoll-4.1.100.Final-linux-x86_64.jar.sha1 |  1 -
 ...ative-epoll-4.1.101.Final-linux-x86_64.jar.sha1 |  1 +
 ...sport-native-unix-common-4.1.100.Final.jar.sha1 |  1 -
 ...sport-native-unix-common-4.1.101.Final.jar.sha1 |  1 +
 solr/server/build.gradle                           |  4 +-
 versions.lock                                      | 74 +++++++++++-----------
 versions.props                                     |  8 +--
 79 files changed, 82 insertions(+), 80 deletions(-)
 delete mode 100644 solr/licenses/commons-compress-1.24.0.jar.sha1
 create mode 100644 solr/licenses/commons-compress-1.25.0.jar.sha1
 delete mode 100644 solr/licenses/commons-lang3-3.13.0.jar.sha1
 create mode 100644 solr/licenses/commons-lang3-3.14.0.jar.sha1
 delete mode 100644 solr/licenses/http2-client-10.0.17.jar.sha1
 create mode 100644 solr/licenses/http2-client-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/http2-common-10.0.17.jar.sha1
 create mode 100644 solr/licenses/http2-common-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/http2-hpack-10.0.17.jar.sha1
 create mode 100644 solr/licenses/http2-hpack-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
 create mode 100644 solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/http2-server-10.0.17.jar.sha1
 create mode 100644 solr/licenses/http2-server-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-client-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-client-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-deploy-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-deploy-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-http-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-http-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-io-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-io-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-jmx-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-jmx-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-rewrite-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-rewrite-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-security-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-security-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-server-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-server-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlet-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-servlet-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlets-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-servlets-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
 create mode 100644 solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-util-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-webapp-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-webapp-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/jetty-xml-10.0.17.jar.sha1
 create mode 100644 solr/licenses/jetty-xml-10.0.18.jar.sha1
 delete mode 100644 solr/licenses/netty-buffer-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-http2-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-socks-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-socks-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-proxy-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.100.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1


(solr) 01/04: Update org.eclipse.jetty*:* to v10.0.18 (#2065)

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9772b62ea5b668670fe2e303d806d8760e186b89
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Dec 8 16:15:26 2023 +0100

    Update org.eclipse.jetty*:* to v10.0.18 (#2065)
    
    * Exclude org.awaitility:awaitility which should be test scope
    
    ---------
    
    Co-authored-by: Jan Høydahl <ja...@apache.org>
    (cherry picked from commit 1160212892557c9fdbcfef84d1a5bd48d448cc09)
---
 solr/licenses/awaitility-4.2.0.jar.sha1            |  1 +
 solr/licenses/http2-client-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-client-10.0.18.jar.sha1        |  1 +
 solr/licenses/http2-common-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-common-10.0.18.jar.sha1        |  1 +
 solr/licenses/http2-hpack-10.0.17.jar.sha1         |  1 -
 solr/licenses/http2-hpack-10.0.18.jar.sha1         |  1 +
 .../http2-http-client-transport-10.0.17.jar.sha1   |  1 -
 .../http2-http-client-transport-10.0.18.jar.sha1   |  1 +
 solr/licenses/http2-server-10.0.17.jar.sha1        |  1 -
 solr/licenses/http2-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-alpn-client-10.0.17.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-client-10.0.18.jar.sha1   |  1 +
 .../jetty-alpn-java-client-10.0.17.jar.sha1        |  1 -
 .../jetty-alpn-java-client-10.0.18.jar.sha1        |  1 +
 .../jetty-alpn-java-server-10.0.17.jar.sha1        |  1 -
 .../jetty-alpn-java-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-alpn-server-10.0.17.jar.sha1   |  1 -
 solr/licenses/jetty-alpn-server-10.0.18.jar.sha1   |  1 +
 solr/licenses/jetty-client-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-client-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-deploy-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-deploy-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-http-10.0.17.jar.sha1          |  1 -
 solr/licenses/jetty-http-10.0.18.jar.sha1          |  1 +
 solr/licenses/jetty-io-10.0.17.jar.sha1            |  1 -
 solr/licenses/jetty-io-10.0.18.jar.sha1            |  1 +
 solr/licenses/jetty-jmx-10.0.17.jar.sha1           |  1 -
 solr/licenses/jetty-jmx-10.0.18.jar.sha1           |  1 +
 solr/licenses/jetty-rewrite-10.0.17.jar.sha1       |  1 -
 solr/licenses/jetty-rewrite-10.0.18.jar.sha1       |  1 +
 solr/licenses/jetty-security-10.0.17.jar.sha1      |  1 -
 solr/licenses/jetty-security-10.0.18.jar.sha1      |  1 +
 solr/licenses/jetty-server-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-server-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-servlet-10.0.17.jar.sha1       |  1 -
 solr/licenses/jetty-servlet-10.0.18.jar.sha1       |  1 +
 solr/licenses/jetty-servlets-10.0.17.jar.sha1      |  1 -
 solr/licenses/jetty-servlets-10.0.18.jar.sha1      |  1 +
 solr/licenses/jetty-start-10.0.17-shaded.jar.sha1  |  1 -
 solr/licenses/jetty-start-10.0.18-shaded.jar.sha1  |  1 +
 solr/licenses/jetty-util-10.0.17.jar.sha1          |  1 -
 solr/licenses/jetty-util-10.0.18.jar.sha1          |  1 +
 solr/licenses/jetty-webapp-10.0.17.jar.sha1        |  1 -
 solr/licenses/jetty-webapp-10.0.18.jar.sha1        |  1 +
 solr/licenses/jetty-xml-10.0.17.jar.sha1           |  1 -
 solr/licenses/jetty-xml-10.0.18.jar.sha1           |  1 +
 solr/server/build.gradle                           |  4 +-
 versions.lock                                      | 44 +++++++++++-----------
 versions.props                                     |  2 +-
 50 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/solr/licenses/awaitility-4.2.0.jar.sha1 b/solr/licenses/awaitility-4.2.0.jar.sha1
new file mode 100644
index 00000000000..cf7cb7c5062
--- /dev/null
+++ b/solr/licenses/awaitility-4.2.0.jar.sha1
@@ -0,0 +1 @@
+2c39784846001a9cffd6c6b89c78de62c0d80fb8
diff --git a/solr/licenses/http2-client-10.0.17.jar.sha1 b/solr/licenses/http2-client-10.0.17.jar.sha1
deleted file mode 100644
index 1e3c27ca220..00000000000
--- a/solr/licenses/http2-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7eede462d4d92a175f27e2249fc4592775968850
diff --git a/solr/licenses/http2-client-10.0.18.jar.sha1 b/solr/licenses/http2-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..836b7d7fe68
--- /dev/null
+++ b/solr/licenses/http2-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+17601499bef7f7bc0227f182b019ff771d3d8460
diff --git a/solr/licenses/http2-common-10.0.17.jar.sha1 b/solr/licenses/http2-common-10.0.17.jar.sha1
deleted file mode 100644
index c8785fb5dec..00000000000
--- a/solr/licenses/http2-common-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cec33f2a1c5ffea2a3a213d9e92886320ee5d282
diff --git a/solr/licenses/http2-common-10.0.18.jar.sha1 b/solr/licenses/http2-common-10.0.18.jar.sha1
new file mode 100644
index 00000000000..442ed998e94
--- /dev/null
+++ b/solr/licenses/http2-common-10.0.18.jar.sha1
@@ -0,0 +1 @@
+6ef1f232620fb6269938620720a676bebb1c2c56
diff --git a/solr/licenses/http2-hpack-10.0.17.jar.sha1 b/solr/licenses/http2-hpack-10.0.17.jar.sha1
deleted file mode 100644
index d9f1ab595f6..00000000000
--- a/solr/licenses/http2-hpack-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca97ff8cde1f89533f14b5032dbd24678a9423b8
diff --git a/solr/licenses/http2-hpack-10.0.18.jar.sha1 b/solr/licenses/http2-hpack-10.0.18.jar.sha1
new file mode 100644
index 00000000000..052882a79ec
--- /dev/null
+++ b/solr/licenses/http2-hpack-10.0.18.jar.sha1
@@ -0,0 +1 @@
+c9a7fbeababa279957d6262e66400ad146e8912c
diff --git a/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
deleted file mode 100644
index 7f6935b4dc6..00000000000
--- a/solr/licenses/http2-http-client-transport-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4713b42ba819e9f049c7ca2fb4653ed3261cb0a7
diff --git a/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
new file mode 100644
index 00000000000..a8bfe7f5244
--- /dev/null
+++ b/solr/licenses/http2-http-client-transport-10.0.18.jar.sha1
@@ -0,0 +1 @@
+474fa9f4f7d7a57dd518287ca9e8c79b0f3290cd
diff --git a/solr/licenses/http2-server-10.0.17.jar.sha1 b/solr/licenses/http2-server-10.0.17.jar.sha1
deleted file mode 100644
index 53a9b01317f..00000000000
--- a/solr/licenses/http2-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-998535c492d462119246d141b19fdb511d832151
diff --git a/solr/licenses/http2-server-10.0.18.jar.sha1 b/solr/licenses/http2-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..b348f79c4d4
--- /dev/null
+++ b/solr/licenses/http2-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+12bea06cd5f8755995dba40fd3baf3b6ab2d3603
diff --git a/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
deleted file mode 100644
index 96d4e0656be..00000000000
--- a/solr/licenses/jetty-alpn-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-075e2ddf9d1331b3cf5ac9ede986f8e35117b71b
diff --git a/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..12aa54b6b09
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+6e1aed65b6023daf45527e42da4f551d9d343580
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
deleted file mode 100644
index a4621485456..00000000000
--- a/solr/licenses/jetty-alpn-java-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e32fac7d11c0326fdecf1b505ba4a31413ab9ee1
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..71a1bb70a2c
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+44771cb784888db79c15b391f516d4d3c13327b5
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
deleted file mode 100644
index b7a59671dbe..00000000000
--- a/solr/licenses/jetty-alpn-java-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab96075253b83f217b525984972b7446e6071e88
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..d8d85c292bd
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+d5a2819a161fed07e4e52cc5feb10cbc9fa8f65d
diff --git a/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
deleted file mode 100644
index 2a4fa808172..00000000000
--- a/solr/licenses/jetty-alpn-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9472cc4aff9e4e5f6db1ac14a7a4f7682f92075
diff --git a/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..eaad4b434f9
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+bf443bd65d360ad0a3e5537651356d0adf81fb15
diff --git a/solr/licenses/jetty-client-10.0.17.jar.sha1 b/solr/licenses/jetty-client-10.0.17.jar.sha1
deleted file mode 100644
index 7811a59b9a5..00000000000
--- a/solr/licenses/jetty-client-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc3857133910dbf42e45311b6f9e6a338bd59e89
diff --git a/solr/licenses/jetty-client-10.0.18.jar.sha1 b/solr/licenses/jetty-client-10.0.18.jar.sha1
new file mode 100644
index 00000000000..ed7c1d24dc7
--- /dev/null
+++ b/solr/licenses/jetty-client-10.0.18.jar.sha1
@@ -0,0 +1 @@
+0b85a78ef43d35c65cf73d5978fe7ceb638e1456
diff --git a/solr/licenses/jetty-deploy-10.0.17.jar.sha1 b/solr/licenses/jetty-deploy-10.0.17.jar.sha1
deleted file mode 100644
index c0fbb1fc737..00000000000
--- a/solr/licenses/jetty-deploy-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7927d39b80296d343ad471756ce35f19dc206f8
diff --git a/solr/licenses/jetty-deploy-10.0.18.jar.sha1 b/solr/licenses/jetty-deploy-10.0.18.jar.sha1
new file mode 100644
index 00000000000..7de6e915423
--- /dev/null
+++ b/solr/licenses/jetty-deploy-10.0.18.jar.sha1
@@ -0,0 +1 @@
+f3082fe22cb2976cff445e8048e97308c5c6b01b
diff --git a/solr/licenses/jetty-http-10.0.17.jar.sha1 b/solr/licenses/jetty-http-10.0.17.jar.sha1
deleted file mode 100644
index ea2e057a821..00000000000
--- a/solr/licenses/jetty-http-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b684e63e9cc0f2b7bcc7917c83cc9e1a952b76ac
diff --git a/solr/licenses/jetty-http-10.0.18.jar.sha1 b/solr/licenses/jetty-http-10.0.18.jar.sha1
new file mode 100644
index 00000000000..3a73c28be0c
--- /dev/null
+++ b/solr/licenses/jetty-http-10.0.18.jar.sha1
@@ -0,0 +1 @@
+9b7f2b580bdcf2a9c27168eac58276c7e6e99ccf
diff --git a/solr/licenses/jetty-io-10.0.17.jar.sha1 b/solr/licenses/jetty-io-10.0.17.jar.sha1
deleted file mode 100644
index 81d88505fd0..00000000000
--- a/solr/licenses/jetty-io-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a57b2fb256166eda798edeffbe4a17c4dd7f7022
diff --git a/solr/licenses/jetty-io-10.0.18.jar.sha1 b/solr/licenses/jetty-io-10.0.18.jar.sha1
new file mode 100644
index 00000000000..acdcc403b60
--- /dev/null
+++ b/solr/licenses/jetty-io-10.0.18.jar.sha1
@@ -0,0 +1 @@
+a622527216b27f72744daf849aa2fa0c6f3db131
diff --git a/solr/licenses/jetty-jmx-10.0.17.jar.sha1 b/solr/licenses/jetty-jmx-10.0.17.jar.sha1
deleted file mode 100644
index 4fce84fc7a6..00000000000
--- a/solr/licenses/jetty-jmx-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbcac3bd8cf03f4f75d86c9027ec5f6adf3c137b
diff --git a/solr/licenses/jetty-jmx-10.0.18.jar.sha1 b/solr/licenses/jetty-jmx-10.0.18.jar.sha1
new file mode 100644
index 00000000000..b8d18054183
--- /dev/null
+++ b/solr/licenses/jetty-jmx-10.0.18.jar.sha1
@@ -0,0 +1 @@
+428b7d5e2981eb94595637ba730c0c30b73ed4ae
diff --git a/solr/licenses/jetty-rewrite-10.0.17.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.17.jar.sha1
deleted file mode 100644
index 89c5d37f4e4..00000000000
--- a/solr/licenses/jetty-rewrite-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cd4d6fb5f6038c2cb92bcebee228ee54714b442
diff --git a/solr/licenses/jetty-rewrite-10.0.18.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.18.jar.sha1
new file mode 100644
index 00000000000..37aede7e65a
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-10.0.18.jar.sha1
@@ -0,0 +1 @@
+c9093cd0e77f6f991e38c8f97ff40ff56794a8d2
diff --git a/solr/licenses/jetty-security-10.0.17.jar.sha1 b/solr/licenses/jetty-security-10.0.17.jar.sha1
deleted file mode 100644
index 560e32f6a72..00000000000
--- a/solr/licenses/jetty-security-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e802a2ad37f38fbd0ea44f878079f891a57902ea
diff --git a/solr/licenses/jetty-security-10.0.18.jar.sha1 b/solr/licenses/jetty-security-10.0.18.jar.sha1
new file mode 100644
index 00000000000..160b8c9c2c5
--- /dev/null
+++ b/solr/licenses/jetty-security-10.0.18.jar.sha1
@@ -0,0 +1 @@
+399601ef4e649b3be6f9fd6176b208914f9fd171
diff --git a/solr/licenses/jetty-server-10.0.17.jar.sha1 b/solr/licenses/jetty-server-10.0.17.jar.sha1
deleted file mode 100644
index 71f3b913b0c..00000000000
--- a/solr/licenses/jetty-server-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8cce6c62ef95e5f8cbd0775f708b0423a7166da6
diff --git a/solr/licenses/jetty-server-10.0.18.jar.sha1 b/solr/licenses/jetty-server-10.0.18.jar.sha1
new file mode 100644
index 00000000000..9b6c6bae967
--- /dev/null
+++ b/solr/licenses/jetty-server-10.0.18.jar.sha1
@@ -0,0 +1 @@
+b59b7df009bbb85be455e42524e9a11944fb3ba1
diff --git a/solr/licenses/jetty-servlet-10.0.17.jar.sha1 b/solr/licenses/jetty-servlet-10.0.17.jar.sha1
deleted file mode 100644
index 894d01076c9..00000000000
--- a/solr/licenses/jetty-servlet-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-168984188c99004702cd9705728e54e1b441f8cd
diff --git a/solr/licenses/jetty-servlet-10.0.18.jar.sha1 b/solr/licenses/jetty-servlet-10.0.18.jar.sha1
new file mode 100644
index 00000000000..8cec2353c08
--- /dev/null
+++ b/solr/licenses/jetty-servlet-10.0.18.jar.sha1
@@ -0,0 +1 @@
+cc0acde71a3b04db8fcde2ad60a00dfd4effab23
diff --git a/solr/licenses/jetty-servlets-10.0.17.jar.sha1 b/solr/licenses/jetty-servlets-10.0.17.jar.sha1
deleted file mode 100644
index ed1e8644873..00000000000
--- a/solr/licenses/jetty-servlets-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bfe572f5f0ad314e2dbfddbc44abe8e619034997
diff --git a/solr/licenses/jetty-servlets-10.0.18.jar.sha1 b/solr/licenses/jetty-servlets-10.0.18.jar.sha1
new file mode 100644
index 00000000000..0e1c52afb44
--- /dev/null
+++ b/solr/licenses/jetty-servlets-10.0.18.jar.sha1
@@ -0,0 +1 @@
+828eafeda362ac71e2ba7a569ed938d1b80daede
diff --git a/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
deleted file mode 100644
index b2f28f33937..00000000000
--- a/solr/licenses/jetty-start-10.0.17-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee571948efc88538f4ecf21824d43e2ffa636592
diff --git a/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
new file mode 100644
index 00000000000..ff8354c62ac
--- /dev/null
+++ b/solr/licenses/jetty-start-10.0.18-shaded.jar.sha1
@@ -0,0 +1 @@
+1c6435ac9907d394368c734fa0da8d74d8247d60
diff --git a/solr/licenses/jetty-util-10.0.17.jar.sha1 b/solr/licenses/jetty-util-10.0.17.jar.sha1
deleted file mode 100644
index b2c72469369..00000000000
--- a/solr/licenses/jetty-util-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2d8f2579b230660cca19410e61ea22635564f362
diff --git a/solr/licenses/jetty-util-10.0.18.jar.sha1 b/solr/licenses/jetty-util-10.0.18.jar.sha1
new file mode 100644
index 00000000000..cdd31e6c2ea
--- /dev/null
+++ b/solr/licenses/jetty-util-10.0.18.jar.sha1
@@ -0,0 +1 @@
+1ee6a71c2249d5596ba578f015121c99b2b7591a
diff --git a/solr/licenses/jetty-webapp-10.0.17.jar.sha1 b/solr/licenses/jetty-webapp-10.0.17.jar.sha1
deleted file mode 100644
index 5dd1dc06018..00000000000
--- a/solr/licenses/jetty-webapp-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0de2baa32c8ecf3217182e8e176f582fef9ca46f
diff --git a/solr/licenses/jetty-webapp-10.0.18.jar.sha1 b/solr/licenses/jetty-webapp-10.0.18.jar.sha1
new file mode 100644
index 00000000000..ad24994e958
--- /dev/null
+++ b/solr/licenses/jetty-webapp-10.0.18.jar.sha1
@@ -0,0 +1 @@
+5b70383521a3a02347d765071e120ab5adaf7e96
diff --git a/solr/licenses/jetty-xml-10.0.17.jar.sha1 b/solr/licenses/jetty-xml-10.0.17.jar.sha1
deleted file mode 100644
index 8942be24c99..00000000000
--- a/solr/licenses/jetty-xml-10.0.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c56a0c61b36999d83343cc4bf36c26f2ba9477b
diff --git a/solr/licenses/jetty-xml-10.0.18.jar.sha1 b/solr/licenses/jetty-xml-10.0.18.jar.sha1
new file mode 100644
index 00000000000..e41d38dc953
--- /dev/null
+++ b/solr/licenses/jetty-xml-10.0.18.jar.sha1
@@ -0,0 +1 @@
+42b808df0fe90dd428e3ea936e87085e08d97289
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index 68a150d5f97..d0b722d63f6 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -37,7 +37,9 @@ configurations {
 }
 
 dependencies {
-  serverLib 'org.eclipse.jetty:jetty-deploy'
+  serverLib('org.eclipse.jetty:jetty-deploy', {
+    exclude group: "org.awaitility", module: "awaitility"
+  })
   serverLib 'org.eclipse.jetty:jetty-http'
   serverLib 'org.eclipse.jetty:jetty-io'
   serverLib 'org.eclipse.jetty:jetty-jmx'
diff --git a/versions.lock b/versions.lock
index 1fcd0aba821..be79d9fddf8 100644
--- a/versions.lock
+++ b/versions.lock
@@ -282,28 +282,28 @@ org.codehaus.janino:janino:3.1.9 (1 constraints: 650dbd2c)
 org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 37155caf)
 org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
-org.eclipse.jetty:jetty-alpn-client:10.0.17 (3 constraints: f72e2e61)
-org.eclipse.jetty:jetty-alpn-java-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty:jetty-alpn-java-server:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-alpn-server:10.0.17 (2 constraints: f9167949)
-org.eclipse.jetty:jetty-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty:jetty-deploy:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-http:10.0.17 (6 constraints: 824feb91)
-org.eclipse.jetty:jetty-io:10.0.17 (9 constraints: c77dc8ef)
-org.eclipse.jetty:jetty-jmx:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-rewrite:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-security:10.0.17 (2 constraints: c0137379)
-org.eclipse.jetty:jetty-server:10.0.17 (7 constraints: ea6d9a2c)
-org.eclipse.jetty:jetty-servlet:10.0.17 (2 constraints: 3a139d61)
-org.eclipse.jetty:jetty-servlets:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty:jetty-util:10.0.17 (9 constraints: c181f79f)
-org.eclipse.jetty:jetty-webapp:10.0.17 (2 constraints: 48132562)
-org.eclipse.jetty:jetty-xml:10.0.17 (3 constraints: 1721b2bb)
-org.eclipse.jetty.http2:http2-client:10.0.17 (2 constraints: 231b136f)
-org.eclipse.jetty.http2:http2-common:10.0.17 (3 constraints: e5240263)
-org.eclipse.jetty.http2:http2-hpack:10.0.17 (2 constraints: 2615cae0)
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.17 (1 constraints: 6b059340)
-org.eclipse.jetty.http2:http2-server:10.0.17 (1 constraints: 6b059340)
+org.eclipse.jetty:jetty-alpn-client:10.0.18 (3 constraints: fa2eb861)
+org.eclipse.jetty:jetty-alpn-java-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty:jetty-alpn-java-server:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-alpn-server:10.0.18 (2 constraints: fb16ae49)
+org.eclipse.jetty:jetty-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty:jetty-deploy:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-http:10.0.18 (6 constraints: 874fd493)
+org.eclipse.jetty:jetty-io:10.0.18 (9 constraints: cf7dbcf4)
+org.eclipse.jetty:jetty-jmx:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-rewrite:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-security:10.0.18 (2 constraints: c2139f79)
+org.eclipse.jetty:jetty-server:10.0.18 (7 constraints: ef6d1930)
+org.eclipse.jetty:jetty-servlet:10.0.18 (2 constraints: 3c13c861)
+org.eclipse.jetty:jetty-servlets:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty:jetty-util:10.0.18 (9 constraints: c881b8a5)
+org.eclipse.jetty:jetty-webapp:10.0.18 (2 constraints: 4a135062)
+org.eclipse.jetty:jetty-xml:10.0.18 (3 constraints: 1a2130bc)
+org.eclipse.jetty.http2:http2-client:10.0.18 (2 constraints: 251b536f)
+org.eclipse.jetty.http2:http2-common:10.0.18 (3 constraints: e8249263)
+org.eclipse.jetty.http2:http2-hpack:10.0.18 (2 constraints: 2815fbe0)
+org.eclipse.jetty.http2:http2-http-client-transport:10.0.18 (1 constraints: 6c059440)
+org.eclipse.jetty.http2:http2-server:10.0.18 (1 constraints: 6c059440)
 org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf)
 org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9)
 org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9)
diff --git a/versions.props b/versions.props
index 8d72cbdaf33..f5addabd3ae 100644
--- a/versions.props
+++ b/versions.props
@@ -56,7 +56,7 @@ org.apache.zookeeper:*=3.9.1
 org.bitbucket.b_c:jose4j=0.9.3
 org.carrot2:carrot2-core=4.5.1
 org.codehaus.woodstox:stax2-api=4.2.2
-org.eclipse.jetty*:*=10.0.17
+org.eclipse.jetty*:*=10.0.18
 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6
 org.glassfish.hk2*:*=2.6.1
 org.glassfish.jersey*:*=2.39.1


(solr) 04/04: Update dependency org.apache.commons:commons-compress to v1.25.0 (#2138)

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f45a7ed2d632c696befbaa0bbb70e0380c0e69ff
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Dec 8 21:44:27 2023 +0100

    Update dependency org.apache.commons:commons-compress to v1.25.0 (#2138)
    
    (cherry picked from commit aca9feb4cbfa985e20f7db01bf76a45dce50f20c)
---
 solr/licenses/commons-compress-1.24.0.jar.sha1 | 1 -
 solr/licenses/commons-compress-1.25.0.jar.sha1 | 1 +
 versions.lock                                  | 2 +-
 versions.props                                 | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/licenses/commons-compress-1.24.0.jar.sha1 b/solr/licenses/commons-compress-1.24.0.jar.sha1
deleted file mode 100644
index f770e229028..00000000000
--- a/solr/licenses/commons-compress-1.24.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4b1b5a3d9573b2970fddab236102c0a4d27d35e
diff --git a/solr/licenses/commons-compress-1.25.0.jar.sha1 b/solr/licenses/commons-compress-1.25.0.jar.sha1
new file mode 100644
index 00000000000..5c4ed2f60d6
--- /dev/null
+++ b/solr/licenses/commons-compress-1.25.0.jar.sha1
@@ -0,0 +1 @@
+9d35aec423da6c8a7f93d7e9e1c6b1d9fe14bb5e
diff --git a/versions.lock b/versions.lock
index f41723cb518..8da238160a1 100644
--- a/versions.lock
+++ b/versions.lock
@@ -175,7 +175,7 @@ org.apache.calcite:calcite-linq4j:1.35.0 (2 constraints: cb12e64b)
 org.apache.calcite.avatica:avatica-core:1.23.0 (3 constraints: fb20cdcb)
 org.apache.calcite.avatica:avatica-metrics:1.23.0 (1 constraints: 991049c4)
 org.apache.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
-org.apache.commons:commons-compress:1.24.0 (3 constraints: fe1b1fd2)
+org.apache.commons:commons-compress:1.25.0 (3 constraints: ff1b66d2)
 org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
diff --git a/versions.props b/versions.props
index 690b13d5407..eff75bbf19e 100644
--- a/versions.props
+++ b/versions.props
@@ -36,7 +36,7 @@ no.nav.security:mock-oauth2-server=0.5.10
 org.apache.calcite.avatica:avatica-core=1.23.0
 org.apache.calcite:*=1.35.0
 org.apache.commons:commons-collections4=4.4
-org.apache.commons:commons-compress=1.24.0
+org.apache.commons:commons-compress=1.25.0
 org.apache.commons:commons-configuration2=2.9.0
 org.apache.commons:commons-exec=1.3
 org.apache.commons:commons-lang3=3.14.0


(solr) 02/04: Update io.netty:* to v4.1.101.Final (#2134)

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 3597acc9f83bb0d7ad657e675c91fc1eeb8fd4c7
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Dec 8 21:42:06 2023 +0100

    Update io.netty:* to v4.1.101.Final (#2134)
    
    (cherry picked from commit 4402d2d4845ff249e6cf05d09d50e19c23193cd8)
---
 solr/licenses/awaitility-4.2.0.jar.sha1            |  1 -
 solr/licenses/netty-buffer-4.1.100.Final.jar.sha1  |  1 -
 solr/licenses/netty-buffer-4.1.101.Final.jar.sha1  |  1 +
 solr/licenses/netty-codec-4.1.100.Final.jar.sha1   |  1 -
 solr/licenses/netty-codec-4.1.101.Final.jar.sha1   |  1 +
 .../netty-codec-http-4.1.100.Final.jar.sha1        |  1 -
 .../netty-codec-http-4.1.101.Final.jar.sha1        |  1 +
 .../netty-codec-http2-4.1.100.Final.jar.sha1       |  1 -
 .../netty-codec-http2-4.1.101.Final.jar.sha1       |  1 +
 .../netty-codec-socks-4.1.100.Final.jar.sha1       |  1 -
 .../netty-codec-socks-4.1.101.Final.jar.sha1       |  1 +
 solr/licenses/netty-common-4.1.100.Final.jar.sha1  |  1 -
 solr/licenses/netty-common-4.1.101.Final.jar.sha1  |  1 +
 solr/licenses/netty-handler-4.1.100.Final.jar.sha1 |  1 -
 solr/licenses/netty-handler-4.1.101.Final.jar.sha1 |  1 +
 .../netty-handler-proxy-4.1.100.Final.jar.sha1     |  1 -
 .../netty-handler-proxy-4.1.101.Final.jar.sha1     |  1 +
 .../licenses/netty-resolver-4.1.100.Final.jar.sha1 |  1 -
 .../licenses/netty-resolver-4.1.101.Final.jar.sha1 |  1 +
 .../netty-transport-4.1.100.Final.jar.sha1         |  1 -
 .../netty-transport-4.1.101.Final.jar.sha1         |  1 +
 ...-transport-classes-epoll-4.1.100.Final.jar.sha1 |  1 -
 ...-transport-classes-epoll-4.1.101.Final.jar.sha1 |  1 +
 ...ative-epoll-4.1.100.Final-linux-x86_64.jar.sha1 |  1 -
 ...ative-epoll-4.1.101.Final-linux-x86_64.jar.sha1 |  1 +
 ...sport-native-unix-common-4.1.100.Final.jar.sha1 |  1 -
 ...sport-native-unix-common-4.1.101.Final.jar.sha1 |  1 +
 versions.lock                                      | 26 +++++++++++-----------
 versions.props                                     |  2 +-
 29 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/solr/licenses/awaitility-4.2.0.jar.sha1 b/solr/licenses/awaitility-4.2.0.jar.sha1
deleted file mode 100644
index cf7cb7c5062..00000000000
--- a/solr/licenses/awaitility-4.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2c39784846001a9cffd6c6b89c78de62c0d80fb8
diff --git a/solr/licenses/netty-buffer-4.1.100.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.100.Final.jar.sha1
deleted file mode 100644
index aaa2e6b18a8..00000000000
--- a/solr/licenses/netty-buffer-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-39b05d2d4027971bf99111a9be1d7035a116bb55
diff --git a/solr/licenses/netty-buffer-4.1.101.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..d8833d7a697
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+a4d94fd6cdf7a37b15237e32434afd6b955cc591
diff --git a/solr/licenses/netty-codec-4.1.100.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.100.Final.jar.sha1
deleted file mode 100644
index d093fc9eae4..00000000000
--- a/solr/licenses/netty-codec-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c3c71e7cf3b8ce3bfc9fa52a524b9ca7ddf259c
diff --git a/solr/licenses/netty-codec-4.1.101.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..d84df5d741f
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+642523c57c4be15b8b461be7b1532262d193bbb3
diff --git a/solr/licenses/netty-codec-http-4.1.100.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.100.Final.jar.sha1
deleted file mode 100644
index f21057a5672..00000000000
--- a/solr/licenses/netty-codec-http-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-992623e7d8f2d96e41faf1687bb963f5433e3517
diff --git a/solr/licenses/netty-codec-http-4.1.101.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..8210a91f888
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+c648f863b301e3fc62d0de098ec61be7628b8ea2
diff --git a/solr/licenses/netty-codec-http2-4.1.100.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.100.Final.jar.sha1
deleted file mode 100644
index ae46145b95a..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbf1a430ea44dbdedbcde16b185cbb95f28d72c7
diff --git a/solr/licenses/netty-codec-http2-4.1.101.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..6fc88a0ccfa
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+40590da6c615b852384542051330e9fd51d4c4b1
diff --git a/solr/licenses/netty-codec-socks-4.1.100.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.100.Final.jar.sha1
deleted file mode 100644
index e6a722d13c2..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a9fbf4d64b08abed542eefd5f7aed4807edca56f
diff --git a/solr/licenses/netty-codec-socks-4.1.101.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..a3461af2dcb
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+cbaac9e2c2d7b86e4c1bda220cde49949c9bcaee
diff --git a/solr/licenses/netty-common-4.1.100.Final.jar.sha1 b/solr/licenses/netty-common-4.1.100.Final.jar.sha1
deleted file mode 100644
index 9bbeb4b8200..00000000000
--- a/solr/licenses/netty-common-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-847f942381145de23f21c836d05b0677474271d3
diff --git a/solr/licenses/netty-common-4.1.101.Final.jar.sha1 b/solr/licenses/netty-common-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..d418fcd1e53
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+bdb16e4d308b5757123decc886896815d1daf7a3
diff --git a/solr/licenses/netty-handler-4.1.100.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.100.Final.jar.sha1
deleted file mode 100644
index aed18d365b5..00000000000
--- a/solr/licenses/netty-handler-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c0acdb8bb73647ebb3847ac2d503d53d72c02b4
diff --git a/solr/licenses/netty-handler-4.1.101.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..f6cce9cd5c8
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+7800aea949bf95f63df73166d144e49405b279dd
diff --git a/solr/licenses/netty-handler-proxy-4.1.100.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.100.Final.jar.sha1
deleted file mode 100644
index 399d711d28b..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af3cf676eed30184215426ecf0f0dde15555ea9c
diff --git a/solr/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..3bd67dbb8f0
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+c198ee61abba7ae6b3cb6b1033f04fb0ae79d512
diff --git a/solr/licenses/netty-resolver-4.1.100.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.100.Final.jar.sha1
deleted file mode 100644
index 121e17de50c..00000000000
--- a/solr/licenses/netty-resolver-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe62f9ccd41b8660d07639dbbab8ae1edd6f2720
diff --git a/solr/licenses/netty-resolver-4.1.101.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..ba86b2db156
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+5e7eddfa4dfffcbd375d265d1fd08297df94f82f
diff --git a/solr/licenses/netty-transport-4.1.100.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.100.Final.jar.sha1
deleted file mode 100644
index cc4f4c89dec..00000000000
--- a/solr/licenses/netty-transport-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6620fbfb47667a5eb6050e35c7b4c88000bcd77f
diff --git a/solr/licenses/netty-transport-4.1.101.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..91f5e6f7e56
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+0b36cc2337b4a4135df7ee2f2d77431c3b541dc5
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.100.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.100.Final.jar.sha1
deleted file mode 100644
index f26e13ab47d..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-78489936ca1d91483e34a31d04a3b0812386eb39
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..befa0da6099
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+f86303830ab65680e45cabb531e37078ecc6791e
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar.sha1
deleted file mode 100644
index 9167d09e679..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d83003b8eac838e4bc3f7662a22f9f2d879c0fe4
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar.sha1
new file mode 100644
index 00000000000..a0b9adf2f21
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+760f4aa3b9576f446d39b3886f4862d67428a1be
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.100.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.100.Final.jar.sha1
deleted file mode 100644
index 421d39abf8f..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.100.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-648ff5571022dbfa6789122e3872477bbf67fa7b
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
new file mode 100644
index 00000000000..e0d43148002
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
@@ -0,0 +1 @@
+d0697ef1d71c6111a1b18a387fa985fd6398ace2
diff --git a/versions.lock b/versions.lock
index be79d9fddf8..859888629a5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -111,21 +111,21 @@ io.grpc:grpc-util:1.59.0 (3 constraints: 301a697d)
 io.grpc:grpc-xds:1.59.0 (1 constraints: 211012a6)
 io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
 io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
-io.netty:netty-buffer:4.1.100.Final (10 constraints: 149b2024)
-io.netty:netty-codec:4.1.100.Final (5 constraints: 1446fa84)
-io.netty:netty-codec-http:4.1.100.Final (3 constraints: be24283d)
-io.netty:netty-codec-http2:4.1.100.Final (1 constraints: ee0a9ccb)
-io.netty:netty-codec-socks:4.1.100.Final (1 constraints: 380f8f7a)
-io.netty:netty-common:4.1.100.Final (12 constraints: d4b4a541)
-io.netty:netty-handler:4.1.100.Final (3 constraints: b62b0a76)
-io.netty:netty-handler-proxy:4.1.100.Final (1 constraints: ee0a9ccb)
-io.netty:netty-resolver:4.1.100.Final (2 constraints: a01a785c)
+io.netty:netty-buffer:4.1.101.Final (10 constraints: 1e9b272d)
+io.netty:netty-codec:4.1.101.Final (5 constraints: 1946c786)
+io.netty:netty-codec-http:4.1.101.Final (3 constraints: c124c23d)
+io.netty:netty-codec-http2:4.1.101.Final (1 constraints: ee0a9ccb)
+io.netty:netty-codec-socks:4.1.101.Final (1 constraints: 390f967a)
+io.netty:netty-common:4.1.101.Final (12 constraints: e0b46f4e)
+io.netty:netty-handler:4.1.101.Final (3 constraints: b82b9f76)
+io.netty:netty-handler-proxy:4.1.101.Final (1 constraints: ee0a9ccb)
+io.netty:netty-resolver:4.1.101.Final (2 constraints: a21aaf5c)
 io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)
 io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)
-io.netty:netty-transport:4.1.100.Final (9 constraints: 3d8d8fa3)
-io.netty:netty-transport-classes-epoll:4.1.100.Final (1 constraints: d5127930)
-io.netty:netty-transport-native-epoll:4.1.100.Final (1 constraints: da0f128f)
-io.netty:netty-transport-native-unix-common:4.1.100.Final (4 constraints: c53d4729)
+io.netty:netty-transport:4.1.101.Final (9 constraints: 468df0aa)
+io.netty:netty-transport-classes-epoll:4.1.101.Final (1 constraints: d6128030)
+io.netty:netty-transport-native-epoll:4.1.101.Final (1 constraints: da0f128f)
+io.netty:netty-transport-native-unix-common:4.1.101.Final (4 constraints: c83dff29)
 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
 io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
 io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index f5addabd3ae..54e05a3183c 100644
--- a/versions.props
+++ b/versions.props
@@ -23,7 +23,7 @@ commons-io:commons-io=2.14.0
 io.dropwizard.metrics:*=4.2.21
 io.grpc:grpc-*=1.59.0
 io.jaegertracing:*=1.8.1
-io.netty:*=4.1.100.Final
+io.netty:*=4.1.101.Final
 io.opentelemetry:opentelemetry-bom=1.31.0
 io.opentracing:*=0.33.0
 io.prometheus:*=0.16.0


(solr) 03/04: Update dependency org.apache.commons:commons-lang3 to v3.14.0 (#2139)

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 8ac3e87810420c8ce277173ebc98ee240002d845
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Dec 8 21:43:15 2023 +0100

    Update dependency org.apache.commons:commons-lang3 to v3.14.0 (#2139)
    
    (cherry picked from commit cd41cd7c2375b1cba18e537cf493329e85dbaf0c)
---
 solr/licenses/commons-lang3-3.13.0.jar.sha1 | 1 -
 solr/licenses/commons-lang3-3.14.0.jar.sha1 | 1 +
 versions.lock                               | 2 +-
 versions.props                              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/licenses/commons-lang3-3.13.0.jar.sha1 b/solr/licenses/commons-lang3-3.13.0.jar.sha1
deleted file mode 100644
index e2d4d379fe0..00000000000
--- a/solr/licenses/commons-lang3-3.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7263237aa89c1f99b327197c41d0669707a462e
diff --git a/solr/licenses/commons-lang3-3.14.0.jar.sha1 b/solr/licenses/commons-lang3-3.14.0.jar.sha1
new file mode 100644
index 00000000000..578ae1135bf
--- /dev/null
+++ b/solr/licenses/commons-lang3-3.14.0.jar.sha1
@@ -0,0 +1 @@
+1ed471194b02f2c6cb734a0cd6f6f107c673afae
diff --git a/versions.lock b/versions.lock
index 859888629a5..f41723cb518 100644
--- a/versions.lock
+++ b/versions.lock
@@ -179,7 +179,7 @@ org.apache.commons:commons-compress:1.24.0 (3 constraints: fe1b1fd2)
 org.apache.commons:commons-configuration2:2.9.0 (1 constraints: 0d051036)
 org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.13.0 (5 constraints: 9c3eb936)
+org.apache.commons:commons-lang3:3.14.0 (5 constraints: 9d3e6437)
 org.apache.commons:commons-math3:3.6.1 (5 constraints: 57322799)
 org.apache.commons:commons-text:1.10.0 (1 constraints: d911adf8)
 org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
diff --git a/versions.props b/versions.props
index 54e05a3183c..690b13d5407 100644
--- a/versions.props
+++ b/versions.props
@@ -39,7 +39,7 @@ org.apache.commons:commons-collections4=4.4
 org.apache.commons:commons-compress=1.24.0
 org.apache.commons:commons-configuration2=2.9.0
 org.apache.commons:commons-exec=1.3
-org.apache.commons:commons-lang3=3.13.0
+org.apache.commons:commons-lang3=3.14.0
 org.apache.commons:commons-math3=3.6.1
 org.apache.curator:*=4.3.0
 org.apache.hadoop.thirdparty:*=1.1.1