Merge branch 'main' into SOLR-16825-migrate-apis-pt8

apache · Nov 12, 2024 · f3ee0fd · f3ee0fd
2 parents 8074de3 + 139351a
commit f3ee0fd
Show file tree

Hide file tree

Showing 82 changed files with 1,096 additions and 642 deletions.
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java
@@ -22,7 +22,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,7 +54,7 @@ public static void main(String[] args) {
   }
 
   public static void checkVersion() {
-    int major = Runtime.getRuntime().version().feature();
+    int major = Runtime.version().feature();
     if (major < 21 || major > 23) {
       throw new IllegalStateException(
           "java version must be between 21 and 23, your version: " + major);
@@ -89,12 +89,12 @@ public void run(Path destination) throws IOException, NoSuchAlgorithmException {
       }
     }
 
-    URL url =
-        new URL(
+    URI uri =
+        URI.create(
             "https://raw.githubusercontent.com/gradle/gradle/v"
                 + wrapperVersion
                 + "/gradle/wrapper/gradle-wrapper.jar");
-    System.err.println("Downloading gradle-wrapper.jar from " + url);
+    System.err.println("Downloading gradle-wrapper.jar from " + uri);
 
     // Zero-copy save the jar to a temp file
     Path temp = Files.createTempFile(destination.getParent(), ".gradle-wrapper", ".tmp");
@@ -103,7 +103,7 @@ public void run(Path destination) throws IOException, NoSuchAlgorithmException {
       int retryDelay = 30;
       HttpURLConnection connection;
       while (true) {
-        connection = (HttpURLConnection) url.openConnection();
+        connection = (HttpURLConnection) uri.toURL().openConnection();
         try {
           connection.connect();
         } catch (IOException e) {

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -28,6 +28,8 @@ Improvements
 
 * SOLR-17544: Solr CLI will now stop when you combine mutually exclusive options.  Combining -s and -z options is a common example.  (Eric Pugh, Christos Malliaridis)
 
+* SOLR-17495: Change Solr CLI delete command to not delete configs by default.  Decouple lifecycle of collections from configsets. (Eric Pugh)
+
 Optimizations
 ---------------------
 (No changes)
@@ -82,6 +84,9 @@ Deprecation Removals
 
 * SOLR-17352: Remove deprecated Solr CLI options.  Run bin/solr yourcommand -h to see current options.  (Eric Pugh, Christos Malliardis)
 
+* SOLR-17256: Previously deprecated `SolrRequest` methods `setBasePath` and `getBasePath` have been removed.  SolrJ users
+  wishing to temporarily override an HTTP client's base URL may use `Http2SolrClient.requestWithBaseUrl` instead. (Jason Gerlowski)
+
 Dependency Upgrades
 ---------------------
 (No changes)
@@ -225,6 +230,9 @@ led to the suppression of exceptions. (Andrey Bozhko)
 
 * SOLR-17534: Introduce ClusterState.getCollectionNames, a convenience method (David Smiley)
 
+* SOLR-17535: Introduce ClusterState.collectionStream to replace getCollectionStates, getCollectionsMap,
+  and forEachCollection, which are now deprecated. (David Smiley)
+
 * SOLR-17545: Upgrade to Gradle 8.10 (Houston Putman)
 
 ==================  9.7.1 ==================