Merge remote-tracking branch 'apache/main' into SOLR-17406/rebase-ver…

…sion-catalogs # Conflicts: # solr/modules/opentelemetry/build.gradle # versions.lock # versions.props
apache · Nov 9, 2024 · a763a69 · a763a69
2 parents 5824fdd + ee9a77f
commit a763a69
Show file tree

Hide file tree

Showing 35 changed files with 87 additions and 45 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -143,9 +143,9 @@ minSolrJJava = "17"
 mockito = "5.12.0"
 morethan-jmhreport = "0.9.0"
 navsecurity = "0.5.10"
-netty = "4.1.112.Final"
+netty = "4.1.114.Final"
 # @keep for version alignment
-netty-tcnative = "2.0.65.Final"
+netty-tcnative = "2.0.66.Final"
 nimbusds-josejwt = "9.30.2"
 nodegradle-node = "7.0.1"
 openapi = "7.6.0"

diff --git a/solr/licenses/netty-LICENSE-ASL.txt b/solr/licenses/netty-LICENSE-ASL.txt
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/solr/licenses/netty-NOTICE.txt b/solr/licenses/netty-NOTICE.txt
@@ -4,15 +4,15 @@
 
 Please visit the Netty web site for more information:
 
-  * http://netty.io/
+  * https://netty.io/
 
 Copyright 2014 The Netty Project
 
 The Netty Project licenses this file to you under the Apache License,
 version 2.0 (the "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at:
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -56,7 +56,7 @@ facade for Java, which can be obtained at:
   * LICENSE:
     * license/LICENSE.slf4j.txt (MIT License)
   * HOMEPAGE:
-    * http://www.slf4j.org/
+    * https://www.slf4j.org/
 
 This product contains a modified portion of 'Apache Harmony', an open source
 Java SE, which can be obtained at:
@@ -66,7 +66,7 @@ Java SE, which can be obtained at:
   * LICENSE:
     * license/LICENSE.harmony.txt (Apache License 2.0)
   * HOMEPAGE:
-    * http://archive.apache.org/dist/harmony/
+    * https://archive.apache.org/dist/harmony/
 
 This product contains a modified portion of 'jbzip2', a Java bzip2 compression
 and decompression library written by Matthew J. Francis. It can be obtained at:
@@ -125,6 +125,14 @@ and decompression library, which can be obtained at:
   * HOMEPAGE:
     * https://github.com/jponge/lzma-java
 
+This product optionally depends on 'zstd-jni', a zstd-jni Java compression
+and decompression library, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.zstd-jni.txt (BSD)
+  * HOMEPAGE:
+    * https://github.com/luben/zstd-jni
+
 This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
 and decompression library written by William Kinney. It can be obtained at:
 
@@ -148,7 +156,7 @@ equivalent functionality.  It can be obtained at:
   * LICENSE:
     * license/LICENSE.bouncycastle.txt (MIT License)
   * HOMEPAGE:
-    * http://www.bouncycastle.org/
+    * https://www.bouncycastle.org/
 
 This product optionally depends on 'Snappy', a compression library produced
 by Google Inc, which can be obtained at:
@@ -162,9 +170,9 @@ This product optionally depends on 'JBoss Marshalling', an alternative Java
 serialization API, which can be obtained at:
 
   * LICENSE:
-    * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
+    * license/LICENSE.jboss-marshalling.txt (Apache License 2.0)
   * HOMEPAGE:
-    * http://www.jboss.org/jbossmarshalling
+    * https://github.com/jboss-remoting/jboss-marshalling
 
 This product optionally depends on 'Caliper', Google's micro-
 benchmarking framework, which can be obtained at:
@@ -180,23 +188,23 @@ framework, which can be obtained at:
   * LICENSE:
     * license/LICENSE.commons-logging.txt (Apache License 2.0)
   * HOMEPAGE:
-    * http://commons.apache.org/logging/
+    * https://commons.apache.org/logging/
 
 This product optionally depends on 'Apache Log4J', a logging framework, which
 can be obtained at:
 
   * LICENSE:
     * license/LICENSE.log4j.txt (Apache License 2.0)
   * HOMEPAGE:
-    * http://logging.apache.org/log4j/
+    * https://logging.apache.org/log4j/
 
 This product optionally depends on 'Aalto XML', an ultra-high performance
 non-blocking XML processor, which can be obtained at:
 
   * LICENSE:
     * license/LICENSE.aalto-xml.txt (Apache License 2.0)
   * HOMEPAGE:
-    * http://wiki.fasterxml.com/AaltoHome
+    * https://wiki.fasterxml.com/AaltoHome
 
 This product contains a modified version of 'HPACK', a Java implementation of
 the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
@@ -206,6 +214,22 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
   * HOMEPAGE:
     * https://github.com/twitter/hpack
 
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.hyper-hpack.txt (MIT License)
+  * HOMEPAGE:
+    * https://github.com/python-hyper/hpack/
+
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.nghttp2-hpack.txt (MIT License)
+  * HOMEPAGE:
+    * https://github.com/nghttp2/nghttp2/
+
 This product contains a modified portion of 'Apache Commons Lang', a Java library
 provides utilities for the java.lang API, which can be obtained at:
 
@@ -221,3 +245,20 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi
     * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
   * HOMEPAGE:
     * https://github.com/takari/maven-wrapper
+
+This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS.
+This private header is also used by Apple's open source
+ mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
+
+ * LICENSE:
+    * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0)
+  * HOMEPAGE:
+    * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
+
+This product optionally depends on 'Brotli4j', Brotli compression and
+decompression for Java., which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.brotli4j.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/hyperxpro/Brotli4j
diff --git a/solr/licenses/netty-buffer-4.1.112.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+f1d77d15c0b781cd9395a2a956262766fd0c7602
diff --git a/solr/licenses/netty-codec-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-codec-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+5a49dfa2828d64bf756f670e63259115332744cf
diff --git a/solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+fbce5a53884275662e68aaad70f88bf7e5d04164
diff --git a/solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+19ae07fdf99142a70338f8cda70a3d2edbc8e80a
diff --git a/solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+42b1159cac3d196f6bdbd528e29f0fab9dbaae06
diff --git a/solr/licenses/netty-common-4.1.112.Final.jar.sha1 b/solr/licenses/netty-common-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-common-4.1.114.Final.jar.sha1 b/solr/licenses/netty-common-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+862712e292b162c8ccaa7847a6a54df8178f77e5
diff --git a/solr/licenses/netty-handler-4.1.112.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-handler-4.1.114.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+e56fbde4b9aa628eed15a5dbfbeb97877db88146
diff --git a/solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+a01071edffb4812009312b461ce5f160cdec9b75
diff --git a/solr/licenses/netty-resolver-4.1.112.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+10b23784b23d6a948930f52ba82874f1291b5873
diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.65.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.65.Final.jar.sha1
diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1
@@ -0,0 +1 @@
+7b0abf028c27ce6ad0c17a443a13f175fb4eda27
diff --git a/solr/licenses/netty-tcnative-classes-2.0.65.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.65.Final.jar.sha1
diff --git a/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1
@@ -0,0 +1 @@
+9588bd2f891157538a78d86c945aa34bf9308dda
diff --git a/solr/licenses/netty-transport-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-transport-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+e0225a575f487904be8517092cbd74e01913533c
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+f442c794e6fe89e6974f058bf393353e01fb927d
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+43268d2bef66e72e5a7956045a3caf8395f49ae6
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1
@@ -0,0 +1 @@
+d1171bb99411f282068f49d780cedf8c9adeabfd
diff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradle
@@ -25,6 +25,7 @@ dependencies {
 
   implementation platform(libs.netty.bom)
   implementation platform(libs.opentelemetry.bom)
+
   implementation libs.slf4j.api
 
   implementation libs.opentelemetry.api

diff --git a/versions.lock b/versions.lock
@@ -161,22 +161,22 @@
       "io.grpc:grpc-util:1.65.1" : "dd724fae,refs=6",
       "io.grpc:grpc-xds:1.65.1" : "6fb73f3a,refs=3",
       "io.micrometer:micrometer-core:1.9.12" : "1e12e466,refs=2",
-      "io.netty:netty-bom:4.1.112.Final" : "0d28f997,refs=5",
-      "io.netty:netty-buffer:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-codec:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-codec-http:4.1.112.Final" : "c1e4e901,refs=4",
-      "io.netty:netty-codec-http2:4.1.112.Final" : "5fcc0587,refs=3",
-      "io.netty:netty-codec-socks:4.1.112.Final" : "5fcc0587,refs=3",
-      "io.netty:netty-common:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-handler:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-handler-proxy:4.1.112.Final" : "5fcc0587,refs=3",
-      "io.netty:netty-resolver:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-tcnative-boringssl-static:2.0.65.Final" : "7413b098,refs=124",
-      "io.netty:netty-tcnative-classes:2.0.65.Final" : "7413b098,refs=124",
-      "io.netty:netty-transport:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-transport-classes-epoll:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-transport-native-epoll:4.1.112.Final" : "7413b098,refs=124",
-      "io.netty:netty-transport-native-unix-common:4.1.112.Final" : "7413b098,refs=124",
+      "io.netty:netty-bom:4.1.114.Final" : "0d28f997,refs=5",
+      "io.netty:netty-buffer:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-codec:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-codec-http:4.1.114.Final" : "c1e4e901,refs=4",
+      "io.netty:netty-codec-http2:4.1.114.Final" : "5fcc0587,refs=3",
+      "io.netty:netty-codec-socks:4.1.114.Final" : "5fcc0587,refs=3",
+      "io.netty:netty-common:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-handler:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-handler-proxy:4.1.114.Final" : "5fcc0587,refs=3",
+      "io.netty:netty-resolver:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-tcnative-boringssl-static:2.0.66.Final" : "7413b098,refs=124",
+      "io.netty:netty-tcnative-classes:2.0.66.Final" : "7413b098,refs=124",
+      "io.netty:netty-transport:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-transport-classes-epoll:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-transport-native-epoll:4.1.114.Final" : "7413b098,refs=124",
+      "io.netty:netty-transport-native-unix-common:4.1.114.Final" : "7413b098,refs=124",
       "io.opencensus:opencensus-api:0.31.1" : "784a94ea,refs=5",
       "io.opencensus:opencensus-contrib-http-util:0.31.1" : "784a94ea,refs=5",
       "io.opencensus:opencensus-proto:0.2.0" : "6fb73f3a,refs=3",