XCOMMONS-2525: Downgrade to Slf4j 1.7.36 and Logback 1.2.11

xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/EmbeddedSolr.java

@@ -289,13 +289,7 @@ private void recreateSearchCore() throws IOException
 
     private void writeHomeConfiguration() throws IOException
     {
-        StringBuilder builder = new StringBuilder();
-        builder.append("<solr>");
-        // Disable the log watcher until Solr support SLF4J 2
-        // FIXME: remove when Solr upgrade SLF4J (or stop logging a stack trace at least)
-        builder.append("<logging><str name=\"enabled\">false</str></logging>");
-        builder.append("</solr>");
-        FileUtils.write(this.solrHomePath.resolve("solr.xml").toFile(), builder.toString(), StandardCharsets.UTF_8);
+        FileUtils.write(this.solrHomePath.resolve("solr.xml").toFile(), "<solr/>", StandardCharsets.UTF_8);
     }
 
     private void createHomeDirectory() throws IOException

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml

@@ -40,6 +40,8 @@
          Following versions of some specific Jetty dependencies should be kept in sync when upgrading Jetty.
     -->
     <jetty.version>10.0.7</jetty.version>
+    <!-- Jetty expects a different version of slf4j -->
+    <slf4j.version>2.0.0-alpha5</slf4j.version>
   </properties>
 
   <dependencies>