avoid conflict with slf4j from sqlite (see also dcddfe4f43a3), notably this message on "isabelle find_facts":
authorwenzelm
Sun, 12 Jan 2025 13:54:44 +0100
changeset 81779 e9f3dbcf854f
parent 81778 14ace6211ce8
child 81780 e06819faea88
avoid conflict with slf4j from sqlite (see also dcddfe4f43a3), notably this message on "isabelle find_facts": SLF4J(W): Class path contains multiple SLF4J providers. SLF4J(W): Found provider [org.slf4j.nop.NOPServiceProvider@1576514a] SLF4J(W): Found provider [org.apache.logging.slf4j.SLF4JServiceProvider@6a84d4e3] SLF4J(W): See https://www.slf4j.org/codes.html#multiple_bindings for an explanation. SLF4J(I): Actual provider is of type [org.slf4j.nop.NOPServiceProvider@1576514a]
Admin/components/components.sha1
Admin/components/main
src/Pure/Admin/component_solr.scala
--- a/Admin/components/components.sha1	Sun Jan 12 13:42:01 2025 +0100
+++ b/Admin/components/components.sha1	Sun Jan 12 13:54:44 2025 +0100
@@ -505,6 +505,7 @@
 bdc7406747790b590518182d8b4131b4a0e90c07 scala-3.4.1.tar.gz
 0983f776b3b9dd95164a747d176d65d0e45f843b scala-3.4.2.tar.gz
 abe7a3b50da529d557a478e9f631a22429418a67 smbc-0.4.1.tar.gz
+8fb859f36a01ff3d31311bae562a6f0a04038a55 solr-9.7.0-1.tar.gz
 fc49638701c17a3e7a93a78df75fd50257da0036 solr-9.7.0.tar.gz
 cbd491c0feba1d21019d05564e76dd04f592ccb4 spass-3.8ds-1.tar.gz
 edaa1268d82203067657aabcf0371ce7d4b579b9 spass-3.8ds-2.tar.gz
--- a/Admin/components/main	Sun Jan 12 13:42:01 2025 +0100
+++ b/Admin/components/main	Sun Jan 12 13:54:44 2025 +0100
@@ -33,7 +33,7 @@
 rsync-3.2.7-1
 scala-3.3.4
 smbc-0.4.1
-solr-9.7.0
+solr-9.7.0-1
 spass-3.8ds-2
 sqlite-3.47.1.0
 stack-2.15.5
--- a/src/Pure/Admin/component_solr.scala	Sun Jan 12 13:42:01 2025 +0100
+++ b/src/Pure/Admin/component_solr.scala	Sun Jan 12 13:54:44 2025 +0100
@@ -73,7 +73,9 @@
 
       val solr_jars =
         File.read_dir(component_dir.lib).filterNot((name: String) =>
-          classpath.contains(name) || name.startsWith("slf4j-api"))
+          classpath.contains(name) ||
+            name.startsWith("slf4j-api") ||
+            name.startsWith("log4j-slf4j2"))
 
       component_dir.write_settings("""
 SOLR_HOME="$COMPONENT"