apache · dpol1 · Mar 20, 2026 · Mar 20, 2026 · Mar 20, 2026 · Mar 23, 2026
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
@@ -27,6 +27,7 @@ List of third-party dependencies grouped by their license type.
         * Apache Commons Crypto (org.apache.commons:commons-crypto:1.1.0 - https://commons.apache.org/proper/commons-crypto/)
         * Apache Commons CSV (org.apache.commons:commons-csv:1.14.1 - https://commons.apache.org/proper/commons-csv/)
         * Apache Commons Exec (org.apache.commons:commons-exec:1.6.0 - https://commons.apache.org/proper/commons-exec/)
+        * Apache Commons IO (commons-io:commons-io:2.17.0 - https://commons.apache.org/proper/commons-io/)
         * Apache Commons IO (commons-io:commons-io:2.21.0 - https://commons.apache.org/proper/commons-io/)
         * Apache Commons Lang (org.apache.commons:commons-lang3:3.20.0 - https://commons.apache.org/proper/commons-lang/)
         * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/)
@@ -51,7 +52,6 @@ List of third-party dependencies grouped by their license type.
         * Apache HBase Unsafe Wrapper (org.apache.hbase.thirdparty:hbase-unsafe:4.1.12 - https://hbase.apache.org/hbase-unsafe)
         * Apache HttpAsyncClient (org.apache.httpcomponents:httpasyncclient:4.1.5 - http://hc.apache.org/httpcomponents-asyncclient)
         * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
-        * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
         * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.16 - http://hc.apache.org/httpcomponents-core-ga)
         * Apache HttpCore NIO (org.apache.httpcomponents:httpcore-nio:4.4.16 - http://hc.apache.org/httpcomponents-core-ga)
         * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.13 - http://james.apache.org/mime4j/apache-mime4j-core)
@@ -81,10 +81,10 @@ List of third-party dependencies grouped by their license type.
         * Apache POI - API based on OPC and OOXML schemas (org.apache.poi:poi-ooxml:5.5.1 - https://poi.apache.org/)
         * Apache POI - Common (org.apache.poi:poi:5.5.1 - https://poi.apache.org/)
         * Apache POI - OOXML schemas (full) (org.apache.poi:poi-ooxml-full:5.5.1 - https://poi.apache.org/)
-        * Apache Solr (module: api) (org.apache.solr:solr-api:9.10.1 - https://solr.apache.org/)
-        * Apache Solr (module: solrj) (org.apache.solr:solr-solrj:9.10.1 - https://solr.apache.org/)
-        * Apache Solr (module: solrj-streaming) (org.apache.solr:solr-solrj-streaming:9.10.1 - https://solr.apache.org/)
-        * Apache Solr (module: solrj-zookeeper) (org.apache.solr:solr-solrj-zookeeper:9.10.1 - https://solr.apache.org/)
+        * Apache Solr (module: api) (org.apache.solr:solr-api:10.0.0 - https://solr.apache.org/)
+        * Apache Solr (module: solrj) (org.apache.solr:solr-solrj:10.0.0 - https://solr.apache.org/)
+        * Apache Solr (module: solrj-jetty) (org.apache.solr:solr-solrj-jetty:10.0.0 - https://solr.apache.org/)
+        * Apache Solr (module: solrj-zookeeper) (org.apache.solr:solr-solrj-zookeeper:10.0.0 - https://solr.apache.org/)
         * Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:3.3.0 - https://tika.apache.org/tika-parser-apple-module/)
         * Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:3.3.0 - https://tika.apache.org/tika-parser-audiovideo-module/)
         * Apache Tika cad parser module (org.apache.tika:tika-parser-cad-module:3.3.0 - https://tika.apache.org/tika-parser-cad-module/)
@@ -125,6 +125,8 @@ List of third-party dependencies grouped by their license type.
         * Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/)
         * compiler (com.github.spullara.mustache.java:compiler:0.9.14 - http://github.com/spullara/mustache.java)
         * Crawler-commons (com.github.crawler-commons:crawler-commons:1.6 - https://github.com/crawler-commons/crawler-commons)
+        * Curator Client (org.apache.curator:curator-client:5.9.0 - https://curator.apache.org/curator-client)
+        * Curator Framework (org.apache.curator:curator-framework:5.9.0 - https://curator.apache.org/curator-framework)
         * error-prone annotations (com.google.errorprone:error_prone_annotations:2.36.0 - https://errorprone.info/error_prone_annotations)
         * error-prone annotations (com.google.errorprone:error_prone_annotations:2.41.0 - https://errorprone.info/error_prone_annotations)
         * error-prone annotations (com.google.errorprone:error_prone_annotations:2.43.0 - https://errorprone.info/error_prone_annotations)
@@ -184,6 +186,7 @@ List of third-party dependencies grouped by their license type.
         * Netty/Codec/Compression (io.netty:netty-codec-compression:4.2.7.Final - https://netty.io/netty-codec-compression/)
         * Netty/Codec/Marshalling (io.netty:netty-codec-marshalling:4.2.7.Final - https://netty.io/netty-codec-marshalling/)
         * Netty/Codec/Protobuf (io.netty:netty-codec-protobuf:4.2.7.Final - https://netty.io/netty-codec-protobuf/)
+        * Netty/Codec (io.netty:netty-codec:4.1.119.Final - https://netty.io/netty-codec/)
         * Netty/Codec (io.netty:netty-codec:4.2.7.Final - https://netty.io/netty-codec/)
         * Netty/Common (io.netty:netty-common:4.1.119.Final - https://netty.io/netty-common/)
         * Netty/Common (io.netty:netty-common:4.2.7.Final - https://netty.io/netty-common/)
@@ -197,6 +200,7 @@ List of third-party dependencies grouped by their license type.
         * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.119.Final - https://netty.io/netty-transport-native-epoll/)
         * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.119.Final - https://netty.io/netty-transport-native-unix-common/)
         * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.2.7.Final - https://netty.io/netty-transport-native-unix-common/)
+        * Netty/Transport (io.netty:netty-transport:4.1.119.Final - https://netty.io/netty-transport/)
         * Netty/Transport (io.netty:netty-transport:4.2.7.Final - https://netty.io/netty-transport/)
         * Non-Blocking Reactive Foundation for the JVM (io.projectreactor:reactor-core:3.7.5 - https://github.com/reactor/reactor-core)
         * Objenesis (org.objenesis:objenesis:3.3 - http://objenesis.org/objenesis)
@@ -271,16 +275,16 @@ List of third-party dependencies grouped by their license type.
 
     Apache License, Version 2.0, Eclipse Public License - Version 2.0
 
-        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:10.0.26 - https://jetty.org/jetty-alpn-parent/jetty-alpn-client)
-        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:10.0.26 - https://jetty.org/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:10.0.26 - https://jetty.org/jetty-client)
-        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:10.0.26 - https://jetty.org/http2-parent/http2-client)
-        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:10.0.26 - https://jetty.org/http2-parent/http2-common)
-        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:10.0.26 - https://jetty.org/http2-parent/http2-hpack)
-        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:10.0.26 - https://jetty.org/http2-parent/http2-http-client-transport)
-        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.26 - https://jetty.org/jetty-http)
-        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.26 - https://jetty.org/jetty-io)
-        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.26 - https://jetty.org/jetty-util)
+        * Core :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:12.0.27 - https://jetty.org/jetty-core/jetty-alpn/jetty-alpn-client)
+        * Core :: ALPN :: Java Client (org.eclipse.jetty:jetty-alpn-java-client:12.0.27 - https://jetty.org/jetty-core/jetty-alpn/jetty-alpn-java-client)
+        * Core :: HTTP (org.eclipse.jetty:jetty-http:12.0.27 - https://jetty.org/jetty-core/jetty-http)
+        * Core :: HTTP2 :: Client (org.eclipse.jetty.http2:jetty-http2-client:12.0.27 - https://jetty.org/jetty-core/jetty-http2/jetty-http2-client)
+        * Core :: HTTP2 :: Client Transport (org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27 - https://jetty.org/jetty-core/jetty-http2/jetty-http2-client-transport)
+        * Core :: HTTP2 :: Common (org.eclipse.jetty.http2:jetty-http2-common:12.0.27 - https://jetty.org/jetty-core/jetty-http2/jetty-http2-common)
+        * Core :: HTTP2 :: HPACK (org.eclipse.jetty.http2:jetty-http2-hpack:12.0.27 - https://jetty.org/jetty-core/jetty-http2/jetty-http2-hpack)
+        * Core :: HTTP Client (org.eclipse.jetty:jetty-client:12.0.27 - https://jetty.org/jetty-core/jetty-client)
+        * Core :: IO (org.eclipse.jetty:jetty-io:12.0.27 - https://jetty.org/jetty-core/jetty-io)
+        * Core :: Utilities (org.eclipse.jetty:jetty-util:12.0.27 - https://jetty.org/jetty-core/jetty-util)
 
     Apache License, Version 2.0, LGPL-2.1-or-later
 
@@ -370,7 +374,7 @@ List of third-party dependencies grouped by their license type.
         * jsoup Java HTML Parser (org.jsoup:jsoup:1.22.1 - https://jsoup.org/)
         * JTokkit (com.knuddels:jtokkit:1.1.0 - https://github.com/knuddelsgmbh/jtokkit)
         * org.brotli:dec (org.brotli:dec:0.1.2 - http://brotli.org/dec)
-        * semver4j (org.semver4j:semver4j:5.8.0 - https://github.com/semver4j/semver4j)
+        * semver4j (org.semver4j:semver4j:6.0.0 - https://github.com/semver4j/semver4j)
         * SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
         * SLF4J API Module (org.slf4j:slf4j-api:1.7.6 - http://www.slf4j.org)
         * SLF4J API Module (org.slf4j:slf4j-api:2.0.17 - http://www.slf4j.org)

diff --git a/external/solr/archetype/src/main/resources/archetype-resources/setup-solr.sh b/external/solr/archetype/src/main/resources/archetype-resources/setup-solr.sh
@@ -29,15 +29,15 @@ if [ -z "$ROUTER_FIELD" ]; then
 fi
 
 SOLR_PORT=8983
-SOLR_HOME=/opt/solr-9.8.0
+SOLR_HOME=/opt/solr-10.0.0
 
 $SOLR_HOME/bin/solr start -c -p $SOLR_PORT
 
 echo -e "\n\e[1mUploading configsets ...\e[0m\n"
 
-$SOLR_HOME/bin/solr zk upconfig -n "docs" -d configsets/docs -z localhost:9983
-$SOLR_HOME/bin/solr zk upconfig -n "status" -d configsets/status -z localhost:9983
-$SOLR_HOME/bin/solr zk upconfig -n "metrics" -d configsets/metrics -z localhost:9983
+$SOLR_HOME/bin/solr zk upconfig --conf-name "docs" --conf-dir configsets/docs --zk-host localhost:9983
+$SOLR_HOME/bin/solr zk upconfig --conf-name "status" --conf-dir configsets/status --zk-host localhost:9983
+$SOLR_HOME/bin/solr zk upconfig --conf-name "metrics" --conf-dir configsets/metrics --zk-host localhost:9983
 
 echo -e "\n\n\e[1mCreating 'docs' collection ...\e[0m\n"
 curl -X POST "http://localhost:$SOLR_PORT/api/collections" -H "Content-type:application/json" -d '

diff --git a/external/solr/configsets/docs/conf/solrconfig.xml b/external/solr/configsets/docs/conf/solrconfig.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <config>
-    <luceneMatchVersion>9.0.0</luceneMatchVersion>
+    <luceneMatchVersion>10.3</luceneMatchVersion>
     <requestDispatcher handleSelect="false">
         <httpCaching never304="true" />
     </requestDispatcher>

diff --git a/external/solr/configsets/metrics/conf/solrconfig.xml b/external/solr/configsets/metrics/conf/solrconfig.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <config>
-    <luceneMatchVersion>9.0.0</luceneMatchVersion>
+    <luceneMatchVersion>10.3</luceneMatchVersion>
     <requestDispatcher handleSelect="false">
         <httpCaching never304="true" />
     </requestDispatcher>

diff --git a/external/solr/configsets/status/conf/solrconfig.xml b/external/solr/configsets/status/conf/solrconfig.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <config>
-    <luceneMatchVersion>9.0.0</luceneMatchVersion>
+    <luceneMatchVersion>10.3</luceneMatchVersion>
     <requestDispatcher handleSelect="false">
         <httpCaching never304="true" />
     </requestDispatcher>

diff --git a/external/solr/pom.xml b/external/solr/pom.xml
@@ -38,16 +38,92 @@ under the License.
     <description>Solr resources for StormCrawler</description>
 
     <properties>
-        <solr.version>9.10.1</solr.version>
+        <solr.version>10.0.0</solr.version>
     </properties>
 
+    <build>
+        <plugins>
+            <!--
+                Shade Jetty classes used by solr-solrj-jetty to avoid version conflicts
+                with the Jetty version shipped by Apache Storm at runtime.
+
+                Storm 2.8.x bundles Jetty 12.1.x, while Solr 10 depends on Jetty 12.0.x.
+                The mismatch causes NoSuchMethodError at runtime (e.g. in HTTP2Client,
+                ClientConnector). Relocating Jetty under a private package lets both
+                versions coexist on the classpath.
+
+                NOTE: relocated classes will not be matched by CVE scanners — Jetty
+                vulnerabilities must be tracked manually when upgrading Solr.
+
+                See: https://github.com/apache/stormcrawler/issues/1859
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <useBaseVersion>true</useBaseVersion>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.solr:solr-solrj-jetty</include>
+                                    <include>org.eclipse.jetty:*</include>
+                                    <include>org.eclipse.jetty.http2:*</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.eclipse.jetty</pattern>
+                                    <shadedPattern>org.apache.stormcrawler.solr.shaded.org.eclipse.jetty</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>${solr.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj-jetty</artifactId>
+            <version>${solr.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj-zookeeper</artifactId>
+            <version>${solr.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>