[GitHub] [solr] madrob commented on a change in pull request #585: SOLR-15955 Update Jetty dependency to 10

[GitBox <gi...@apache.org>]

madrob commented on a change in pull request #585:
URL: https://github.com/apache/solr/pull/585#discussion_r819198076



##########
File path: gradle/solr/force-versions.gradle
##########
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+// Force slf4j version so that it does not get auto promoted from 1x to 2-alpha due to Jetty dependency.
+
+project(":solr").subprojects {
+  plugins.withType(JavaPlugin) {
+    dependencies {
+      implementation enforcedPlatform('org.slf4j:slf4j-api:1.7.35')

Review comment:
       Should we set this version in version.props like the rest of our libraries?

##########
File path: versions.lock
##########
@@ -259,9 +258,9 @@ org.ow2.asm:asm:9.2 (4 constraints: 4931393a)
 org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
 org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
-org.slf4j:jcl-over-slf4j:1.7.36 (3 constraints: 05188eb8)
-org.slf4j:jul-to-slf4j:1.7.36 (2 constraints: 1723911a)
-org.slf4j:slf4j-api:1.7.36 (38 constraints: 9dd389ac)
+org.slf4j:jcl-over-slf4j:1.7.35 (3 constraints: 05188eb8)
+org.slf4j:jul-to-slf4j:1.7.35 (2 constraints: 1723911a)
+org.slf4j:slf4j-api:1.7.35 (57 constraints: a71af872)

Review comment:
       Downgrade?

##########
File path: solr/modules/hadoop-auth/src/test/org/apache/solr/client/solrj/impl/Krb5HttpClientUtils.java
##########
@@ -36,10 +36,11 @@
   public static void setup(Http2SolrClient http2Client, String principalName) {
     HttpAuthenticationStore authenticationStore = new HttpAuthenticationStore();
     authenticationStore.addAuthentication(createSPNEGOAuthentication(principalName));
-    http2Client.getHttpClient().setAuthenticationStore(authenticationStore);
+    http2Client.setAuthenticationStore(authenticationStore);
     http2Client
         .getProtocolHandlers()
         .put(new WWWAuthenticationProtocolHandler(http2Client.getHttpClient()));
+    http2Client.setAuthenticationStore(authenticationStore);

Review comment:
       We call this twice?

##########
File path: solr/modules/s3-repository/build.gradle
##########
@@ -41,21 +41,25 @@ dependencies {
   runtimeOnly(group: 'com.fasterxml.woodstox', name: 'woodstox-core')
   runtimeOnly(group: 'org.codehaus.woodstox', name: 'stax2-api')
 
-  testImplementation project(':solr:test-framework')
-  testImplementation 'org.apache.lucene:lucene-test-framework'
-  testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
   testImplementation 'junit:junit'
+  testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
+  testImplementation 'org.apache.lucene:lucene-test-framework'
+  testImplementation project(':solr:test-framework')
+
+  // overrides spring-boot pulled by com.adobe.testing:s3mock-junit4 to allow using a version
+  // compatible with recent Jetty
+  testImplementation 'org.springframework.boot:spring-boot'
 
   testImplementation('com.adobe.testing:s3mock-junit4') {
     // Don't pull in separate versions of these libs, just use what Solr already has
     exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
     exclude group: 'ch.qos.logback', module: 'logback-classic'
     exclude group: 'org.eclipse.jetty', module: '*'
     exclude group: 'io.netty', module: '*'
-    exclude group: 'commons-io', module: 'commons-io'
+    exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
     exclude group: 'commons-codec', module: 'commons-codec'
+    exclude group: 'commons-io', module: 'commons-io'
     exclude group: 'org.apache.commons', module: 'commons-lang3'
-    exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'

Review comment:
       The rearranging here looks weird




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org