risdenk commented on code in PR #2876: URL: https://github.com/apache/solr/pull/2876#discussion_r2031137588
########## gradle/libs.versions.toml: ########## @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. [versions] -adobe-testing-s3mock = "2.17.0" Review Comment: Does this PR need to be merged with main? I would expect much fewer changes in dependencies outside of Jetty. It looks like there are other lingering changes that might also need to be up to date with main. ########## gradle/libs.versions.toml: ########## @@ -80,8 +80,8 @@ decompose = "3.2.2" diffplug-spotless = "6.5.2" dropwizard-metrics = "4.2.26" eclipse-ecj = "3.39.0" -eclipse-jetty = "10.0.22" -eclipse-jettytoolchain = "4.0.6" +eclipse-jetty = "12.0.10" Review Comment: Should probably go to 12.0.19 - https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.19 ########## gradle/testing/randomization/policies/solr-tests.policy: ########## @@ -240,8 +241,15 @@ grant { permission java.io.FilePermission "${aws.configFile}", "read,readlink"; permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink"; + // GCS Review Comment: Are these changes supposed to be part of Jetty 12? ########## solr/CHANGES.txt: ########## @@ -119,7 +119,8 @@ Deprecation Removals Dependency Upgrades --------------------- -(No changes) + +* SOLR-16984: Upgraded internal Jetty server from Jetty 10 to Jetty 12, including migration from javax.* to jakarta.* namespaces for Servlet and related APIs. (Sanjay Dutt, David Smiley) Review Comment: I'm not fully convinced other dependencies need to be upgraded, but if this needs to upgrade other dependencies (spring, aws, etc) they should probably be called out as well ########## gradle/libs.versions.toml: ########## @@ -295,7 +296,7 @@ bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref carrot2-core = { module = "org.carrot2:carrot2-core", version.ref = "carrot2-core" } carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref = "carrotsearch-hppc" } carrotsearch-randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "carrotsearch-randomizedtesting" } -# @keep transitive dependency for version alignment Review Comment: Looks like this changed back again? ########## solr/modules/s3-repository/build.gradle: ########## @@ -21,7 +21,7 @@ description = 'S3 Repository' dependencies { Review Comment: Are all the changes to this s3 repository build.gradle required? ########## solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java: ########## @@ -100,9 +100,14 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permis private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); static { - KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes()); + KNOWN_MIME_TYPES = new HashSet<>(); + for (MimeTypes.Type type : MimeTypes.Type.values()) { + KNOWN_MIME_TYPES.add(type.toString()); + } KNOWN_MIME_TYPES.add("text/xml"); KNOWN_MIME_TYPES.add("text/javascript"); + KNOWN_MIME_TYPES.add("text/csv"); Review Comment: This should be added as a code comment most likely. -- 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-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
